Date: Thu, 14 Jan 2010 02:09:56 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/142805: [PATCH] mail/relay-ctrl: use $SUB_FILES to dynamically adjust pkg-message & install Message-ID: <201001140209.o0E29ujf003154@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001140220.o0E2K1Bn006225@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142805
>Category: ports
>Synopsis: [PATCH] mail/relay-ctrl: use $SUB_FILES to dynamically adjust pkg-message & install
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 14 02:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC
>Description:
No need to invoke sed manually, SUB_FILES will take care of this.
Added file(s):
- files/pkg-install.in
- files/pkg-message.in
Removed file(s):
- pkg-install.in
- pkg-message
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- relay-ctrl-3.1.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/relay-ctrl/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 11 Oct 2004 23:03:57 -0000 1.3
+++ Makefile 14 Jan 2010 02:07:42 -0000
@@ -25,9 +25,9 @@
relay-ctrl-send.8 relay-ctrl-udp.8
DOCS= ANNOUNCEMENT NEWS README TODO packet.html
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-install
-PKGMESSAGE= ${WRKDIR}/pkg-message
+PKGDEINSTALL= ${PKGINSTALL}
+SUB_FILES= pkg-message pkg-install
+SUB_LIST= EXPIRY=${RELAY_CTRL_EXPIRY} FIXUP=${RELAY_CTRL_RELAYCLIENT}
do-configure:
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
@@ -41,12 +41,7 @@
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
- @${SED} -e 's,%%EXPIRY%%,${RELAY_CTRL_EXPIRY},' \
- -e 's,%%FIXUP%%,${RELAY_CTRL_RELAYCLIENT},' \
- ${PKGDIR}/pkg-install.in > ${PKGINSTALL}
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${SED} -e 's,%%PREFIX%%,${PREFIX},g; s,%%LOCALBASE%%,${LOCALBASE},g' \
- ${PKGDIR}/pkg-message > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Index: pkg-install.in
===================================================================
RCS file: pkg-install.in
diff -N pkg-install.in
--- pkg-install.in 24 Mar 2004 19:57:02 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-[ $# != 2 ] && exit 1
-PKGNAME=$1
-ACTION=$2
-
-
-CHMOD=/bin/chmod
-ECHO_CMD=echo
-RM='/bin/rm -rf'
-CP='/bin/cp -p'
-CMP='/usr/bin/cmp -s'
-MKDIR='/bin/mkdir -p'
-
-RELAYCTRL_EXPIRY=600
-
-PREFIX=${PKG_PREFIX}
-SPOOLDIR=/var/spool
-ETCDIR=${PREFIX}/etc/relay-ctrl
-RELAYCLIENT=${ETCDIR}/RELAY_CTRL_RELAYCLIENT
-EXPIRY=${ETCDIR}/RELAY_CTRL_EXPIRY
-
-case "$ACTION" in
-
-POST-INSTALL)
- ${MKDIR} ${ETCDIR} ${SPOOLDIR}/relay-ctrl/allow
- ${CHMOD} 0700 ${SPOOLDIR}/relay-ctrl
- ${CHMOD} 0777 ${SPOOLDIR}/relay-ctrl/allow
- ${ECHO_CMD} "${SPOOLDIR}/relay-ctrl/allow" > ${ETCDIR}/RELAY_CTRL_DIR
- ${ECHO_CMD} "%%EXPIRY%%" > ${EXPIRY}
- if [ -z "%%FIXUP%%" ]; then
- ${ECHO_CMD} "===> RELAY-CTRL: Script do not create RELAY_CTRL_RELAYCLIENT"
- else
- if [ -e "${RELAYCLIENT}" ]; then
- ${ECHO_CMD} ":allow,RELAYCLIENT='%%FIXUP%%'" > ${RELAYCLIENT}-sample
- else
- ${ECHO_CMD} ":allow,RELAYCLIENT='%%FIXUP%%'" > ${RELAYCLIENT}
- ${CP} ${RELAYCLIENT} ${RELAYCLIENT}-dist
- fi
- fi
- ;;
-
-DEINSTALL)
- ${RM} ${SPOOLDIR}/relay-ctrl
- if ${CMP} ${RELAYCLIENT} ${RELAYCLIENT}-dist; then \
- ${RM} ${RELAYCLIENT}
- fi
- if [ -e ${RELAYCLIENT}-dist ]; then
- ${RM} ${RELAYCLIENT}-dist
- else
- ${RM} ${RELAYCLIENT}-sample
- fi
- ;;
-
-PRE-INSTALL|POST-DEINSTALL)
- ;;
-
-*)
- exit 1
- ;;
-esac
-
-exit
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 24 Dec 2003 10:42:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-You may need to edit root's crontab:
-
-#minute hour mday month wday who command
-* * * * * root %%LOCALBASE%%/bin/envdir %%PREFIX%%/etc/relay-ctrl %%PREFIX%%/bin/relay-ctrl-age
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/relay-ctrl/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist 12 May 2006 14:28:16 -0000 1.3
+++ pkg-plist 14 Jan 2010 02:07:42 -0000
@@ -5,9 +5,9 @@
bin/relay-ctrl-check
bin/relay-ctrl-send
bin/relay-ctrl-udp
-etc/relay-ctrl/RELAY_CTRL_DIR
-etc/relay-ctrl/RELAY_CTRL_EXPIRY
-@dirrmtry etc/relay-ctrl
+%%ETCDIR%%/RELAY_CTRL_DIR
+%%ETCDIR%%/RELAY_CTRL_EXPIRY
+@dirrmtry %%ETCDIR%%
%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCEMENT
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
Index: files/pkg-install.in
===================================================================
RCS file: files/pkg-install.in
diff -N files/pkg-install.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-install.in 14 Jan 2010 02:07:42 -0000
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+[ $# != 2 ] && exit 1
+PKGNAME=$1
+ACTION=$2
+
+
+CHMOD=/bin/chmod
+ECHO_CMD=echo
+RM='/bin/rm -rf'
+CP='/bin/cp -p'
+CMP='/usr/bin/cmp -s'
+MKDIR='/bin/mkdir -p'
+
+RELAYCTRL_EXPIRY=600
+
+PREFIX=${PKG_PREFIX}
+SPOOLDIR=/var/spool
+ETCDIR=${PREFIX}/etc/relay-ctrl
+RELAYCLIENT=${ETCDIR}/RELAY_CTRL_RELAYCLIENT
+EXPIRY=${ETCDIR}/RELAY_CTRL_EXPIRY
+
+case "$ACTION" in
+
+POST-INSTALL)
+ ${MKDIR} ${ETCDIR} ${SPOOLDIR}/relay-ctrl/allow
+ ${CHMOD} 0700 ${SPOOLDIR}/relay-ctrl
+ ${CHMOD} 0777 ${SPOOLDIR}/relay-ctrl/allow
+ ${ECHO_CMD} "${SPOOLDIR}/relay-ctrl/allow" > ${ETCDIR}/RELAY_CTRL_DIR
+ ${ECHO_CMD} "%%EXPIRY%%" > ${EXPIRY}
+ if [ -z "%%FIXUP%%" ]; then
+ ${ECHO_CMD} "===> RELAY-CTRL: Script do not create RELAY_CTRL_RELAYCLIENT"
+ else
+ if [ -e "${RELAYCLIENT}" ]; then
+ ${ECHO_CMD} ":allow,RELAYCLIENT='%%FIXUP%%'" > ${RELAYCLIENT}-sample
+ else
+ ${ECHO_CMD} ":allow,RELAYCLIENT='%%FIXUP%%'" > ${RELAYCLIENT}
+ ${CP} ${RELAYCLIENT} ${RELAYCLIENT}-dist
+ fi
+ fi
+ ;;
+
+DEINSTALL)
+ ${RM} ${SPOOLDIR}/relay-ctrl
+ if ${CMP} ${RELAYCLIENT} ${RELAYCLIENT}-dist; then \
+ ${RM} ${RELAYCLIENT}
+ fi
+ if [ -e ${RELAYCLIENT}-dist ]; then
+ ${RM} ${RELAYCLIENT}-dist
+ else
+ ${RM} ${RELAYCLIENT}-sample
+ fi
+ ;;
+
+PRE-INSTALL|POST-DEINSTALL)
+ ;;
+
+*)
+ exit 1
+ ;;
+esac
+
+exit
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in 14 Jan 2010 02:07:42 -0000
@@ -0,0 +1,4 @@
+You may need to edit root's crontab:
+
+#minute hour mday month wday who command
+* * * * * root %%LOCALBASE%%/bin/envdir %%PREFIX%%/etc/relay-ctrl %%PREFIX%%/bin/relay-ctrl-age
--- relay-ctrl-3.1.1_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001140209.o0E29ujf003154>