Date: Fri, 6 Jul 2012 01:17:21 +0800 (CST) From: Hung-te Liang <lhd@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: fluffy@FreeBSD.org Subject: ports/169666: [PATCH] news/inn: add options for OpenSSL and GnuPG Message-ID: <20120705171721.9B1FB2E024@BBS.LHD.tw> Resent-Message-ID: <201207051820.q65IK9FR032002@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169666
>Category: ports
>Synopsis: [PATCH] news/inn: add options for OpenSSL and GnuPG
>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 Jul 05 18:20:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Hung-te Liang
>Release: FreeBSD 8.3-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD BBS.LHD.tw 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Mon Jun 11 23:52:38 UTC 2012
>Description:
- Add options for OpenSSL (for those who don't need) and GnuPG (pgpverify)
- TCL is no longer supported.
- Use new option framework.
- Change MASTER_SITES back to MASTER_SITE_ISC.
- USE_PYTHON implies inclusion of bsd.python.mk.
- FreeBSD' make recognizes system V like include directives undocumentedly, so GMake is not necessary.
- There are no --with-max-socket, --with-etc-dir and --with-datarootdirdir in configure.
- empty({PORT_OPTIONS:MTAGGED_HASH) NOT implies LARGE_FILES.
- For reducing portlint warnings, move *_DEPENDS localtion in Makefile and use dirmtry in pkg-plist
Modified files:
Makefile
pkg-plist
Port maintainer (fluffy@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- inn-2.5.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/news/inn/Makefile ./Makefile
--- /usr/ports/news/inn/Makefile 2012-06-30 22:53:20.000000000 +0800
+++ ./Makefile 2012-07-06 00:54:40.000000000 +0800
@@ -8,45 +8,45 @@
PORTNAME?= inn
PORTVERSION?= 2.5.2
CATEGORIES= news ipv6
-# Master distribution broken
-#MASTER_SITES?= ${MASTER_SITE_ISC}
-#MASTER_SITE_SUBDIR?= ${PORTNAME}
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fluffy
+MASTER_SITES?= ${MASTER_SITE_ISC}
+MASTER_SITE_SUBDIR?= ${PORTNAME}
MAINTAINER= fluffy@FreeBSD.org
COMMENT= InterNetNews -- the Internet meets Netnews
+BUILD_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+ p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+
USE_RC_SUBR= innd.sh
SUB_FILES= pkg-install
LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
-USE_GMAKE= yes
-USE_OPENSSL= yes
+#USE_GMAKE= yes
USE_PERL5= yes
CONFLICTS?= inn-stable-[0-9]* inn-current-[0-9]*
-OPTIONS= PYTHON "Embedded Python module support" Off \
- TCL "Embedded TCL support" Off \
- KERBEROS "Enable Kerberos auth support" Off \
- SASL "Enable SASL support (for imapfeed auth)" Off \
- TAGGED_HASH "Use tagged hash table for history" Off \
- LARGE_FILES "Support for files larger than 2GB" Off \
- KEYWORDS "Automatic keyword generation support" On \
- BERKELEYDB "Enable BerkeleyDB (for ovdb overview method)" Off
+OPTIONS_DEFINE= PYTHON KERBEROS SASL KEYWORDS BERKELEYDB OPENSSL \
+ TAGGED_HASH LARGE_FILES GNUPG
+OPTIONS_DEFAULT= KEYWORDS
+
+PYTHON_DESC= Embedded Python module support
+KERBEROS_DESC= Enable Kerberos v5 (for auth_krb5)
+SASL_DESC= Enable SASL (for imapfeed authentication)
+TAGGED_HASH_DESC= Use tagged hash table for history
+LARGE_FILES_DESC= Support for files larger than 2GB
+KEYWORDS_DESC= Automatic keyword generation support
+BERKELEYDB_DESC= Enable BerkeleyDB (for ovdb overview method)
+OPENSSL_DESC= Enable OpenSSL (for NNTP over TLS/SSL support)
+GNUPG_DESC= GnuPG support (for pgpverify control message)
VARBASE?= /var
.include "Makefile.layout"
-BUILD_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
- p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
-# p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
-
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-
HAS_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
@@ -54,24 +54,22 @@
--with-spool-dir=${INN_NEWSSPOOL} \
--with-log-dir=${INN_LOGDIR} \
--with-tmp-dir=${INN_TMPDIR} \
- --with-openssl=${OPENSSLBASE} \
- --with-etc-dir=${INN_ETCDIR} \
+ --sysconfdir=${INN_ETCDIR} \
--with-run-dir=${INN_RUNDIR} \
--with-db-dir=${INN_DBDIR} \
- --with-datarootdirdir=${INN_SHAREDIR} \
- --with-ssl=${OPENSSLBASE} \
+ --datarootdir=${INN_SHAREDIR} \
--enable-ipv6 --with-perl
.include <bsd.port.options.mk>
-.if defined(WITH_BERKELEYDB)
+.if ${PORT_OPTIONS:MBERKELEYDB}
USE_BDB= 44+
CONFIGURE_ENV+= DB_VER=db${BDB_VER}
CONFIGURE_ENV+= DB_LIB=${BDB_LIB_NAME}
CONFIGURE_ARGS+= --with-berkeleydb=${LOCALBASE}
.endif
-.if defined(WITH_KERBEROS)
+.if ${PORT_OPTIONS:MKERBEROS}
. if exists(${LOCALBASE}/bin/krb5-config)
LIB_DEPENDS+= gssapi_krb5:${PORTSDIR}/security/krb5
CONFIGURE_ARGS+= --with-kerberos=${LOCALBASE}
@@ -84,49 +82,50 @@
CONFIGURE_ARGS+= --without-kerberos
.endif
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
USE_PYTHON= yes
CONFIGURE_ARGS+= --with-python
-. include "${PORTSDIR}/Mk/bsd.python.mk"
.endif
-.if defined(WITH_TCL)
-USE_TCL= 84+
-CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}
-.endif
-
-.if defined(WITH_MAXSOCKET)
-CONFIGURE_ARGS+= --with-max-sockets=${WITH_MAXSOCKET}
-.endif
-
-.if defined(WITH_LARGE_FILES)
+.if ${PORT_OPTIONS:MLARGE_FILES}
CONFIGURE_ARGS+= --enable-largefiles
-. if defined(WITH_TAGGED_HASH)
+. if ${PORT_OPTIONS:MTAGGED_HASH}
IGNORE= cannot be compiled with both LARGE_FILES and TAGGED_HASH: please re-run make config
. endif
.endif
-.if !defined(WITHOUT_KEYWORDS)
+.if ${PORT_OPTIONS:MKEYWORDS}
CONFIGURE_ARGS+= --enable-keywords
.endif
-.if defined(WITH_SASL)
+.if ${PORT_OPTIONS:MSASL}
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
.endif
-.if defined(WITH_TAGGED_HASH)
+.if ${PORT_OPTIONS:MTAGGED_HASH}
CONFIGURE_ARGS+= --enable-tagged-hash
DBZ_FILES= dir pag
PLIST_SUB+= WITH_TAGGED_HASH=""
PLIST_SUB+= WITHOUT_TAGGED_HASH="@comment "
.else
-CONFIGURE_ARGS+= --enable-largefiles
DBZ_FILES= dir hash index
PLIST_SUB+= WITH_TAGGED_HASH="@comment "
PLIST_SUB+= WITHOUT_TAGGED_HASH=""
.endif
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL= yes
+CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+.endif
+
+.if ${PORT_OPTIONS:MGNUPG}
+# Although pgpverify needs gpgv/gpgv2,
+# checking 'gpg' is the shortest way to check any version of GnuPG installed.
+BUILD_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
+.endif
+
PORTDOCS= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
HEADERS= clibrary.h config.h dbz.h libinn.h storage.h
@@ -155,7 +154,7 @@
tally.control.8 tdx-util.8 tinyleaf.8 writelog.8
MLINKS= actsync.8 actsyncd.8 docheckgroups.8 localgroups.5 perl-nocem.8 nocem.ctl.5
-.if defined(WITH_KERBEROS)
+.if ${PORT_OPTIONS:MKERBEROS}
MAN8+= auth_krb5.8
.endif
@@ -176,8 +175,8 @@
expire.ctl localgroups incoming.conf inn.conf innfeed.conf \
innreport.conf innwatch.ctl moderators motd.news news2mail.cf \
newsfeeds nocem.ctl \
- nnrpd.track nntpsend.ctl ovdb.conf overview.fmt \
- passwd.nntp radius.conf readers.conf sasl.conf send-uucp.cf \
+ nnrpd.track nntpsend.ctl ovdb.conf \
+ passwd.nntp radius.conf readers.conf send-uucp.cf \
storage.conf subscriptions
SUB_LIST+= EGDIR="${EXAMPLESDIR:C,^${PREFIX},\\$\\${PREFIX},}"
@@ -187,18 +186,13 @@
# Perl 5.12 deprecated $[
.if ${PERL_LEVEL} >= 501200
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-scripts_innreport.in \
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-scripts_innreport.in \
${PATCHDIR}/extra-patch-scripts_innreport_inn.pm
.endif
post-patch:
@${REINPLACE_CMD} -E 's!\$$[{(]PATHETC[})]!${EXAMPLESDIR}!g' \
${WRKSRC}/site/Makefile
-.if defined(WITH_TCL)
- @${REINPLACE_CMD} -e 's!<tcl.h>!<tcl${TCL_VER}/tcl.h>!' ${WRKSRC}/innd/innd.h
- @${REINPLACE_CMD} -e 's!-ltcl!-ltcl${USE_TCL}!' \
- ${WRKSRC}/configure
-.endif
@${REINPLACE_CMD} -e 's!et/com_err\.h!com_err.h!g' \
-e 's!-lk5crypto!!g' \
${WRKSRC}/configure
diff -ruN --exclude=CVS /usr/ports/news/inn/pkg-plist ./pkg-plist
--- /usr/ports/news/inn/pkg-plist 2012-06-27 20:26:10.000000000 +0800
+++ ./pkg-plist 2012-07-05 17:50:34.000000000 +0800
@@ -202,24 +202,24 @@
@dirrm %%EXAMPLESDIR%%/db
@dirrm %%EXAMPLESDIR%%
@unexec rm -Rf %%TMPDIR%% 2>/dev/null || true
-@unexec rmdir %%SHAREDIR%% 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%%/overview 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%%/outgoing 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%%/innfeed 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%%/incoming/bad 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%%/incoming 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%%/articles 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%%/archive 2>/dev/null || true
+@dirrmtry %%SHAREDIR%%
+@dirrmtry %%NEWSSPOOL%%/overview
+@dirrmtry %%NEWSSPOOL%%/outgoing
+@dirrmtry %%NEWSSPOOL%%/innfeed
+@dirrmtry %%NEWSSPOOL%%/incoming/bad
+@dirrmtry %%NEWSSPOOL%%/incoming
+@dirrmtry %%NEWSSPOOL%%/articles
+@dirrmtry %%NEWSSPOOL%%/archive
@unexec rm -Rf %%NEWSSPOOL%%/tmp 2>/dev/null || true
-@unexec rmdir %%NEWSSPOOL%% 2>/dev/null || true
+@dirrmtry %%NEWSSPOOL%%
@unexec rm -Rf %%RUNDIR%% 2>/dev/null || true
@unexec rm -R %%NEWSBASE%%/http
@unexec rm -R %%NEWSBASE%%/lib
@unexec rm -R %%NEWSBASE%%/include/inn
@unexec rm -R %%NEWSBASE%%/include
-@unexec rmdir %%ETCDIR%% 2>/dev/null || true
+@dirrmtry %%ETCDIR%%
@unexec rm -Rf %%NEWSBASE%%/doc
-@unexec rmdir %%DBDIR%% 2>/dev/null || true
+@dirrmtry %%DBDIR%%
@unexec rm -Rf %%NEWSBASE%%/bin/rnews.libexec
@unexec rm -Rf %%NEWSBASE%%/bin/filter
@unexec rm -Rf %%NEWSBASE%%/bin/control
--- inn-2.5.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?20120705171721.9B1FB2E024>