Move socket/DB dir into /var/milter-sender, remember to change /etc/mail/*.mc!

More tweaks installing milter-sender.sh

5 files changed, 43 insertions, 21 deletions

diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile
index 04fbb92c59ac..9cf10e3c4874 100644
--- a/mail/milter-sender/Makefile
+++ b/mail/milter-sender/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=       milter-sender
 PORTVERSION=    0.40
+PORTREVISION=   1
 CATEGORIES=     mail
 MASTER_SITES=   http://www.snert.com/Software/download/
 DISTFILES=      libsnert-1.22.tgz milter-sender-${PORTVERSION}.tgz
@@ -20,7 +21,6 @@ GNU_CONFIGURE=  yes
 
 WRKSRC=         ${WRKDIR}/com/snert/src/milter-sender
 MAKEFILE=       makefile
-PKGMESSAGE=     ${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
 
@@ -38,13 +38,9 @@ DOCS= CHANGES.TXT index.shtml style.css mailto.js \
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CFLAGS+= ${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=  LDFLAGS="${LDFLAGS}" LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS+= --localstatedir=${PREFIX} --with-db
+CONFIGURE_ARGS+= --with-db
 MAKE_ENV+=       PREFIX="${PREFIX}"
 
-post-patch:
-	@${SED} 's|\/usr\/local|${PREFIX}|g' ${PKGDIR}/pkg-message > \
-	${WRKDIR}/pkg-message
-
 pre-configure:
 	@cd ${WRKSRC}/../lib && \
 	${SETENV} CC="${CC}" CXX="${CXX}" \
@@ -65,9 +61,17 @@ post-install:
 	@cd ${WRKSRC}/Img && \
 	${INSTALL_DATA} *.gif *.png ${DOCSDIR}/Img
 .endif
+	@if [ ! -f ${PREFIX}/etc/rc.d/milter-sender.sh ] ; then \
+	cp ${PREFIX}/etc/rc.d/milter-sender.sh-dist ${PREFIX}/etc/rc.d/milter-sender.sh; \
+	chmod ug+x %B/milter-sender.sh; \
+	fi
 	@${CAT} ${PKGMESSAGE}
 
 post-deinstall:
+	@if [ -f ${PREFIX}/etc/rc.d/milter-sender.sh ] && \
+	cmp -s ${PREFIX}/etc/rc.d/milter-sender.sh ${PREFIX}/etc/rc.d/milter-sender.sh-dist; then \
+	rm -f ${PREFIX}/etc/rc.d/milter-sender.sh; \
+	fi
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Do not forget to delete the filter description from /etc/mail/YOUR-CONF.mc"
 	@${ECHO_MSG} "and rebuild sendmail.cf file!"
diff --git a/mail/milter-sender/files/patch-ac b/mail/milter-sender/files/patch-ac
index 3717294934fc..7695f0ae51f5 100644
--- a/mail/milter-sender/files/patch-ac
+++ b/mail/milter-sender/files/patch-ac
@@ -1,19 +1,23 @@
---- milter-sender.sh.in.bak	Mon Sep 29 12:03:36 2003
-+++ milter-sender.sh.in	Sat Oct  4 03:04:19 2003
-@@ -16,12 +16,6 @@
- OPTIONS="-d 127.0.0.1 -s /etc/mail/sendmail.cf -R -u 3 unix:@localstatedir@/lib/@PACKAGE_NAME@/socket"
- REQUIRED_DIR="@localstatedir@/lib/@PACKAGE_NAME@"
- 
+--- milter-sender.sh.in.orig	Sat Oct  4 14:06:30 2003
++++ milter-sender.sh.in	Sun Oct 12 05:46:13 2003
+@@ -13,14 +13,8 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ PROGRAM="@sbindir@/@PACKAGE_NAME@"
+-OPTIONS="-d 127.0.0.1 -s /etc/mail/sendmail.cf -R -u 3 unix:@localstatedir@/lib/@PACKAGE_NAME@/socket"
+-REQUIRED_DIR="@localstatedir@/lib/@PACKAGE_NAME@"
+-
 -FG_RED='\033[1;31m'
 -FG_GREEN='\033[1;32m'
 -FG_WHITE='\033[0;37m'
 -FG_BLACK='\033[0;30m'
 -FG_NORMAL=${FG_WHITE}
--
++OPTIONS="-d 127.0.0.1 -s /etc/mail/sendmail.cf -R -u 3 unix:@localstatedir@/@PACKAGE_NAME@/socket"
++REQUIRED_DIR="@localstatedir@/@PACKAGE_NAME@"
+ 
  ##########################################################################
  #	Nothing to be configured below this point.
- ##########################################################################
-@@ -66,34 +60,24 @@
+@@ -68,34 +62,24 @@
  start()
  {
  	NAME=`basename "$PROGRAM"`
@@ -51,7 +55,7 @@
  
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
-@@ -107,12 +91,12 @@
+@@ -109,12 +93,12 @@
  		sleep 2
  		pid=`getpid "$PROGRAM"`
  		if [ X"$pid" != X ]; then
@@ -66,7 +70,7 @@
  }
  
  case "$1" in
-@@ -129,9 +113,9 @@
+@@ -131,9 +115,9 @@
  status)
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
diff --git a/mail/milter-sender/files/patch-ae b/mail/milter-sender/files/patch-ae
new file mode 100644
index 000000000000..59c7618e49aa
--- /dev/null
+++ b/mail/milter-sender/files/patch-ae
@@ -0,0 +1,11 @@
+--- makefile.in.bak	Tue Sep 23 17:00:31 2003
++++ makefile.in	Sun Oct 12 05:38:35 2003
+@@ -27,7 +27,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ BINDIR		= @sbindir@
+-STATEDIR	= @localstatedir@/lib/$(MILTER)
++STATEDIR        = @localstatedir@/$(MILTER)
+ STARTUP_SCRIPT	= @STARTUP_SCRIPT@/$(MILTER)
+ 
+ ########################################################################
diff --git a/mail/milter-sender/pkg-message b/mail/milter-sender/pkg-message
index 26c39bd11ed4..d4efe73e402b 100644
--- a/mail/milter-sender/pkg-message
+++ b/mail/milter-sender/pkg-message
@@ -5,13 +5,14 @@ In order to run this port, please add the following lines to
 
 INPUT_MAIL_FILTER(
 	`milter-sender',
-	`S=unix:/usr/local/lib/milter-sender/socket, F=T, T=C:1m;S:30s;R:6m;E:1m'
+	`S=unix:/var/milter-sender/socket, F=T, T=C:1m;S:30s;R:6m;E:1m'
 )dnl
 define(
 	`confMILTER_MACROS_CONNECT', confMILTER_MACROS_CONNECT`,
 	{client_addr}, {client_name}, {client_port}, {client_resolve}'
 )dnl
 
-Don't forget to remake sendmail configuration file after modifying YOUR-CONF.mc
+Don't forget to remake sendmail configuration file after modifying
+YOUR-CONF.mc
 
 ************************************************************************
diff --git a/mail/milter-sender/pkg-plist b/mail/milter-sender/pkg-plist
index 239e5fc87724..142b8f601610 100644
--- a/mail/milter-sender/pkg-plist
+++ b/mail/milter-sender/pkg-plist
@@ -1,6 +1,9 @@
+@unexec if [ -f %D/etc/rc.d/milter-sender.sh ] && cmp -s %D/etc/rc.d/milter-sender.sh %D/etc/rc.d/milter-sender.sh-dist; then rm -f %D/etc/rc.d/milter-sender.sh; fi
 etc/rc.d/milter-sender.sh-dist
+@exec if [ ! -f %D/etc/rc.d/milter-sender.sh ] ; then cp %D/%F %B/milter-sender.sh; chmod ug+x %B/milter-sender.sh; fi
 sbin/milter-sender
-@exec install -d -o smmsp -g smmsp -m 755 lib/milter-sender
+@exec install -d -o smmsp -g smmsp -m 755 /var/milter-sender
+@unexec rm -rf /var/milter-sender
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.TXT
 %%PORTDOCS%%%%DOCSDIR%%/Img/bg.gif
 %%PORTDOCS%%%%DOCSDIR%%/Img/dilbert2003071742312.gif
@@ -22,4 +25,3 @@ sbin/milter-sender
 @unexec echo "sendmail.cf file!"
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/milter-sender