diff options
author | obache <obache@pkgsrc.org> | 2010-03-10 12:54:27 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2010-03-10 12:54:27 +0000 |
commit | cabdc0f227cb02232101b8b4f28c02f0d19b9f0c (patch) | |
tree | 8643b22404e1c2664c9363f31639f83deb94e6cb | |
parent | a95aa90da6d28e3212ade82bac46a7f42fdffb9a (diff) | |
download | pkgsrc-cabdc0f227cb02232101b8b4f28c02f0d19b9f0c.tar.gz |
Add user-destdir installation support.
-rw-r--r-- | news/nntpcache/Makefile | 4 | ||||
-rw-r--r-- | news/nntpcache/distinfo | 8 | ||||
-rw-r--r-- | news/nntpcache/patches/patch-ag | 24 | ||||
-rw-r--r-- | news/nntpcache/patches/patch-ah | 15 | ||||
-rw-r--r-- | news/nntpcache/patches/patch-ai | 20 | ||||
-rw-r--r-- | news/nntpcache/patches/patch-aj | 19 | ||||
-rw-r--r-- | news/nntpcache/patches/patch-ak | 19 | ||||
-rw-r--r-- | news/nntpcache/patches/patch-al | 17 |
8 files changed, 124 insertions, 2 deletions
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile index e159452fab7..a39d85c7469 100644 --- a/news/nntpcache/Makefile +++ b/news/nntpcache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2009/05/19 08:59:29 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2010/03/10 12:54:27 obache Exp $ DISTNAME= nntpcache-3.0.2 PKGREVISION= 1 @@ -10,6 +10,8 @@ HOMEPAGE= http://iq.org/~proff/nntpcache.org/ COMMENT= NNTP multi-server caching daemon LICENSE= nntpcache-license +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" NNTPCACHE_USER?= news diff --git a/news/nntpcache/distinfo b/news/nntpcache/distinfo index a5655e54664..6a6f828a9be 100644 --- a/news/nntpcache/distinfo +++ b/news/nntpcache/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/10/17 20:28:01 schwarz Exp $ +$NetBSD: distinfo,v 1.7 2010/03/10 12:54:27 obache Exp $ SHA1 (nntpcache-3.0.2.tar.gz) = f4c9916040422e7232971a0098d0b29fe947ac14 RMD160 (nntpcache-3.0.2.tar.gz) = 03c191fbedd9325c12033493d57e01b5c5ecd5a9 @@ -9,3 +9,9 @@ SHA1 (patch-ac) = 74f4e3ec58342e9d689768baf31e251e568f2db6 SHA1 (patch-ad) = 060112715712bcdbcd052cd9d7557a558518c305 SHA1 (patch-ae) = 18e60bc8822be64f76348d9fbee7bd406eae5106 SHA1 (patch-af) = 12e1d4d4344c71391784417e830b2037f69e1af8 +SHA1 (patch-ag) = cb57d850aea3656020e9644d03475b114deee52f +SHA1 (patch-ah) = 6bce71dca150248e06531fa643d7d99c89be0162 +SHA1 (patch-ai) = 1f0932b40c5086c24e982210b016feece2445502 +SHA1 (patch-aj) = fe9cdde25e373ac15b0d34e072bea0dd5a66fab7 +SHA1 (patch-ak) = ce93c536ef92ee75243f825fa45e9f2647a569e1 +SHA1 (patch-al) = ab9046ad74ee1a834ddcc5ac601d03aa2eef1d84 diff --git a/news/nntpcache/patches/patch-ag b/news/nntpcache/patches/patch-ag new file mode 100644 index 00000000000..5fce3eab3eb --- /dev/null +++ b/news/nntpcache/patches/patch-ag @@ -0,0 +1,24 @@ +$NetBSD: patch-ag,v 1.1 2010/03/10 12:54:27 obache Exp $ + +pkgsrc take care permissons for directories and files. +need to user-destdir installation. + +--- cf/Makefile.in.orig 2006-03-05 21:49:25.000000000 +0000 ++++ cf/Makefile.in +@@ -271,15 +271,11 @@ VERSION: + echo @VERSION@ >$@ + + install-data-hook: +- for f in $(distf); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done ++ for f in $(distf); do { cd $(DESTDIR)$(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) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/news/nntpcache/patches/patch-ah b/news/nntpcache/patches/patch-ah new file mode 100644 index 00000000000..5e1c6653342 --- /dev/null +++ b/news/nntpcache/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1 2010/03/10 12:54:27 obache Exp $ + +destdir installation support + +--- src/Makefile.in.orig 2010-03-10 12:15:22.000000000 +0000 ++++ src/Makefile.in +@@ -454,7 +454,7 @@ uninstall-am: uninstall-info-am uninstal + + + install-exec-hook: +- cp nntpcached $(libexecdir)/nntpcached.debug && chmod a+x $(libexecdir)/nntpcached.debug ++ cp nntpcached $(DESTDIR)$(libexecdir)/nntpcached.debug && chmod a+x $(DESTDIR)$(libexecdir)/nntpcached.debug + + nnconf.c nnconf.h : ../cf/nnconf.cf + $(top_srcdir)/confused/confused $< diff --git a/news/nntpcache/patches/patch-ai b/news/nntpcache/patches/patch-ai new file mode 100644 index 00000000000..5483b24ada9 --- /dev/null +++ b/news/nntpcache/patches/patch-ai @@ -0,0 +1,20 @@ +$NetBSD: patch-ai,v 1.1 2010/03/10 12:54:27 obache Exp $ + +pkgsrc take care permissons for directories and files. +need to user-destdir installation. + +--- http/Makefile.in.orig 2010-03-10 12:20:48.000000000 +0000 ++++ http/Makefile.in +@@ -216,10 +216,8 @@ uninstall-am: uninstall-info-am + + + 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 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/news/nntpcache/patches/patch-aj b/news/nntpcache/patches/patch-aj new file mode 100644 index 00000000000..5fef5a3988d --- /dev/null +++ b/news/nntpcache/patches/patch-aj @@ -0,0 +1,19 @@ +$NetBSD: patch-aj,v 1.1 2010/03/10 12:54:27 obache Exp $ + +pkgsrc take care permissons for directories and files. +need to user-destdir installation. + +--- pgp/Makefile.in.orig 2010-03-10 12:26:40.000000000 +0000 ++++ pgp/Makefile.in +@@ -236,10 +236,9 @@ uninstall-am: uninstall-info-am uninstal + + # 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 ++ for f in $(sysconf_DATA); do { cd $(DESTDIR)$(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/news/nntpcache/patches/patch-ak b/news/nntpcache/patches/patch-ak new file mode 100644 index 00000000000..60d6ca8eab1 --- /dev/null +++ b/news/nntpcache/patches/patch-ak @@ -0,0 +1,19 @@ +$NetBSD: patch-ak,v 1.1 2010/03/10 12:54:27 obache Exp $ + +pkgsrc take care permissons for directories and files. +need to user-destdir installation. + +--- innreport/Makefile.in.orig 2010-03-10 12:26:40.000000000 +0000 ++++ innreport/Makefile.in +@@ -265,10 +265,7 @@ uninstall-am: uninstall-info-am uninstal + + # 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 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/news/nntpcache/patches/patch-al b/news/nntpcache/patches/patch-al new file mode 100644 index 00000000000..e8994e741d8 --- /dev/null +++ b/news/nntpcache/patches/patch-al @@ -0,0 +1,17 @@ +$NetBSD: patch-al,v 1.1 2010/03/10 12:54:27 obache Exp $ + +pkgsrc take care permissons for directories and files. +need to user-destdir installation. + +--- unixauth/Makefile.in.orig 2010-03-10 12:26:40.000000000 +0000 ++++ unixauth/Makefile.in +@@ -327,9 +327,6 @@ uninstall-am: uninstall-info-am uninstal + + + install-exec-hook: +- chown root $(libexecdir)/unixauth +- chgrp @nntpcacheGID@ $(libexecdir)/unixauth +- chmod u+s,g+x,o-x $(libexecdir)/unixauth + + %.ext : %.c %.h $(top_srcdir)/config.h $(top_srcdir)/scripts/genextern.sh + CPP="$(CPP)";export CPP; sh $(top_srcdir)/scripts/genextern.sh $< > $@.tmp $(DEFS) $(INCLUDES) $(CPPFLAGS) && mv -f $@.tmp $@ || rm -f $@.tmp |