- cleanup option BATCH

9 files changed, 9 insertions, 27 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 0232a61..503fd14 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -315,14 +315,6 @@ do-configure:
 	 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(BATCH)
-	${ECHO_CMD} \
-	 'define(`confNO_HELPFILE_INSTALL'\'',`True'\'')' \
-		>> ${WCONF}/site.config.m4
-	${ECHO_CMD} \
-	 'define(`confNO_STATISTICS_INSTALL'\'', `True'\'')' \
-		>> ${WCONF}/site.config.m4
-.endif
 
 post-build:
 	( cd ${WRKSRC}/doc/op && ${MAKE} op.txt )
diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4
index 3c23ccd..6fca36f 100644
--- a/mail/sendmail/files/site.config.m4
+++ b/mail/sendmail/files/site.config.m4
@@ -5,5 +5,6 @@ define(`confMBINDIR',`%%PREFIX%%/sbin')
 define(`confSBINDIR',`%%PREFIX%%/sbin')
 define(`confUBINDIR',`%%PREFIX%%/bin')
 define(`confNO_STATISTICS_INSTALL',`True')
+define(`confHFDIR', `%%PREFIX%%/share/sendmail')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
 APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
diff --git a/mail/sendmail/pkg-plist b/mail/sendmail/pkg-plist
index 10ae51c..1eab6eb1 100644
--- a/mail/sendmail/pkg-plist
+++ b/mail/sendmail/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail/pkg-plist,v 1.16 2003-10-09 16:23:40 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail/pkg-plist,v 1.17 2004-12-17 14:27:01 dinoex Exp $
 @exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 25; fi
 @exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 25 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
 @exec mkdir -p /var/spool/clientmqueue
@@ -25,6 +25,7 @@ sbin/sendmail
 @group
 @comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
 @exec chmod 2555 %D/sbin/sendmail
+share/sendmail/helpfile
 %%PORTDOCS%%%%DOCSDIR%%/op.ps
 %%PORTDOCS%%%%DOCSDIR%%/op.txt
 %%PORTDOCS%%%%DOCSDIR%%/DEVTOOLS
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index cdbc114..fc9c0a9 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -127,14 +127,6 @@ do-configure:
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
 		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
 		${SITE} > ${WCONF}/site.config.m4
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(BATCH)
-	${ECHO_CMD} \
-	 'define(`confNO_HELPFILE_INSTALL'\'',`True'\'')' \
-		>> ${WCONF}/site.config.m4
-	${ECHO_CMD} \
-	 'define(`confNO_STATISTICS_INSTALL'\'', `True'\'')' \
-		>> ${WCONF}/site.config.m4
-.endif
 
 .if ! defined(SENDMAIL_WITHOUT_MILTER)
 post-build:
diff --git a/mail/sendmail811/files/site.config.m4 b/mail/sendmail811/files/site.config.m4
index 3c23ccd..6fca36f 100644
--- a/mail/sendmail811/files/site.config.m4
+++ b/mail/sendmail811/files/site.config.m4
@@ -5,5 +5,6 @@ define(`confMBINDIR',`%%PREFIX%%/sbin')
 define(`confSBINDIR',`%%PREFIX%%/sbin')
 define(`confUBINDIR',`%%PREFIX%%/bin')
 define(`confNO_STATISTICS_INSTALL',`True')
+define(`confHFDIR', `%%PREFIX%%/share/sendmail')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
 APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
diff --git a/mail/sendmail811/pkg-plist b/mail/sendmail811/pkg-plist
index 24e59e1..4284120 100644
--- a/mail/sendmail811/pkg-plist
+++ b/mail/sendmail811/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/Attic/pkg-plist,v 1.5 2001-10-09 19:16:58 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/Attic/pkg-plist,v 1.6 2004-12-17 14:27:01 dinoex Exp $
 bin/hoststat
 bin/mailq
 bin/newaliases
@@ -11,6 +11,7 @@ sbin/mailstats
 sbin/makemap
 sbin/praliases
 sbin/sendmail
+share/sendmail/helpfile
 %%PORTDOCS%%share/doc/sendmail/DEVTOOLS
 %%PORTDOCS%%share/doc/sendmail/SENDMAIL
 %%PORTDOCS%%share/doc/sendmail/MAIL.LOCAL
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 54f9a83..bf6494b 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -216,14 +216,6 @@ do-configure:
 	 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
-.if defined(PARALLEL_APACKAGE_BUILD) || defined(BATCH)
-	${ECHO_CMD} \
-	 'define(`confNO_HELPFILE_INSTALL'\'',`True'\'')' \
-		>> ${WCONF}/site.config.m4
-	${ECHO_CMD} \
-	 'define(`confNO_STATISTICS_INSTALL'\'', `True'\'')' \
-		>> ${WCONF}/site.config.m4
-.endif
 
 post-build:
 	( cd ${WRKSRC}/doc/op && ${MAKE} op.txt )
diff --git a/mail/sendmail812/files/site.config.m4 b/mail/sendmail812/files/site.config.m4
index 3c23ccd..6fca36f 100644
--- a/mail/sendmail812/files/site.config.m4
+++ b/mail/sendmail812/files/site.config.m4
@@ -5,5 +5,6 @@ define(`confMBINDIR',`%%PREFIX%%/sbin')
 define(`confSBINDIR',`%%PREFIX%%/sbin')
 define(`confUBINDIR',`%%PREFIX%%/bin')
 define(`confNO_STATISTICS_INSTALL',`True')
+define(`confHFDIR', `%%PREFIX%%/share/sendmail')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
 APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
diff --git a/mail/sendmail812/pkg-plist b/mail/sendmail812/pkg-plist
index a6b74c3..14b4702 100644
--- a/mail/sendmail812/pkg-plist
+++ b/mail/sendmail812/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.16 2003-10-09 16:23:40 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.17 2004-12-17 14:27:02 dinoex Exp $
 @exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 25; fi
 @exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 25 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
 @exec mkdir -p /var/spool/clientmqueue
@@ -25,6 +25,7 @@ sbin/sendmail
 @group
 @comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
 @exec chmod 2555 %D/sbin/sendmail
+share/sendmail/helpfile
 %%PORTDOCS%%%%DOCSDIR%%/op.ps
 %%PORTDOCS%%%%DOCSDIR%%/op.txt
 %%PORTDOCS%%%%DOCSDIR%%/DEVTOOLS