ports/148485: [patch] port mail/dspam small Makefile fix

[olli hauer]

>Number:         148485
>Category:       ports
>Synopsis:       [patch] port mail/dspam small Makefile fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 10 22:30:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     olli hauer <ohauer at gmx.de>
>Release:        FreeBSD 7.3-RELEASE-p1 i386
>Organization:
>Environment:


>Description:

Update Notes cannot be displayed if PORTREVISION is set

Not sure about the second fix to copy the sample files (firstrun.txt.sample ...)
in a subdirectory 'txt' below $DSPAM_HOME (there is no hint for this exept in 
the sourcfile dspam.c).

PS: drop the diff for the 'txt' subdirectory if this is expected 

>How-To-Repeat:

Install a fresh dspam instance, as user you expect to copy the files
in /var/db/dspam/*.sampe and make changes there but if 'Notifications on' is set
you will see the following error message in the logs
- "Unable to open file for reading: firstrun.txt: No such file or directory"


>Fix:

--- patch_dspam.txt begins here ---
--- Makefile
+++ Makefile
@@ -74,7 +74,7 @@
 OPTIONS+=	QMAIL "Play nice with Qmail mail server" off
 
 OPTIONS+=	WebUI "Install WebUI, pulls in Apache or see below" off
-OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
+OPTIONS+=	LIGHTTPD "RUN_DEPEND on lighttpd, not Apache" off
 
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool:22
@@ -439,7 +439,7 @@
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
 	@${ECHO_CMD} "###########################################################################"
-	@${SED} -n < ${FILESDIR}/UPDATING "/^# ${PKGNAME}/,/^#####/p"
+	@${SED} -n < ${FILESDIR}/UPDATING "/^# ${PORTNAME}-${PORTVERSION}/,/^#####/p"
 	@${ECHO_CMD} ""
 	@sleep 5
 .endif
@@ -609,6 +609,8 @@
 
 	@${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME}
 	@${CHOWN} ${DSPAM_HOME_OWNER}:${DSPAM_HOME_GROUP} ${DSPAM_HOME}
+	@${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME}/txt
+	@${CHOWN} ${DSPAM_HOME_OWNER}:${DSPAM_HOME_GROUP} ${DSPAM_HOME}/txt
 .for _file in firstrun.txt firstspam.txt quarantinefull.txt
 	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\
 	then\
@@ -616,7 +618,7 @@
 		${MV} ${_file} ${_file}.sample;\
 	fi
 	cd ${WRKSRC}/txt && \
-		${INSTALL_DATA} ${_file}.sample ${DSPAM_HOME}
+		${INSTALL_DATA} ${_file}.sample ${DSPAM_HOME}/txt
 .endfor
 
 	@${MKDIR} -m ${DSPAM_HOME_MODE} ${LOG_DIR}
--- pkg-plist
+++ pkg-plist
@@ -203,9 +203,10 @@
 %%WebUI%%@dirrm %%WWWDIR%%/templates
 %%WebUI%%@dirrm %%WWWDIR%%
 @dirrm include/dspam
- at cwd %%DSPAM_HOME%%
+ at cwd %%DSPAM_HOME%%/txt
 firstrun.txt.sample
 firstspam.txt.sample
 quarantinefull.txt.sample
 @cwd /
+ at dirrm %%DSPAM_HOME%%/txt
 @dirrm %%DSPAM_HOME%%
--- patch_dspam.txt ends here ---


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