Add WITH_Y_OPTION knob which enables command line option -y allowing

the user to specify a different logging facility

Submitted by:	Christophe Labouisse <christophe@labouisse.org>
Reviewed by:	knu
Approved by:	portmgr (knu)

2 files changed, 35 insertions, 10 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index da3b132f4072..d2fe1c62ceb0 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qpopper
 PORTVERSION=	4.0.4
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
@@ -85,10 +86,9 @@ pre-everything::
 	@${ECHO_MSG} "                 This file can be owned by and writable by the"
 	@${ECHO_MSG} "                 user. If improperly written, may cause a buffer"
 	@${ECHO_MSG} "                 overflow which may remove such user's mail box"
-
-
-
-
+	@${ECHO_MSG} "WITH_Y_OPTION=yes		enables daemon command line option"
+	@${ECHO_MSG} "			-y which allows the user to specify a different"
+	@${ECHO_MSG} "			logging facility"
 
 # If WITH_APOP_ONLY variable present in the environment, qpopper builds
 # with APOP authentication only.
@@ -136,6 +136,13 @@ EPOPPASSD=	"@comment "
 CONFIGURE_ARGS+=	--enable-standalone
 .endif
 
+# If WITH_Y_OPTION variable present, qoppper daemon will
+# accept -y command line option which allows the user to specify a
+# different logging facility
+.if defined(WITH_Y_OPTION)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-popper::pop_init.c
+.endif
+
 .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
 CONFIGURE_ARGS+=	--with-openssl=/usr
 .elif exists(${LOCALBASE}/lib/libssl.a) && exists(${LOCALBASE}/lib/libcrypto.a)
@@ -164,7 +171,7 @@ pre-configure:
 	@(cd ${WRKSRC}; ${CHMOD} u+w configure*)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/popper/popauth ${PREFIX}/bin/qpopauth
+	@${INSTALL_PROGRAM} ${WRKSRC}/popper/popauth ${PREFIX}/bin/qpopauth
 # If WITHOUT_QPOPAUTH_SETUID variable present in the environment,
 # qpopper does not install qpopauth setuid to pop user so that
 # anyone can access the pop.auth database.
@@ -172,12 +179,12 @@ do-install:
 	@${CHOWN} pop ${PREFIX}/bin/qpopauth
 	@${CHMOD} u+s ${PREFIX}/bin/qpopauth
 .endif
-	${INSTALL_PROGRAM} ${WRKSRC}/popper/popper ${PREFIX}/libexec/qpopper
-	${INSTALL_MAN} ${WRKSRC}/man/popauth.8 ${MANPREFIX}/man/man8/qpopauth.8
-	${INSTALL_MAN} ${WRKSRC}/man/popper.8 ${MANPREFIX}/man/man8/qpopper.8
-	${LN} -sf ${PREFIX}/bin/qpopauth ${PREFIX}/bin/qapopauth
+	@${INSTALL_PROGRAM} ${WRKSRC}/popper/popper ${PREFIX}/libexec/qpopper
+	@${INSTALL_MAN} ${WRKSRC}/man/popauth.8 ${MANPREFIX}/man/man8/qpopauth.8
+	@${INSTALL_MAN} ${WRKSRC}/man/popper.8 ${MANPREFIX}/man/man8/qpopper.8
+	@${LN} -sf ${PREFIX}/bin/qpopauth ${PREFIX}/bin/qapopauth
 .if defined(WITH_POPPASSD)
-	${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${PREFIX}/libexec/qpoppassd
+	@${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${PREFIX}/libexec/qpoppassd
 .endif
 	@${INSTALL} -d -o ${POP_USER} -g ${POP_GROUP} -m ${POP_MODE_DIR} \
 		${PREFIX}/etc/${PORTNAME}
diff --git a/mail/qpopper/files/extra-patch-popper::pop_init.c b/mail/qpopper/files/extra-patch-popper::pop_init.c
new file mode 100644
index 000000000000..00a417d87f1b
--- /dev/null
+++ b/mail/qpopper/files/extra-patch-popper::pop_init.c
@@ -0,0 +1,18 @@
+--- popper/pop_init.c.orig	Sun Dec  1 13:49:35 2002
++++ popper/pop_init.c	Sun Dec  1 13:51:24 2002
+@@ -907,6 +907,7 @@
+                 fprintf ( stderr, "Error setting '-y' to %s\n", optarg );
+                 errflag++;
+             }
++            break;
+ 
+         default: /*  Unknown option received */
+             errflag++;
+@@ -979,6 +980,7 @@
+                           "[-u] "
+                           "[-U] "
+                           "[-v] "
++                          "[-y log-facility] "
+                           "\n",
+                   argmessage[0],
+                   xB,                   /* -B (or not) */