svn commit: r403732 - in head/news/nntpcache: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Dec 14 17:19:48 UTC 2015
Author: mat
Date: Mon Dec 14 17:19:46 2015
New Revision: 403732
URL: https://svnweb.freebsd.org/changeset/ports/403732
Log:
Make build as a user.
While there, convert to autoreconf, options helpers, rename patches to match
our naming scheme.
Sponsored by: Absolight
Added:
head/news/nntpcache/files/patch-cf_Makefile.am (contents, props changed)
head/news/nntpcache/files/patch-http_Makefile.am (contents, props changed)
head/news/nntpcache/files/patch-innreport_Makefile.am (contents, props changed)
head/news/nntpcache/files/patch-pgp_Makefile.am (contents, props changed)
head/news/nntpcache/files/patch-scripts_nntpcache-gdb.sh.in (contents, props changed)
head/news/nntpcache/files/patch-src_Makefile.am
- copied, changed from r403731, head/news/nntpcache/files/patch-src_Makefile.in
head/news/nntpcache/files/patch-src_acc.c
- copied, changed from r403731, head/news/nntpcache/files/patch-src-acc.c
head/news/nntpcache/files/patch-src_authinfo__ldap.c
- copied, changed from r403731, head/news/nntpcache/files/patch-src-authinfo_ldap.c
head/news/nntpcache/files/patch-src_nntpcache.c
- copied, changed from r403731, head/news/nntpcache/files/patch-src-nntpcache.c
head/news/nntpcache/files/patch-unixauth_Makefile.am (contents, props changed)
Deleted:
head/news/nntpcache/files/patch-cf_Makefile.in
head/news/nntpcache/files/patch-http_Makefile.in
head/news/nntpcache/files/patch-innreport_Makefile.in
head/news/nntpcache/files/patch-pgp_Makefile.in
head/news/nntpcache/files/patch-scripts-nntpcache-gdb.sh.in
head/news/nntpcache/files/patch-src-acc.c
head/news/nntpcache/files/patch-src-authinfo_ldap.c
head/news/nntpcache/files/patch-src-nntpcache.c
head/news/nntpcache/files/patch-src_Makefile.in
head/news/nntpcache/files/patch-unixauth_Makefile.in
Modified:
head/news/nntpcache/Makefile
head/news/nntpcache/pkg-plist
Modified: head/news/nntpcache/Makefile
==============================================================================
--- head/news/nntpcache/Makefile Mon Dec 14 17:17:05 2015 (r403731)
+++ head/news/nntpcache/Makefile Mon Dec 14 17:19:46 2015 (r403732)
@@ -3,23 +3,24 @@
PORTNAME= nntpcache
PORTVERSION= 3.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= news
MASTER_SITES= http://www.xs4all.nl/~suelette/
MAINTAINER= leeym at FreeBSD.org
COMMENT= News caching/anti-spam/server-merging system
-USE_AUTOTOOLS= automake:env
-
# This may be set interactively at install-time. NNTPCache will
# cache news articles and related data in ${SPOOLDIR}/nntpcache.
SPOOLDIR?= /var/spool
NO_CDROM= Free for individuals and non-military, non-profit organisations only
-USES= gmake
+USES= gmake autoreconf shebangfix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${SPOOLDIR}
+CONFIGURE_ARGS= --localstatedir=${SPOOLDIR} \
+ --program-transform-name=''
+
+SHEBANG_FILES= contrib/perlnewshound/newshound.pl
AUTHINFO_EXT= authinfo_pam.ext
USE_RC_SUBR= nntpcached
@@ -27,34 +28,24 @@ USE_RC_SUBR= nntpcached
OPTIONS_DEFINE= LDAP RADIUS SPAMPHOBIA
SPAMPHOBIA_DESC= Spamphobia NoCeM support
-.include <bsd.port.options.mk>
+RADIUS_CONFIGURE_WITH= authinfo-radius
+RADIUS_VARS= AUTHINFO_EXT+=authinfo_radius.ext
-.if ${PORT_OPTIONS:MRADIUS}
-CONFIGURE_ARGS+= --with-authinfo-radius
-AUTHINFO_EXT+= authinfo_radius.ext
-.endif
-
-.if ${PORT_OPTIONS:MLDAP} || defined(WITH_LDAP2)
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+= --with-authinfo-ldap
-CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
-LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib
-AUTHINFO_EXT+= authinfo_ldap.ext
-.endif
-CONFIGURE_ARGS+= --program-transform-name=''
+LDAP_USE= OPENLDAP=yes
+LDAP_CONFIGURE_WITH= authinfo-ldap
+LDAP_CPPFLAGS= -I${PREFIX}/include -I${LOCALBASE}/include
+LDAP_LDFLAGS= -L${PREFIX}/lib -L${LOCALBASE}/lib
+LDAP_VARS= AUTHINFO_EXT+=authinfo_ldap.ext
NNTPSPOOLDIR?= ${SPOOLDIR}/${PORTNAME}
PLIST_SUB+= SPOOLDIR=${NNTPSPOOLDIR}
CPIO_CMD= ${CPIO} --quiet -pdum -R
-MAN8= nntpcached.8 newshound.8
PORTDOCS= AUTHORS ChangeLog FAQ FAQ.html HACKING HTML \
INSTALL LICENSING NEWS README README.INN VERSION
-.if ${PORT_OPTIONS:MSPAMPHOBIA}
REVISEDATE= 20060903
-PATCH_SITES+= http://people.freebsd.org/~leeym/:SPAMPHOBIA
-PATCHFILES+= ${DISTNAME}-spamphobia-${REVISEDATE}.diff.gz:SPAMPHOBIA
-.endif
+SPAMPHOBIA_PATCH_SITES= http://people.freebsd.org/~leeym/:SPAMPHOBIA
+SPAMPHOBIA_PATCHFILES= ${DISTNAME}-spamphobia-${REVISEDATE}.diff.gz:SPAMPHOBIA
post-configure:
${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C ${WRKSRC}/src ${AUTHINFO_EXT}
Added: head/news/nntpcache/files/patch-cf_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nntpcache/files/patch-cf_Makefile.am Mon Dec 14 17:19:46 2015 (r403732)
@@ -0,0 +1,16 @@
+--- cf/Makefile.am.orig 2004-04-11 11:43:52 UTC
++++ cf/Makefile.am
+@@ -22,13 +22,5 @@ VERSION:
+ echo @VERSION@ >$@
+
+
+-install-data-hook:
+- for f in $(distf); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+-
+ nntpcache.config-dist : nnconf.cf
+ sed -e 's/^ *[a-zA-Z_][a-zA-Z_]* //;s/"//g' <nnconf.cf >$@
+-
+-# this is ugly, but more flexible than merely redefining INSTALL_DATA
+-install-data-local:
+- cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+- cd $(localstatedir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(localstate_DATA) && chown @nntpcacheUID@ $(localstate_DATA) && chgrp @nntpcacheGID@ $(localstate_DATA)
Added: head/news/nntpcache/files/patch-http_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nntpcache/files/patch-http_Makefile.am Mon Dec 14 17:19:46 2015 (r403732)
@@ -0,0 +1,12 @@
+--- http/Makefile.am.orig 2004-04-11 11:43:56 UTC
++++ http/Makefile.am
+@@ -12,7 +12,5 @@ EXTRA_DIST = \
+ ch = . $(httpdata)
+
+ install-data-local:
+- -mkdir $(sysconfdir)/http
+- cp $(httpdata) $(sysconfdir)/http
+- cd $(sysconfdir)/http && chown @nntpcacheUID@ $(ch)
+- cd $(sysconfdir)/http && chgrp @nntpcacheUID@ $(ch)
++ -mkdir $(DESTDIR)$(sysconfdir)/http
++ cp $(httpdata) $(DESTDIR)$(sysconfdir)/http
Added: head/news/nntpcache/files/patch-innreport_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nntpcache/files/patch-innreport_Makefile.am Mon Dec 14 17:19:46 2015 (r403732)
@@ -0,0 +1,11 @@
+--- innreport/Makefile.am.orig 2004-04-11 11:43:57 UTC
++++ innreport/Makefile.am
+@@ -15,7 +15,4 @@ EXTRA_DIST = \
+
+ # the trailing slash is to force symlink transversal
+ install-data-local:
+- cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+- -mkdir $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
+- chown @nntpcacheUID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
+- chgrp @nntpcacheGID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
++ -mkdir $(DESTDIR)$(sysconfdir)/http $(DESTDIR)$(sysconfdir)/http/innreport $(DESTDIR)$(sysconfdir)/http/innreport/pics
Added: head/news/nntpcache/files/patch-pgp_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nntpcache/files/patch-pgp_Makefile.am Mon Dec 14 17:19:46 2015 (r403732)
@@ -0,0 +1,13 @@
+--- pgp/Makefile.am.orig 2004-04-11 11:43:57 UTC
++++ pgp/Makefile.am
+@@ -8,10 +8,3 @@ sysconf_DATA = \
+ EXTRA_DIST = \
+ $(sysconf_DATA)
+
+-# the trailing slash is to force symlink transversal
+-install-data-local:
+- cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+-
+-install-data-hook:
+- for f in $(sysconf_DATA); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+-
Added: head/news/nntpcache/files/patch-scripts_nntpcache-gdb.sh.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nntpcache/files/patch-scripts_nntpcache-gdb.sh.in Mon Dec 14 17:19:46 2015 (r403732)
@@ -0,0 +1,10 @@
+--- scripts/nntpcache-gdb.sh.in.orig 2004-04-11 11:43:50 UTC
++++ scripts/nntpcache-gdb.sh.in
+@@ -61,6 +61,7 @@ for n in $libexec/nntpcached.debug $prog
+ break
+ fi
+ done
++exit
+
+ (
+ echo === uname -a
Copied and modified: head/news/nntpcache/files/patch-src_Makefile.am (from r403731, head/news/nntpcache/files/patch-src_Makefile.in)
==============================================================================
--- head/news/nntpcache/files/patch-src_Makefile.in Mon Dec 14 17:17:05 2015 (r403731, copy source)
+++ head/news/nntpcache/files/patch-src_Makefile.am Mon Dec 14 17:19:46 2015 (r403732)
@@ -1,7 +1,7 @@
---- src/Makefile.in.orig 2014-03-29 14:09:54.000000000 -0400
-+++ src/Makefile.in 2014-03-29 14:10:16.000000000 -0400
-@@ -454,7 +454,7 @@
-
+--- src/Makefile.am.orig 2006-03-05 21:42:38 UTC
++++ src/Makefile.am
+@@ -61,7 +61,7 @@ nntpcached_LDADD = \
+ ../libradius/libradius.a
install-exec-hook:
- cp nntpcached $(libexecdir)/nntpcached.debug && chmod a+x $(libexecdir)/nntpcached.debug
Copied and modified: head/news/nntpcache/files/patch-src_acc.c (from r403731, head/news/nntpcache/files/patch-src-acc.c)
==============================================================================
--- head/news/nntpcache/files/patch-src-acc.c Mon Dec 14 17:17:05 2015 (r403731, copy source)
+++ head/news/nntpcache/files/patch-src_acc.c Mon Dec 14 17:19:46 2015 (r403732)
@@ -1,6 +1,6 @@
---- src/acc.c.orig Sat Feb 19 12:16:21 2000
-+++ src/acc.c Tue Sep 13 23:00:32 2005
-@@ -147,6 +147,7 @@
+--- src/acc.c.orig 2004-04-11 11:43:55 UTC
++++ src/acc.c
+@@ -147,6 +147,7 @@ static struct filter_chain *filterReadCo
if (strEq(fli->name, fi))
{
fc->filter = fli->filter;
@@ -8,7 +8,7 @@
goto cont;
}
}
-@@ -195,7 +195,7 @@
+@@ -195,7 +196,7 @@ static struct filter_chain *filterReadCo
loge (("bad filter header/scope %s in file %s: %s", scope, fi, buf));
Exit(1);
}
Copied and modified: head/news/nntpcache/files/patch-src_authinfo__ldap.c (from r403731, head/news/nntpcache/files/patch-src-authinfo_ldap.c)
==============================================================================
--- head/news/nntpcache/files/patch-src-authinfo_ldap.c Mon Dec 14 17:17:05 2015 (r403731, copy source)
+++ head/news/nntpcache/files/patch-src_authinfo__ldap.c Mon Dec 14 17:19:46 2015 (r403732)
@@ -1,6 +1,6 @@
---- src/authinfo_ldap.c.orig Sat Dec 18 12:08:30 1999
-+++ src/authinfo_ldap.c Wed Sep 26 10:55:27 2001
-@@ -78,7 +78,16 @@
+--- src/authinfo_ldap.c.orig 2004-04-11 11:43:55 UTC
++++ src/authinfo_ldap.c
+@@ -78,7 +78,16 @@ EXPORT int ldap_got_pass(char *pass)
lderr = ldap_bind_s(ld, dnbuf, pass, LDAP_AUTH_SIMPLE);
if (lderr != LDAP_SUCCESS && lderr != LDAP_INVALID_CREDENTIALS && lderr != LDAP_INAPPROPRIATE_AUTH)
Copied and modified: head/news/nntpcache/files/patch-src_nntpcache.c (from r403731, head/news/nntpcache/files/patch-src-nntpcache.c)
==============================================================================
--- head/news/nntpcache/files/patch-src-nntpcache.c Mon Dec 14 17:17:05 2015 (r403731, copy source)
+++ head/news/nntpcache/files/patch-src_nntpcache.c Mon Dec 14 17:19:46 2015 (r403732)
@@ -1,6 +1,6 @@
---- src/nntpcache.c.orig Fri Mar 17 07:53:45 2006
-+++ src/nntpcache.c Fri Mar 17 07:53:51 2006
-@@ -810,7 +810,7 @@
+--- src/nntpcache.c.orig 2004-04-11 11:43:56 UTC
++++ src/nntpcache.c
+@@ -810,7 +810,7 @@ static bool load_servers(char *file)
loge (("missing password in %s:%d: %s", file, n, buf));
continue;
}
Added: head/news/nntpcache/files/patch-unixauth_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nntpcache/files/patch-unixauth_Makefile.am Mon Dec 14 17:19:46 2015 (r403732)
@@ -0,0 +1,12 @@
+--- unixauth/Makefile.am.orig 2004-04-11 11:43:57 UTC
++++ unixauth/Makefile.am
+@@ -8,9 +8,4 @@ INCLUDES = \
+ -I../cf \
+ -I../common
+
+-install-exec-hook:
+- chown root $(libexecdir)/unixauth
+- chgrp @nntpcacheGID@ $(libexecdir)/unixauth
+- chmod u+s,g+x,o-x $(libexecdir)/unixauth
+-
+ include ../mk/rules.mk
Modified: head/news/nntpcache/pkg-plist
==============================================================================
--- head/news/nntpcache/pkg-plist Mon Dec 14 17:17:05 2015 (r403731)
+++ head/news/nntpcache/pkg-plist Mon Dec 14 17:19:46 2015 (r403732)
@@ -1,49 +1,31 @@
- at exec mkdir -p %%SPOOLDIR%%
bin/confused
bin/mmap_tests
-%%ETCDIR%%/VERSION
- at unexec rm %%SPOOLDIR%%/VERSION 2>&1 >/dev/null || true
- at exec cp %D/%F %%SPOOLDIR%%
- at exec chown -R news:news %%SPOOLDIR%%
- at exec chmod 750 %%SPOOLDIR%%
- at exec chmod 640 %%SPOOLDIR%%/VERSION
+@(news,news,600) %%ETCDIR%%/VERSION
%%ETCDIR%%/http/index.html
%%ETCDIR%%/http/moose.gif
%%ETCDIR%%/http/nntpcache.jpg
-%%ETCDIR%%/innreport.conf-dist
+ at sample(,,600) %%ETCDIR%%/innreport.conf-dist %%ETCDIR%%/innreport.conf
%%ETCDIR%%/innreport.pl
%%ETCDIR%%/innreport.pm
-%%ETCDIR%%/newshound.conf-dist
- at unexec if cmp -s %D/%%ETCDIR%%/nntpcache.access %D/etc/nntpcache/nntpcache.access-dist; then rm -f %D/etc/nntpcache/nntpcache.access; fi
-%%ETCDIR%%/nntpcache.access-dist
- at exec if [ ! -f %D/%%ETCDIR%%/nttpcache.access ]; then cp -p %D/%F %B/nntpcache.access
- at unexec if cmp -s %D/%%ETCDIR%%/nntpcache.config %D/etc/nntpcache/nntpcache.config-dist; then rm -f %D/etc/nntpcache/nntpcache.config; fi
-%%ETCDIR%%/nntpcache.config-dist
- at exec if [ ! -f %D/%%ETCDIR%%/nttpcache.config ]; then cp -p %D/%F %B/nntpcache.config
- at unexec if cmp -s %D/%%ETCDIR%%/nntpcache.servers %D/etc/nntpcache/nntpcache.servers-dist; then rm -f %D/etc/nntpcache/nntpcache.servers; fi
-%%ETCDIR%%/nntpcache.servers-dist
- at exec if [ ! -f %D/%%ETCDIR%%/nttpcache.servers ]; then cp -p %D/%F %B/nntpcache.servers
- at unexec if cmp -s %D/%%ETCDIR%%/pubring.asc %D/etc/nntpcache/pubring.asc-dist; then rm -f %D/etc/nntpcache/pubring.asc; fi
-%%ETCDIR%%/pubring.asc-dist
- at exec if [ ! -f %D/%%ETCDIR%%/pubring.asc ]; then cp -p %D/%F %B/pubring.asc
- at unexec if cmp -s %D/%%ETCDIR%%/pubring.pgp %D/etc/nntpcache/pubring.pgp-dist; then rm -f %D/etc/nntpcache/pubring.pgp; fi
-%%ETCDIR%%/pubring.pgp-dist
- at exec if [ ! -f %D/%%ETCDIR%%/pubring.pgp ]; then cp -p %D/%F %B/pubring.pgp
+ at sample(,,600) %%ETCDIR%%/newshound.conf-dist %%ETCDIR%%/newshound.conf
+ at sample(,,600) %%ETCDIR%%/nntpcache.access-dist %%ETCDIR%%/nntpcache.access
+ at sample(,,600) %%ETCDIR%%/nntpcache.config-dist %%ETCDIR%%/nntpcache.config
+ at sample(,,600) %%ETCDIR%%/nntpcache.servers-dist %%ETCDIR%%/nntpcache.servers
+ at sample(,,600) %%ETCDIR%%/pubring.asc-dist %%ETCDIR%%/pubring.asc
+ at sample(,,600) %%ETCDIR%%/pubring.pgp-dist %%ETCDIR%%/pubring.pgp
%%ETCDIR%%/spam.filter
include/mmap_results.h
libexec/nntpcache-gdb.sh
libexec/nntpcache.gdb
libexec/nntpcached.debug
-libexec/unixauth
+@(root,news,4550) libexec/unixauth
man/man8/newshound.8.gz
man/man8/nntpcached.8.gz
sbin/innreport.sh
sbin/newshound
sbin/newshound.pl
sbin/nntpcached
- at exec mkdir -p %D/%%ETCDIR%%/http/innreport/pics
- at dirrm %%ETCDIR%%/http/innreport/pics
- at dirrm %%ETCDIR%%/http/innreport
- at dirrm %%ETCDIR%%/http
- at dirrmtry %%ETCDIR%%
- at unexec rmdir %%SPOOLDIR%% 2>&1 >/dev/null || echo "If you want to completely remove nntpcached, please execute 'rm -fr %%SPOOLDIR%%' by yourself."; true
+@(news,news,600) %%SPOOLDIR%%/VERSION
+ at dir %%ETCDIR%%/http/innreport/pics
+ at dir(news,news,700) %%ETCDIR%%
+ at dir(news,news,770) %%SPOOLDIR%%
More information about the svn-ports-head
mailing list