From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 5 08:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 205E9CE5 for ; Sun, 5 Jan 2014 08:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E979D19AF for ; Sun, 5 Jan 2014 08:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s05800On041499 for ; Sun, 5 Jan 2014 08:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s05800ZH041485; Sun, 5 Jan 2014 08:00:00 GMT (envelope-from gnats) Resent-Date: Sun, 5 Jan 2014 08:00:00 GMT Resent-Message-Id: <201401050800.s05800ZH041485@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Helge Oldach Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F26CBCC4 for ; Sun, 5 Jan 2014 07:55:00 +0000 (UTC) Received: from argali.in-berlin.de (argali.in-berlin.de [192.109.42.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 815AD199E for ; Sun, 5 Jan 2014 07:54:59 +0000 (UTC) Received: from sep.oldach.net (hmo.in-vpn.de [217.197.85.210]) by argali.in-berlin.de (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id s057rBXh016261 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 5 Jan 2014 08:53:12 +0100 Received: from sep.oldach.net (localhost [127.0.0.1]) by sep.oldach.net (8.14.7/8.14.7/hmo26jun05) with ESMTP id s057rAiN004103 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 5 Jan 2014 08:53:10 +0100 (CET) (envelope-from hmo@sep.oldach.net) Received: (from hmo@localhost) by sep.oldach.net (8.14.7/8.14.7/Submit) id s057r6FN004099; Sun, 5 Jan 2014 08:53:06 +0100 (CET) (envelope-from hmo) Message-Id: <201401050753.s057r6FN004099@sep.oldach.net> Date: Sun, 5 Jan 2014 08:53:06 +0100 (CET) From: Helge Oldach To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/185482: [patch] ports/mail/qpopper fails to install Cc: bc979@lafn.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Helge Oldach List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jan 2014 08:00:01 -0000 >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@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 # . 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: