Better integration into ports system

Submitted by:   Marius Strobl <marius@alchemy.franken.de> (partially)

4 files changed, 49 insertions, 35 deletions

diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile
index f942c83..f9776b7 100644
--- a/mail/milter-sender/Makefile
+++ b/mail/milter-sender/Makefile
@@ -7,25 +7,36 @@
 
 PORTNAME=       milter-sender
 PORTVERSION=    0.38
+PORTREVISION=   1
 CATEGORIES=     mail
 MASTER_SITES=   http://www.snert.com/Software/download/
-DISTFILES=      libsnert-1.20.tgz milter-sender-0.38.tgz
-RESTRICTED=     see LICENSE.TXT
+DISTFILES=      libsnert-1.20.tgz milter-sender-${PORTVERSION}.tgz
 
 MAINTAINER=     ache@FreeBSD.org
 COMMENT=        Real-time sender address verification, based on Milter API
+RESTRICTED=     see LICENSE.TXT
+
+GNU_CONFIGURE=  yes
 
-DOCDIR=         ${PREFIX}/share/doc/milter-sender
 WRKSRC=         ${WRKDIR}/com/snert/src/milter-sender
 MAKEFILE=       makefile
-GNU_CONFIGURE=  yes
 
-.if !exists(/usr/lib/libmilter.a)
-IGNORE=		requires Sendmail 8.12; upgrade the base system
+.if !exists(/usr/lib/libmilter.a) && !exists(${LOCALBASE}/lib/libmilter.a)
+IGNORE=         requires Sendmail 8.12
 .endif
+.if exists(${LOCALBASE}/lib/libmilter.a)
+CFLAGS+=       -I${LOCALBASE}/include
+LDFLAGS+=      -L${LOCALBASE}/lib
+.endif
+
+DOCS= CHANGES.TXT index.shtml style.css mailto.js \
+      license-body.html LICENSE.TXT milter-sender.mc responses.txt
+
+.include <bsd.port.pre.mk>
 
 CFLAGS+= ${PTHREAD_CFLAGS}
 CONFIGURE_ENV=  LIBS="${PTHREAD_LIBS}"
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS= --localstatedir=${PREFIX} --with-db
 MAKE_ENV=       PREFIX="${PREFIX}"
 
@@ -43,13 +54,12 @@ pre-configure:
 	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
-	@${INSTALL} -d ${DOCDIR}/Img
-	@cd ${WRKSRC} && \
-	${INSTALL_DATA} CHANGES.TXT index.shtml style.css mailto.js \
-	license-body.html LICENSE.TXT milter-sender.mc responses.txt \
-	${DOCDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/Img
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	@cd ${WRKSRC}/Img && \
-	${INSTALL_DATA} *.gif *.png ${DOCDIR}/Img
+	${INSTALL_DATA} *.gif *.png ${DOCSDIR}/Img
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 post-deinstall:
@@ -58,4 +68,4 @@ post-deinstall:
 	@${ECHO_MSG} "and rebuild sendmail.cf file!"
 	@${ECHO_MSG} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/milter-sender/files/patch-ab b/mail/milter-sender/files/patch-ab
index a7e3fad..0bc6648 100644
--- a/mail/milter-sender/files/patch-ab
+++ b/mail/milter-sender/files/patch-ab
@@ -1,5 +1,5 @@
 --- install.sh.orig	Wed Sep 17 01:38:25 2003
-+++ install.sh	Mon Sep 22 03:59:39 2003
++++ install.sh	Thu Sep 25 22:01:32 2003
 @@ -17,20 +17,18 @@
  chown ${USER} ${STATEDIR}
  chgrp ${GROUP} ${STATEDIR}
@@ -11,7 +11,8 @@
 +#chown ${USER} ${BINDIR}/${MILTER}
 +#chgrp ${GROUP} ${BINDIR}/${MILTER}
  
- chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.*
+-chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.*
++#chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.*
  
  
  case `uname -s` in
diff --git a/mail/milter-sender/pkg-message b/mail/milter-sender/pkg-message
index e9743ce..26c39bd 100644
--- a/mail/milter-sender/pkg-message
+++ b/mail/milter-sender/pkg-message
@@ -1,6 +1,6 @@
 ************************************************************************
 
-In order to run this port, please add the following line to
+In order to run this port, please add the following lines to
 /etc/mail/YOUR-CONF.mc:
 
 INPUT_MAIL_FILTER(
@@ -12,6 +12,6 @@ define(
 	{client_addr}, {client_name}, {client_port}, {client_resolve}'
 )dnl
 
-Don't forget 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 e683775..239e5fc 100644
--- a/mail/milter-sender/pkg-plist
+++ b/mail/milter-sender/pkg-plist
@@ -1,22 +1,25 @@
 etc/rc.d/milter-sender.sh-dist
 sbin/milter-sender
 @exec install -d -o smmsp -g smmsp -m 755 lib/milter-sender
-share/doc/milter-sender/CHANGES.TXT
-share/doc/milter-sender/Img/bg.gif
-share/doc/milter-sender/Img/dilbert2003071742312.gif
-share/doc/milter-sender/Img/dilbert2003228690821.gif
-share/doc/milter-sender/Img/mrpixel.gif
-share/doc/milter-sender/Img/overview.png
-share/doc/milter-sender/Img/sendmail-bat-left-142x38.png
-share/doc/milter-sender/Img/sendmail-bat-right-142x38.png
-share/doc/milter-sender/Img/sun.gif
-share/doc/milter-sender/LICENSE.TXT
-share/doc/milter-sender/index.shtml
-share/doc/milter-sender/license-body.html
-share/doc/milter-sender/mailto.js
-share/doc/milter-sender/milter-sender.mc
-share/doc/milter-sender/responses.txt
-share/doc/milter-sender/style.css
-@dirrm share/doc/milter-sender/Img
-@dirrm share/doc/milter-sender
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.TXT
+%%PORTDOCS%%%%DOCSDIR%%/Img/bg.gif
+%%PORTDOCS%%%%DOCSDIR%%/Img/dilbert2003071742312.gif
+%%PORTDOCS%%%%DOCSDIR%%/Img/dilbert2003228690821.gif
+%%PORTDOCS%%%%DOCSDIR%%/Img/mrpixel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Img/overview.png
+%%PORTDOCS%%%%DOCSDIR%%/Img/sendmail-bat-left-142x38.png
+%%PORTDOCS%%%%DOCSDIR%%/Img/sendmail-bat-right-142x38.png
+%%PORTDOCS%%%%DOCSDIR%%/Img/sun.gif
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
+%%PORTDOCS%%%%DOCSDIR%%/index.shtml
+%%PORTDOCS%%%%DOCSDIR%%/license-body.html
+%%PORTDOCS%%%%DOCSDIR%%/mailto.js
+%%PORTDOCS%%%%DOCSDIR%%/milter-sender.mc
+%%PORTDOCS%%%%DOCSDIR%%/responses.txt
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+@unexec echo "If permanently deleting this package, don't forget to delete the filter"
+@unexec echo "description of milter-sender from /etc/mail/YOUR-CONF.mc and to rebuild"
+@unexec echo "sendmail.cf file!"
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Img
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/milter-sender