ports/89190: update deskutils/plans

[infofarmer at gmail.com]

>Number:         89190
>Category:       ports
>Synopsis:       update deskutils/plans
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 17 10:30:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD proxy.gubkin.ru 6.0-RELEASE FreeBSD 6.0-RELEASE #2: Thu Nov 3 19:20:06 MSK 2005 sat at proxy.gubkin.ru:/usr/obj/usr/src/sys/SPG6 i386


	
>Description:
	o Update to 7.4.8
	o Do not overwrite existing files during installation
	o Respect WWWDOCROOT

	
>How-To-Repeat:
	
>Fix:

	

--- plans748.diff begins here ---
diff -urN /usr/ports/deskutils/plans/Makefile plans/Makefile
--- /usr/ports/deskutils/plans/Makefile	Fri Nov 11 21:32:28 2005
+++ plans/Makefile	Thu Nov 17 13:00:56 2005
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	plans
-PORTVERSION=	7.4.7
-PORTREVISION=	1
+PORTVERSION=	7.4.8
 CATEGORIES=	deskutils www
 MASTER_SITES=	http://www.planscalendar.com/release/:plans \
 		http://www.freebsd.org/gifs/:logo
@@ -25,10 +24,13 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-DIR=		www/data/plans
-PLIST_SUB+=	DIR=${DIR}
+WWWDOCROOT?=	www/data
+PLANSSUBDIR?=	plans
+PLANSDIR?=	${WWWDOCROOT}/${PLANSSUBDIR}
+PLIST_SUB+=	DIR=${PLANSDIR}
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
+DIR=		${PREFIX}/${PLANSDIR}
 
 post-extract:
 	${CP} ${DISTDIR}/powerani.gif ${WRKSRC}/theme/graphics/freebsd.gif
@@ -37,12 +39,12 @@
 	@${RM} -f ${WRKSRC}/theme/plans.template.orig
 
 do-install:
-	@${MKDIR} ${PREFIX}/${DIR}
-	@${CP} -R ${WRKSRC}/* ${PREFIX}/${DIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DIR}
-	@${FIND} ${PREFIX}/${DIR} -type f -exec ${CHMOD} 644 {} \;
-	@${FIND} ${PREFIX}/${DIR} -name '*.cgi' -exec ${CHMOD} 755 {} \;
-	@${FIND} ${PREFIX}/${DIR} -name '*.xml' -exec ${CHMOD} 664 {} \;
+	@${INSTALL} -d ${DIR}
+	@${CP} -nR ${WRKSRC}/ ${DIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DIR}
+	@${FIND} ${DIR} -type f -exec ${CHMOD} 644 {} \;
+	@${FIND} ${DIR} -name '*.cgi' -exec ${CHMOD} 755 {} \;
+	@${FIND} ${DIR} -name '*.xml' -exec ${CHMOD} 664 {} \;
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff -urN /usr/ports/deskutils/plans/distinfo plans/distinfo
--- /usr/ports/deskutils/plans/distinfo	Fri Nov 11 21:32:28 2005
+++ plans/distinfo	Thu Nov 17 13:01:25 2005
@@ -1,6 +1,6 @@
-MD5 (plans_7.4.7.zip) = 75e77cf0b50e378a9cadb0c39f703947
-SHA256 (plans_7.4.7.zip) = 38bec8aa2c0d2a174717b423e94b7f7364b002316d6b310cefb526ff24530dbf
-SIZE (plans_7.4.7.zip) = 585978
+MD5 (plans_7.4.8.zip) = 46a1d95b6264247088f56b0faa86b020
+SHA256 (plans_7.4.8.zip) = 6be1f2176a93cd76a7c75b4bf0a83bcd6ea1dac1c2b2512c722da8ac8feee94f
+SIZE (plans_7.4.8.zip) = 587278
 MD5 (powerani.gif) = b0f85a6c41817a2dcad0ffe6f0729fa8
 SHA256 (powerani.gif) = d01c1c8299aa6c0eda0cd7c202bdf5a4ad49400377596fc2e114db6591c66d97
 SIZE (powerani.gif) = 7203
diff -urN /usr/ports/deskutils/plans/pkg-plist plans/pkg-plist
--- /usr/ports/deskutils/plans/pkg-plist	Fri Nov 11 21:32:28 2005
+++ plans/pkg-plist	Thu Nov 17 13:07:22 2005
@@ -326,7 +326,7 @@
 
 @dirrm %%DIR%%/theme/icons
 @dirrm %%DIR%%/theme/graphics
- at dirrm %%DIR%%/theme
+ at unexec rmdir %D/%%DIR%%/theme 2>/dev/null || true
 @unexec rmdir %D/%%DIR%%/sessions 2>/dev/null || true
 @unexec rmdir %D/%%DIR%%/data 2>/dev/null || true
 @unexec rmdir %D/%%DIR%% 2>/dev/null || echo "Note: %D/%%DIR%% not empty -- not deleted!"
--- plans748.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: