svn commit: r500632 - in head/mail: sendmail sendmail-devel sendmail-devel/files sendmail/files

[Dirk Meyer]

Author: dinoex
Date: Thu May  2 06:00:12 2019
New Revision: 500632
URL: https://svnweb.freebsd.org/changeset/ports/500632

Log:
  - cleanup pkg-message

Added:
  head/mail/sendmail-devel/files/pkg-message.in
     - copied, changed from r500631, head/mail/sendmail-devel/pkg-message
  head/mail/sendmail/files/pkg-message.in
     - copied, changed from r500631, head/mail/sendmail/pkg-message
Deleted:
  head/mail/sendmail-devel/pkg-message
  head/mail/sendmail/pkg-message
Modified:
  head/mail/sendmail-devel/Makefile
  head/mail/sendmail/Makefile

Modified: head/mail/sendmail-devel/Makefile
==============================================================================
--- head/mail/sendmail-devel/Makefile	Thu May  2 04:26:27 2019	(r500631)
+++ head/mail/sendmail-devel/Makefile	Thu May  2 06:00:12 2019	(r500632)
@@ -34,7 +34,7 @@ DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES 
 		sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
 PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==} \
 		MANPREFIX=${MANPREFIX:S=$=/=:S=${PREFIX}==:S=^/==}
-PKGMESSAGE=	${WRKSRC}/pkg-message
+SUB_FILES=	pkg-message
 
 WCONF=		${WRKSRC}/devtools/Site
 SITE=		${FILESDIR}/site.config.m4.pre4
@@ -153,12 +153,6 @@ SED_SCRIPT=	-e "s|\`-O'|\`${CFLAGS}'|" \
 SED_SCRIPT+=	-e "s;-DNIS ;;"
 .endif
 
-post-patch:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
-		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
-		-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
-		${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
-
 do-configure:
 .if ${PORT_OPTIONS:MGDBM}
 	@(if [ ! -e "${LOCALBASE}/lib/libgdbm_compat.so" ] ; then \
@@ -284,13 +278,8 @@ post-install-DOCS-on:
 
 mailer.base:
 	@${SED} \
-	-e "s=^sendmail[ 	]*/.*$$=sendmail	${BASEMAIL}=" \
-	-e "s=^send-mail[ 	]*/.*$$=send-mail	${BASEMAIL}=" \
-	-e "s=^mailq[ 	]*/.*$$=mailq		${BASEMAIL}=" \
-	-e "s=^newaliases[ 	]*/.*$$=newaliases	${BASEMAIL}=" \
-	-e "s=^hoststat[ 	]*/.*$$=hoststat	${BASEMAIL}=" \
-	-e "s=^purgestat[ 	]*/.*$$=purgestat	${BASEMAIL}=" \
-	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
+	 -e "s=\([ 	]\)/.*$$=\\1${BASEMAIL}=" \
+	 ${FILESDIR}/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
 	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
 		${DESTDIR}/etc/mail/mailer.conf
 
@@ -374,7 +363,7 @@ pre-everything::
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# Please install with normal PREFIX"
 	@${ECHO_CMD} "# and activate the port version with"
-	@${ECHO_CMD} "# cd ${PORTSDIR}/mail/sendmail && make mailer.conf"
+	@${ECHO_CMD} "# cd /usr/local/etc/mail && cp mailer.conf.sendmail mailer.conf"
 	@${ECHO_CMD} "#"
 	@${FALSE}
 .endif

Copied and modified: head/mail/sendmail-devel/files/pkg-message.in (from r500631, head/mail/sendmail-devel/pkg-message)
==============================================================================
--- head/mail/sendmail-devel/pkg-message	Thu May  2 04:26:27 2019	(r500631, copy source)
+++ head/mail/sendmail-devel/files/pkg-message.in	Thu May  2 06:00:12 2019	(r500632)
@@ -15,8 +15,8 @@ define(`confEBINDIR', `%%PREFIX%%/libexec')dnl
 define(`UUCP_MAILER_PATH', `%%LOCALBASE%%/bin/uux')dnl
 
 ---------------------------------------------------
-To activate sendmail as your default mailer, call the target 'mailer.conf':
-$ cd %%PORTSDIR%%/mail/sendmail && make mailer.conf
+To activate sendmail as your default mailer, run:
+$ cd %%PREFIX%%/etc/mail && cp mailer.conf.sendmail mailer.conf
 
 Your '%%PREFIX%%/etc/mail/mailer.conf' should look like this:
 #

Modified: head/mail/sendmail/Makefile
==============================================================================
--- head/mail/sendmail/Makefile	Thu May  2 04:26:27 2019	(r500631)
+++ head/mail/sendmail/Makefile	Thu May  2 06:00:12 2019	(r500632)
@@ -33,7 +33,7 @@ DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES 
 		sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
 PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==} \
 		MANPREFIX=${MANPREFIX:S=$=/=:S=${PREFIX}==:S=^/==}
-PKGMESSAGE=	${WRKSRC}/pkg-message
+SUB_FILES=	pkg-message
 
 WCONF=		${WRKSRC}/devtools/Site
 SITE=		${FILESDIR}/site.config.m4.pre4
@@ -157,12 +157,6 @@ SED_SCRIPT=	-e "s|\`-O'|\`${CFLAGS}'|" \
 SED_SCRIPT+=	-e "s;-DNIS ;;"
 .endif
 
-post-patch:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
-		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
-		-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
-		${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
-
 do-configure:
 .if ${PORT_OPTIONS:MGDBM}
 	@(if [ ! -e "${LOCALBASE}/lib/libgdbm_compat.so" ] ; then \
@@ -285,13 +279,8 @@ post-install-DOCS-on:
 
 mailer.base:
 	@${SED} \
-	-e "s=^sendmail[ 	]*/.*$$=sendmail	${BASEMAIL}=" \
-	-e "s=^send-mail[ 	]*/.*$$=send-mail	${BASEMAIL}=" \
-	-e "s=^mailq[ 	]*/.*$$=mailq		${BASEMAIL}=" \
-	-e "s=^newaliases[ 	]*/.*$$=newaliases	${BASEMAIL}=" \
-	-e "s=^hoststat[ 	]*/.*$$=hoststat	${BASEMAIL}=" \
-	-e "s=^purgestat[ 	]*/.*$$=purgestat	${BASEMAIL}=" \
-	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
+	 -e "s=\([ 	]\)/.*$$=\\1${BASEMAIL}=" \
+	 ${FILESDIR}/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
 	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
 		${DESTDIR}/etc/mail/mailer.conf
 
@@ -375,7 +364,7 @@ pre-everything::
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# Please install with normal PREFIX"
 	@${ECHO_CMD} "# and activate the port version with"
-	@${ECHO_CMD} "# cd ${PORTSDIR}/mail/sendmail && make mailer.conf"
+	@${ECHO_CMD} "# cd /usr/local/etc/mail && cp mailer.conf.sendmail mailer.conf"
 	@${ECHO_CMD} "#"
 	@${FALSE}
 .endif

Copied and modified: head/mail/sendmail/files/pkg-message.in (from r500631, head/mail/sendmail/pkg-message)
==============================================================================
--- head/mail/sendmail/pkg-message	Thu May  2 04:26:27 2019	(r500631, copy source)
+++ head/mail/sendmail/files/pkg-message.in	Thu May  2 06:00:12 2019	(r500632)
@@ -15,8 +15,8 @@ define(`confEBINDIR', `%%PREFIX%%/libexec')dnl
 define(`UUCP_MAILER_PATH', `%%LOCALBASE%%/bin/uux')dnl
 
 ---------------------------------------------------
-To activate sendmail as your default mailer, call the target 'mailer.conf':
-$ cd %%PORTSDIR%%/mail/sendmail && make mailer.conf
+To activate sendmail as your default mailer, run:
+$ cd %%PREFIX%%/etc/mail && cp mailer.conf.sendmail mailer.conf
 
 Your '%%PREFIX%%/etc/mail/mailer.conf' should look like this:
 #