ports/185482: [patch] ports/mail/qpopper fails to install

[Helge Oldach]

>Number:         185482
>Category:       ports
>Synopsis:       [patch] ports/mail/qpopper fails to install
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 05 08:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 9.2-972 i386
>Organization:
>Environment:

System: FreeBSD localhost 9.2-972 FreeBSD 9.2-972 #0: Thu Jan 2 17:56:02 CET 2014 toor at localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

With the APOP option off, installation of the port fails:

===>  Installing for qpopper-4.1.0_1
===>   Generating temporary packing list
===>  Checking if mail/qpopper already installed
install: /usr/obj/usr/ports/mail/qpopper/work/qpopper4.1.0/popper/popauth: No such file or directory
*** [do-install] Error code 71

Stop in /usr/ports/mail/qpopper.
*** [install] Error code 1

Stop in /usr/ports/mail/qpopper.

>How-To-Repeat:

make install

>Fix:

The Makefile does not fully adhere the optionsng framework. The patch
below changes it to follow the ${PORT_OPTIONS:Mknob} syntax. While at
it, make use of the standard DOCS option in favor of DOCUMENTATION and
fix the install-conf-file target.

--- Makefile.ctm	2013-09-21 13:17:04.000000000 +0200
+++ Makefile	2014-01-05 08:34:52.000000000 +0100
@@ -41,13 +41,12 @@
 #
 PKGDEINSTALL=	${PKGINSTALL}
 
-OPTIONS_DEFINE=	APOP_ONLY APOP DOCUMENTATION DRAC FULL_POPD_DEBUG PAM \
+OPTIONS_DEFINE=	APOP_ONLY APOP DOCS DRAC FULL_POPD_DEBUG PAM \
 	POPPASSD QPOPAUTH_SETUID SAMPLE_POPUSERS SHY_ENABLED \
 	SSL STANDALONE_MODE U_OPTION
 
 APOP_ONLY_DESC=	build with APOP authentication only
 APOP_DESC=	build with APOP
-DOCUMENTATION_DESC=	install pdf documentation
 DRAC_DESC=	build with Dynamic Relay Authorization
 FULL_POPD_DEBUG_DESC=	build with more verbose debugging
 PAM_DESC=	build with PAM authentication
@@ -78,12 +77,6 @@
 .endif
 .endif
 
-# Do not install documentation since it is in pdf format and normally
-# not used unless user wants it.
-.if empty(PORT_OPTIONS:MDOCUMENTATION)
-NOPORTDOCS=	yes
-.endif
-
 # If WITH_DRAC variable present in the environment, qpopper builds
 # with Dynamic Relay Authorization Control support.
 .if ${PORT_OPTIONS:MDRAC}
@@ -139,11 +132,11 @@
 	@${REINPLACE_CMD} -e \
 		's|\$${sbindir}/sendmail|${LOCALBASE}/sbin/sendmail|g' \
 		${WRKSRC}/configure.in
-.if defined(WITH_POPPASSD)
+.if ${PORT_OPTIONS:MPOPPASSD}
 	@${REINPLACE_CMD} -e 's|/usr/bin/smbpasswd|${LOCALBASE}/bin/smbpasswd|' \
 		${WRKSRC}/password/poppassd.c
 .endif
-.if defined(WITHOUT_U_OPTION)
+.if ${PORT_OPTIONS:MU_OPTION}
 	@${REINPLACE_CMD} -E -e 's|(getopt \(.+)u|\1|' \
 		${WRKSRC}/popper/main.c
 .endif
@@ -152,12 +145,12 @@
 	@(cd ${WRKSRC}; ${CHMOD} u+w configure*)
 
 do-install:
-.if !defined(WITHOUT_APOP)
+.if ${PORT_OPTIONS:MAPOP}
 	@${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.
-.if !defined(WITHOUT_QPOPAUTH_SETUID)
+.if ${PORT_OPTIONS:MQPOPAUTH_SETUID}
 	@${CHOWN} pop ${PREFIX}/bin/qpopauth
 	@${CHMOD} u+s ${PREFIX}/bin/qpopauth
 .endif
@@ -166,12 +159,12 @@
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/popper/popper ${PREFIX}/libexec/qpopper
 	@${INSTALL_MAN} ${WRKSRC}/man/popper.8 ${MANPREFIX}/man/man8/qpopper.8
-.if defined(WITH_POPPASSD)
+.if ${PORT_OPTIONS:MPOPPASSD}
 	@${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${PREFIX}/libexec/qpoppassd
 .endif
 	@${INSTALL} -d -o ${POP_USER} -g ${POP_GROUP} -m ${POP_MODE_DIR} \
 		${ETCDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/GUIDE.pdf ${DOCSDIR}
 .endif
@@ -182,16 +175,16 @@
 # based on original from op port, written by Cyrille Lefevre
 # <clefevre at citeweb.net>.
 install-conf-file:
-	@if [ ! -f ${CONF_DIR}/${CONF_FILE}${SAMP_SUFX} ]; then \
-		if [ -f /etc/ftpusers ] && [ -n "${WITH_SAMPLE_POPUSERS}" ]; then \
-			${INSTALL} -c -o ${POP_USER} -g ${POP_GROUP} -m ${POP_MODE_CONF} \
-				/etc/ftpusers ${POPUSERS_FILE}${SAMPLE_EXT} ; \
-		else \
-			${CP} /dev/null ${POPUSERS_FILE}${SAMPLE_EXT} ; \
-			${CHOWN} ${POP_USER}:${POP_GROUP} ${POPUSERS_FILE}${SAMPLE_EXT} ; \
-			${CHMOD} ${POP_MODE_CONF} ${POPUSERS_FILE}${SAMPLE_EXT} ; \
-		fi ; \
+.if ${PORT_OPTIONS:MSAMPLE_POPUSERS}
+	@if [ -f /etc/ftpusers ]; then \
+		${INSTALL} -c -o ${POP_USER} -g ${POP_GROUP} -m ${POP_MODE_CONF} \
+			/etc/ftpusers ${POPUSERS_FILE}${SAMPLE_EXT} ; \
+	else \
+		${CP} /dev/null ${POPUSERS_FILE}${SAMPLE_EXT} ; \
+		${CHOWN} ${POP_USER}:${POP_GROUP} ${POPUSERS_FILE}${SAMPLE_EXT} ; \
+		${CHMOD} ${POP_MODE_CONF} ${POPUSERS_FILE}${SAMPLE_EXT} ; \
 	fi
+.endif
 	@${INSTALL} -c -m 0640 \
 		${WRKSRC}/samples/qpopper.config ${PREFIX}/etc/qpopper.config${SAMPLE_EXT}
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
>Release-Note:
>Audit-Trail:
>Unformatted: