Date: Thu, 14 Jan 2010 01:46:45 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bc979@lafn.org Subject: ports/142804: [PATCH] mail/qpopper: use $SUB_FILES to dynamically adjust pkg-message + other changes Message-ID: <201001140146.o0E1kjgV097914@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001140200.o0E206NU088693@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142804
>Category: ports
>Synopsis: [PATCH] mail/qpopper: use $SUB_FILES to dynamically adjust pkg-message + other changes
>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:00:06 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:
[DESCRIBE CHANGES]
Added file(s):
use SUBFILES to adjust pkg-message
use ETCDIR & DOCSDIR in pkg-plist
Removed file(s):
- pkg-message
Port maintainer (bc979@lafn.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- qpopper-4.0.9_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/qpopper/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile 8 Jan 2009 16:58:28 -0000 1.96
+++ Makefile 14 Jan 2010 01:42:50 -0000
@@ -33,12 +33,14 @@
MAN8= qpopper.8
+SUB_FILES= pkg-message
+
# internal configuration
POP_USER= pop
POP_GROUP= daemon
POP_MODE_DIR= 0711
POP_MODE_CONF= 0444
-POPUSERS_FILE= ${PREFIX}/etc/qpopper/popusers
+POPUSERS_FILE= ${ETCDIR}/popusers
SAMPLE_EXT= .sample
#
PKGDEINSTALL= ${PKGINSTALL}
@@ -57,7 +59,7 @@
STANDALONE_MODE "build qpopper to be run without inetd" off \
U_OPTION "include support for user .qpopper-options" on
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if !defined(WITHOUT_IPV6)
PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/
@@ -68,7 +70,7 @@
.if defined(WITHOUT_APOP)
QPOPAUTH= "@comment "
.else
-CONFIGURE_ARGS+= --enable-apop=${PREFIX}/etc/qpopper/pop.auth \
+CONFIGURE_ARGS+= --enable-apop=${ETCDIR}/pop.auth \
--with-apopuid=pop
MAN8+= qpopauth.8
QPOPAUTH= ""
@@ -131,6 +133,8 @@
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
.endif
+.include <bsd.port.pre.mk>
+
post-patch:
@${RM} -f ${WRKSRC}/popper/md5.h
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/*
@@ -165,14 +169,14 @@
@${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${PREFIX}/libexec/qpoppassd
.endif
@${INSTALL} -d -o ${POP_USER} -g ${POP_GROUP} -m ${POP_MODE_DIR} \
- ${PREFIX}/etc/${PORTNAME}
+ ${ETCDIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/GUIDE.pdf ${DOCSDIR}
.endif
post-install: install-conf-file
- @${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
# based on original from op port, written by Cyrille Lefevre
# <clefevre@citeweb.net>.
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 9 May 2005 21:36:02 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-
-****************************************************************************
-To enable the qpopper-daemon, add the following line to your /etc/inetd.conf:
-
- pop3 stream tcp nowait root /usr/local/libexec/qpopper qpopper -s
-****************************************************************************
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/qpopper/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist 31 Jul 2005 09:28:18 -0000 1.18
+++ pkg-plist 14 Jan 2010 01:42:51 -0000
@@ -3,10 +3,9 @@
%%QPOPAUTH%%@exec ln -sf %D/bin/qpopauth %D/bin/qapopauth
libexec/qpopper
%%EPOPPASSD%%libexec/qpoppassd
-@exec mkdir -p %D/etc/qpopper && chown %%POP_USER%%:%%POP_GROUP%% %D/etc/qpopper && chmod %%POP_MODE_DIR%% %D/etc/qpopper
-@mode %%POP_MODE_CONF%%
-etc/qpopper/popusers.sample
+@exec mkdir -p %%ETCDIR%% && chown %%POP_USER%%:%%POP_GROUP%% %%ETCDIR%% && chmod %%POP_MODE_DIR%% %%ETCDIR%%
+%%ETCDIR%%/popusers.sample
etc/qpopper.config.sample
-%%PORTDOCS%%share/doc/qpopper/GUIDE.pdf
-%%PORTDOCS%%@dirrm share/doc/qpopper
-@unexec rmdir %D/etc/qpopper 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/qpopper`` to remove any configuration files and logs left." | fmt
+%%PORTDOCS%%%%DOCSDIR%%/GUIDE.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%ETCDIR%% || echo "If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files and logs left." | fmt
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 01:42:51 -0000
@@ -0,0 +1,6 @@
+
+****************************************************************************
+To enable the qpopper-daemon, add the following line to your /etc/inetd.conf:
+
+ pop3 stream tcp nowait root %%PREFIX%%/libexec/qpopper qpopper -s
+****************************************************************************
--- qpopper-4.0.9_2.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?201001140146.o0E1kjgV097914>