- Reported by many, approved by maintainer:

  Makefile cleanups from Palle Girgensohn (PR 70112), many thanks !
  - Fix typo in CYRUS22 option.
  - Fix typo in CGI option and build the PLIST correctly.
  - Fix typo in post-install target in the POSTGRESQL{73|74} case.
  - Correct WITH_POSTGRESQL -> WITH_POSTGRESQL73 and WITH_POSTGRESQL74
- Ion-Mihai Tetcu (maintainer)
  Removed bogus pkg-install
- From me (andreas):
  Add user and system logging, otherwise you won't get nice
  statistics/graphs using the CGI interface...
- Bumped Port Revision because of important fixes

PR:		70112
Submitted by:	Palle Girgensohn <girgen@pingpong.net>

2 files changed, 9 insertions, 67 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index fcd0f719ba37..04a85a868c03 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/ \
 		http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/sources/
@@ -333,7 +333,7 @@ CONFIGURE_ARGS+=\
 .if defined(WITH_CYRUS22_LDA)
 RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd22
 CONFIGURE_ARGS+=\
---with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u"
+--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u'
 .endif
 
 .if defined(WITH_SENDMAIL)
@@ -389,6 +389,8 @@ RUN_DEPENDS+=	${SITE_PERL}/mach/GD.pm:${PORTSDIR}/graphics/p5-GD
 RUN_DEPENDS+=	${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
 RUN_DEPENDS+=	${SITE_PERL}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d
 RUN_DEPENDS+=	${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
+CONFIGURE_ARGS+=--enable-logging
+CONFIGURE_ARGS+=--enable-user-logging
 USE_PERL5_RUN=	yes
 PLIST_SUB+=	CGI=""
 .if !defined(CGI_PATH)
@@ -400,7 +402,8 @@ SED_SCRIPT+=	-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
 #SED_FILES=      ${LS} ${WRKSRC}/cgi/*.pl
 #SED_FILES+=     ${LS} $PWRKSRC}/cgi/*.cgi
 .else
-PLIT_SUB+=	CGI="@comment "
+PLIST_SUB+=	CGI="@comment "
+SED_SCRIPT+=	-e '/%%CGI%%/D'
 .endif
 
 MAN1=	dspam.1 dspam_clean.1 dspam_corpus.1 dspam_dump.1 dspam_merge.1 \
@@ -440,12 +443,12 @@ pre-configure:
 	@${ECHO_CMD} "You can only use one local delivery agent at once."
 	@${FALSE}
 .endif
-.if defined(WITH_NEURAL_NET) && !(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL))
+.if defined(WITH_NEURAL_NET) && !(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74))
 	@${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking."
 	@${FALSE}
 .endif
 .if defined(WITH_VIRT_USERS) && !(defined(WITH_MYSQL) || \
-	defined(WITH_POSTGRESQL) || defined(WITH_ORACLE))
+	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE))
 	@${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users."
 	@${FALSE}
 .endif
@@ -460,7 +463,7 @@ post-install:
 .endif
 .if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)
 	@${MKDIR} ${EXAMPLESDIR}/pgsql
-	cd @${WRKSRC}/tools.pgsql_drv && \
+	@cd ${WRKSRC}/tools.pgsql_drv && \
 		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
 	${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql
 .endif
diff --git a/mail/dspam-devel/pkg-install b/mail/dspam-devel/pkg-install
deleted file mode 100644
index 8fc42a5f9027..000000000000
--- a/mail/dspam-devel/pkg-install
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-PATH=/bin:/usr/sbin
-
-upgradewarning() {
-	echo "
-
-	=======================================================================
-	Note for upgraders from dspam 2.x:
-	- DSPAM v3.0 has moved many features out to the commandline.
-	- Other configure-time arguments have also been changed or removed.
-	- The stucture of the database (MySQL, Oracle) has changed; if you use
-	one of this the PKGMESSAGE will tell you what do do.
-
-	While this port tries his best to help you with the upgrade, be sure
-	to read the section UPGRADING of 1.1 INSTALLATION - UPGRADING from
-	%%PORTDOCS%%/%%DOCSDIR%%/README. Because of the command line changes you
-	risk to have all you mails going to the bit bucket with NO WARNING.
-	
-	Do not continue to install this port without shutting down your MTA
-	and/or disableing dspam (if you are installing in the same place).
-	If you whant to test the new version, install with PREFIX != /usr/local 
-	and choose WITH_NO_CONFLICT in the OPTIONS menu; otherwise if you have 
-	dspam-2.x this port will refuse to install.
-	========================================================================
-"
-        sleep 3
-}
-
-featurewarning() {
-	echo "
-	
-	Known issues:
-	- WITH_ORACLE does not configure.
-	- the new POP3 Proxy integration is not yet handled by this port
-	- due to the removal of postgress client port from the Ports Tree
-	if you choose WITH_POSTRESQL Postgresql 7.3 will be installed; if you
-	plan to use a server on another machine do:
-		1. Hit Ctrl+C now.
-		2. Go in databases/postgresql73 and make -DWITHOUT_SERVER install
-		3. Come back here and make install
-	- the cgi part is really untested and requires more work
-	- some changes from rc2 are not merged yet.
-	- no supplimantary {platform|MTA|LDA,etc.} documentaion is in yet
-	- qmail dspam-filter (http://sourceforge.net/projects/dspam-filter/)
-	is not yet integrated.
-	"
-	sleep 8
-}
-
-case $2 in
-PRE-INSTALL)
-	upgradewarning
-	featurewarning
-	;;
-UPGRADEWARNING)
-	upgradewarning
-	;;
-esac