From ohauer@gmx.de  Sat Jul 10 22:21:04 2010
Return-Path: <ohauer@gmx.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB594106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 10 Jul 2010 22:21:04 +0000 (UTC)
	(envelope-from ohauer@gmx.de)
Received: from mail.gmx.net (mail.gmx.net [213.165.64.20])
	by mx1.freebsd.org (Postfix) with SMTP id 4A3298FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 10 Jul 2010 22:21:03 +0000 (UTC)
Received: (qmail invoked by alias); 10 Jul 2010 22:21:02 -0000
Received: from u18-124.dsl.vianetworks.de (EHLO u18-124.dsl.vianetworks.de) [194.231.39.124]
  by mail.gmx.net (mp063) with SMTP; 11 Jul 2010 00:21:02 +0200
Received: by u18-124.dsl.vianetworks.de (Postfix, from userid 1100)
	id 6C12320252; Sun, 11 Jul 2010 00:20:58 +0200 (CEST)
Message-Id: <20100710222058.6C12320252@u18-124.dsl.vianetworks.de>
Date: Sun, 11 Jul 2010 00:20:58 +0200 (CEST)
From: olli hauer <ohauer@gmx.de>
Reply-To: olli hauer <ohauer@gmx.de>
To: <FreeBSD-gnats-submit@freebsd.org>
Cc: <ohauer@gmx.de>
Subject: [patch] port mail/dspam small Makefile fix
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         148485
>Category:       ports
>Synopsis:       [patch] port mail/dspam small Makefile fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>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:  Thu Sep 09 06:21:14 UTC 2010
>Originator:     olli hauer <ohauer@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
-@cwd %%DSPAM_HOME%%
+@cwd %%DSPAM_HOME%%/txt
 firstrun.txt.sample
 firstspam.txt.sample
 quarantinefull.txt.sample
 @cwd /
+@dirrm %%DSPAM_HOME%%/txt
 @dirrm %%DSPAM_HOME%%
--- patch_dspam.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jul 10 22:30:19 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148485 
Responsible-Changed-From-To: itetcu->ohauer 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Thu Sep 9 01:28:24 UTC 2010 
Responsible-Changed-Why:  
ohauer is now a committer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148485 
Responsible-Changed-From-To: ohauer->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Thu Sep 9 06:21:12 UTC 2010 
Responsible-Changed-Why:  
Taek it back, I really care about this port, being on of hte upstream 
devels. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148485 
>Unformatted:
