3 files changed, 57 insertions, 57 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 339a26c2c74e..11129bc74927 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -13,6 +13,13 @@ MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
+MAINTAINER=	lioux@FreeBSD.org
+COMMENT=	Berkeley POP 3 server (now maintained by Qualcomm)
+
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
@@ -21,26 +28,23 @@ PATCHFILES=	qpopper4.0.5-ipv6-20030313.diff.gz
 PATCH_DIST_STRIP=	-p1
 .endif
 
-MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	Berkeley POP 3 server (now maintained by Qualcomm)
-
 USE_AUTOCONF=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-lcrypt -lmd -lutil -L${LOCALBASE}/lib" \
 		OS_DEFS="-DSETPROCTITLE ${OS_DEFS}"
-CONFIGURE_ARGS=	--enable-apop=${PREFIX}/etc/qpopper/pop.auth \
-		--enable-nonauth-file=${POPUSERS_FILE} \
-		--with-apopuid=pop --without-gdbm \
+CONFIGURE_ARGS=	--enable-nonauth-file=${POPUSERS_FILE} \
+		--without-gdbm \
 		--enable-keep-temp-drop
 
 PLIST_SUB=	EPOPPASSD=${EPOPPASSD} \
 		POP_USER=${POP_USER} \
 		POP_GROUP=${POP_GROUP} \
 		POP_MODE_DIR=${POP_MODE_DIR} \
-		POP_MODE_CONF=${POP_MODE_CONF}
+		POP_MODE_CONF=${POP_MODE_CONF} \
+		QPOPAUTH=${QPOPAUTH}
 
-MAN8=		qpopauth.8 qpopper.8
+MAN8=		qpopper.8
 
 # internal configuration
 POP_USER=	pop
@@ -68,52 +72,62 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITH_APOP_ONLY=yes	builds with APOP authentication only"
-	@${ECHO_MSG} "WITH_DOCUMENTATION=yes	installs pdf documentation"
-	@${ECHO_MSG} "WITH_DRAC=yes		builds with Dynamic Relay Authorization"
+	@${ECHO_MSG} "WITH_APOP_ONLY=yes		builds with APOP authentication only"
+	@${ECHO_MSG} "WITHOUT_APOP=yes		builds without APOP authentication"
+	@${ECHO_MSG} "WITH_DOCUMENTATION=yes		installs pdf documentation"
+	@${ECHO_MSG} "WITH_DRAC=yes			builds with Dynamic Relay Authorization"
 	@${ECHO_MSG} "				Control support"
-	@${ECHO_MSG} "WITHOUT_IPV6=yes          builds without IPv6 support"
+	@${ECHO_MSG} "WITHOUT_IPV6=yes		builds without IPv6 support"
 	@${ECHO_MSG} "WITH_FULL_POPD_DEBUG=yes	builds with more verbose debugging"
-	@${ECHO_MSG} "WITH_PAM=yes              builds with PAM authentication"
+	@${ECHO_MSG} "WITH_PAM=yes			builds with PAM authentication"
 	@${ECHO_MSG} "WITH_POPPASSD=yes		builds the poppassd daemon"
-	@${ECHO_MSG} "WITHOUT_QPOPAUTH_SETUID=yes  does not install qpopauth setuid to pop user"
+	@${ECHO_MSG} "WITHOUT_QPOPAUTH_SETUID=yes	does not install qpopauth setuid to pop user"
 	@${ECHO_MSG} "WITH_SAMPLE_POPUSERS_FILE=yes	builds a default (otherwise,"
 	@${ECHO_MSG} "				use an empty file) reject file"
-	@${ECHO_MSG} "WITH_SHY_ENABLED=yes      enables shy mode, don't present"
-	@${ECHO_MSG} "                          qpopper version number in POP3 session"
-	@${ECHO_MSG} "WITH_STANDALONE_MODE=yes  builds qpopper to be run without inetd"
-	@${ECHO_MSG} "WITHOUT_U_OPTION=yes      forbids daemon command line option"
-	@${ECHO_MSG} "                 -u which allows, after a user authenticates,"
-	@${ECHO_MSG} "                 process options to be read from a file called"
-	@${ECHO_MSG} "                 .qpopper-options in the user's home directory"
-	@${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_SHY_ENABLED=yes		enables shy mode, don't present"
+	@${ECHO_MSG} "				qpopper version number in POP3 session"
+	@${ECHO_MSG} "WITHOUT_SSL=yes			builds without SSL/TLS support"
+	@${ECHO_MSG} "WITH_STANDALONE_MODE=yes	builds qpopper to be run without inetd"
+	@${ECHO_MSG} "WITHOUT_U_OPTION=yes		forbids daemon command line option"
+	@${ECHO_MSG} "				-u which allows, after a user authenticates,"
+	@${ECHO_MSG} "				process options to be read from a file called"
+	@${ECHO_MSG} "				.qpopper-options in the user's home directory"
+	@${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"
+	@${ECHO_MSG} "				-y which allows the user to specify a different"
+	@${ECHO_MSG} "				logging facility"
 
+.if defined(WITHOUT_APOP)
+QPOPAUTH=	"@comment "
+.else
+CONFIGURE_ARGS+=	--enable-apop=${PREFIX}/etc/qpopper/pop.auth \
+			--with-apopuid=pop
+MAN8+=		qpopauth.8
+QPOPAUTH=	""
 # If WITH_APOP_ONLY variable present in the environment, qpopper builds
 # with APOP authentication only.
 .if defined(APOP_ONLY) || defined(WITH_APOP_ONLY)
 OS_DEFS+=	-DAPOP_ONLY
 .endif
+.endif
 
 # Do not install documentation since it is in pdf format and normally
-# not used unless user wants it
+# not used unless user wants it.
 .if !defined(WITH_DOCUMENTATION)
 NOPORTDOCS=	yes
 .endif
 
 # If WITH_DRAC variable present in the environment, qpopper builds
-# with Dynamic Relay Authorization Control support
+# with Dynamic Relay Authorization Control support.
 .if defined(WITH_DRAC)
 CONFIGURE_ARGS+=	--with-drac
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
 # If WITH_FULL_POPD_DEBUG variable present in the environment, qpopper builds
-# with more verbose debugging. See also -d option to qpopper
+# with more verbose debugging. See also -d option to qpopper.
 .if defined(FULL_POPD_DEBUG) || defined(WITH_FULL_POPD_DEBUG)
 CONFIGURE_ARGS+=	--enable-debugging
 .endif
@@ -135,34 +149,27 @@ EPOPPASSD=	"@comment "
 .endif
 
 # If WITH_SHY_ENABLED variable present,  qpopper does not present
-# its version number within the POP3 session
+# its version number within the POP3 session.
 .if defined(WITH_SHY_ENABLED)
 CONFIGURE_ARGS+=	--enable-shy
 .endif
 
 # If WITH STANDALONE_MODE variable present qpopper is built so it runs
-# without inetd
+# without inetd.
 .if defined(WITH_STANDALONE_MODE)
 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
+# 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)
-LIB_DEPENDS+=	ssl.3:${PORTSDIR}/security/openssl
-CONFIGURE_ARGS+=	-with-includes=${LOCALBASE}/include/openssl --with-openssl=${LOCALBASE}
-CONFIGURE_ENV+=	RSAGLUE="${RSAGLUE}"
-.if exists(${LOCALBASE}/lib/librsaref.a)
-RSAGLUE=	-lrsaref
-.endif
-RSAGLUE+=	-lRSAglue
+# The default is to build without SSL/TLS support.
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .endif
 
 post-patch:
@@ -181,6 +188,7 @@ pre-configure:
 	@(cd ${WRKSRC}; ${CHMOD} u+w configure*)
 
 do-install:
+.if !defined(WITHOUT_APOP)
 	@${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
@@ -189,10 +197,11 @@ 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
+.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/popper/popper ${PREFIX}/libexec/qpopper
+	@${INSTALL_MAN} ${WRKSRC}/man/popper.8 ${MANPREFIX}/man/man8/qpopper.8
 .if defined(WITH_POPPASSD)
 	@${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${PREFIX}/libexec/qpoppassd
 .endif
@@ -207,7 +216,7 @@ post-install: install-conf-file
 	@${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE}
 
 # based on original from op port, written by Cyrille Lefevre
-# <clefevre@citeweb.net>
+# <clefevre@citeweb.net>.
 install-conf-file:
 	@if [ ! -f ${CONF_DIR}/${CONF_FILE}${SAMP_SUFX} ]; then \
 		if [ -f /etc/ftpusers ] && [ -n "${WITH_SAMPLE_POPUSERS_FILE}" ]; then \
diff --git a/mail/qpopper/files/patch-configure.in b/mail/qpopper/files/patch-configure.in
index b52d4e32c849..1557cb1f5d4d 100644
--- a/mail/qpopper/files/patch-configure.in
+++ b/mail/qpopper/files/patch-configure.in
@@ -1,14 +1,5 @@
 --- configure.in.orig	Sat May  5 14:32:51 2001
 +++ configure.in	Sat May  5 14:33:32 2001
-@@ -838,7 +838,7 @@
-     AC_DEFINE_UNQUOTED(QPOP_OPENSSL, "$openssl")
-     AC_DEFINE(QPOP_SSL)
-     SSL_DIR_INC="-I${openssl}/include"
--    SSL_LIBS="-L${openssl}/lib -lssl -lcrypto"
-+    SSL_LIBS="-L${openssl}/lib -lssl -lcrypto ${RSAGLUE}"
- fi
- 
- 
 @@ -1257,7 +1257,6 @@
  )
  
diff --git a/mail/qpopper/pkg-plist b/mail/qpopper/pkg-plist
index 65f1a6d84f59..644471ecb20b 100644
--- a/mail/qpopper/pkg-plist
+++ b/mail/qpopper/pkg-plist
@@ -1,6 +1,6 @@
-bin/qpopauth
-@unexec rm -f %D/bin/qapopauth
-@exec ln -sf %D/bin/qpopauth %D/bin/qapopauth
+%%QPOPAUTH%%bin/qpopauth
+%%QPOPAUTH%%@unexec rm -f %D/bin/qapopauth
+%%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