pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc DESTDIR support.
details: https://anonhg.NetBSD.org/pkgsrc/rev/da913b3bf5a2
branches: trunk
changeset: 521145:da913b3bf5a2
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Nov 05 17:31:09 2006 +0000
description:
DESTDIR support.
diffstat:
net/libtorrent/Makefile | 4 +-
net/p5-INET6/Makefile | 4 +-
net/p5-Net-DNS/Makefile | 3 +-
net/p5-Net/Makefile | 3 +-
net/p5-Socket6/Makefile | 3 +-
net/rsync/Makefile | 4 +-
net/rtorrent/Makefile | 9 +-
print/ghostscript-gnu/Makefile | 6 +-
print/ghostscript-gnu/distinfo | 4 +-
print/ghostscript-gnu/patches/patch-ab | 125 ++++++++++++++++++++++++++++++++-
print/gimp-print-lib/Makefile | 4 +-
print/libgnomeprintui/Makefile | 4 +-
print/teTeX/Makefile | 4 +-
print/teTeX3-texmf/Makefile | 6 +-
security/caff/Makefile | 52 +++++++------
security/gnome-keyring/Makefile | 4 +-
security/gnutls/Makefile | 14 +--
security/libgcrypt/Makefile | 3 +-
security/libgpg-error/Makefile | 3 +-
security/libtasn1/Makefile | 3 +-
security/opencdk/Makefile | 14 +-
security/p5-Crypt-SSLeay/Makefile | 4 +-
security/p5-Digest-HMAC/Makefile | 4 +-
security/p5-Digest-MD5/Makefile | 7 +-
security/p5-Digest-SHA1/Makefile | 7 +-
security/p5-Digest/Makefile | 3 +-
security/p5-GnuPG-Interface/Makefile | 4 +-
security/p5-IO-Socket-SSL/Makefile | 7 +-
security/p5-Net-SSLeay/Makefile | 3 +-
www/libgtkhtml/Makefile | 4 +-
www/libwww/Makefile | 3 +-
www/lynx/Makefile | 11 +-
www/lynx/distinfo | 4 +-
www/lynx/patches/patch-af | 36 ++++++++-
www/p5-HTML-Parser/Makefile | 7 +-
www/p5-HTML-Tagset/Makefile | 3 +-
www/p5-URI/Makefile | 7 +-
www/p5-libwww/Makefile | 7 +-
38 files changed, 297 insertions(+), 100 deletions(-)
diffs (truncated from 1008 to 300 lines):
diff -r f78e7fe08785 -r da913b3bf5a2 net/libtorrent/Makefile
--- a/net/libtorrent/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/net/libtorrent/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/17 12:28:12 tron Exp $
+# $NetBSD: Makefile,v 1.17 2006/11/05 17:31:09 joerg Exp $
DISTNAME= libtorrent-0.10.3
CATEGORIES= net
@@ -8,6 +8,8 @@
HOMEPAGE= http://libtorrent.rakshasa.no/
COMMENT= BitTorrent library written in C++ for *nix
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
diff -r f78e7fe08785 -r da913b3bf5a2 net/p5-INET6/Makefile
--- a/net/p5-INET6/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/net/p5-INET6/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/06 06:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/11/05 17:31:09 joerg Exp $
#
DISTNAME= INET6-2.01
@@ -11,6 +11,8 @@
HOMEPAGE= http://search.cpan.org/~mondejar/INET6/
COMMENT= Object interface for AF_INET|AF_INET6 domain sockets
+PKG_DESTDIR_SUPPORT= user-destdir
+
DEPENDS+= p5-Socket6>=0.12:../../net/p5-Socket6
PERL5_PACKLIST= auto/IO/Socket/INET6/.packlist
diff -r f78e7fe08785 -r da913b3bf5a2 net/p5-Net-DNS/Makefile
--- a/net/p5-Net-DNS/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/net/p5-Net-DNS/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/09/03 16:55:15 heinz Exp $
+# $NetBSD: Makefile,v 1.33 2006/11/05 17:31:10 joerg Exp $
DISTNAME= Net-DNS-0.58
PKGNAME= p5-${DISTNAME}
@@ -12,6 +12,7 @@
COMMENT= Perl5 module for DNS resolution
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEPENDS+= {p5-Test-Simple>=0.44,perl{,-thread}>=5.8.0}:../../devel/p5-Test-Simple
DEPENDS+= p5-Digest-HMAC>=1.0:../../security/p5-Digest-HMAC
diff -r f78e7fe08785 -r da913b3bf5a2 net/p5-Net/Makefile
--- a/net/p5-Net/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/net/p5-Net/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/10/17 22:18:02 heinz Exp $
+# $NetBSD: Makefile,v 1.41 2006/11/05 17:31:10 joerg Exp $
DISTNAME= libnet-1.19
PKGNAME= p5-Net-1.19
@@ -12,6 +12,7 @@
COMMENT= Perl5 modules to access and use network protocols
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
PERL5_PACKLIST= auto/Net/.packlist
diff -r f78e7fe08785 -r da913b3bf5a2 net/p5-Socket6/Makefile
--- a/net/p5-Socket6/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/net/p5-Socket6/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/11/05 17:31:10 joerg Exp $
#
DISTNAME= Socket6-0.19
@@ -12,6 +12,7 @@
COMMENT= Perl5 module to support getaddrinfo() and getnameinfo()
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
PERL5_PACKLIST= auto/Socket6/.packlist
diff -r f78e7fe08785 -r da913b3bf5a2 net/rsync/Makefile
--- a/net/rsync/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/net/rsync/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2006/04/28 16:08:37 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2006/11/05 17:31:10 joerg Exp $
DISTNAME= rsync-2.6.8
CATEGORIES= net
@@ -15,6 +15,8 @@
COMMENT= Network file distribution/synchronisation utility
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync
GNU_CONFIGURE= YES
diff -r f78e7fe08785 -r da913b3bf5a2 net/rtorrent/Makefile
--- a/net/rtorrent/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/net/rtorrent/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/17 12:28:13 tron Exp $
+# $NetBSD: Makefile,v 1.15 2006/11/05 17:31:10 joerg Exp $
DISTNAME= rtorrent-0.6.3
CATEGORIES= net
@@ -8,6 +8,8 @@
HOMEPAGE= http://libtorrent.rakshasa.no/
COMMENT= Ncurses based torrent client with support for sessions
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_NCURSES= yes
@@ -29,10 +31,11 @@
-fno-inline -fforce-addr
.endif
+INSTALLATION_DIRS= share/examples/rtorrent
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rtorrent
${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \
- ${PREFIX}/share/examples/rtorrent
+ ${DESTDIR}${PREFIX}/share/examples/rtorrent
.include "../../devel/ncurses/buildlink3.mk"
.include "../../net/libtorrent/buildlink3.mk"
diff -r f78e7fe08785 -r da913b3bf5a2 print/ghostscript-gnu/Makefile
--- a/print/ghostscript-gnu/Makefile Sun Nov 05 17:17:04 2006 +0000
+++ b/print/ghostscript-gnu/Makefile Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/11/05 17:34:44 joerg Exp $
DISTNAME= ghostscript-${GS_VERS}
PKGNAME= ghostscript-gnu-${GS_VERS}
@@ -13,6 +13,8 @@
COMMENT= GNU Postscript interpreter with all drivers
HOMEPAGE= http://www.cs.wisc.edu/~ghost/index.html
+PKG_DESTDIR_SUPPORT= user-destdir
+
CONFLICTS+= ghostscript{,-nox11}-[0-9]*
CONFLICTS+= ghostscript-afpl-[0-9]*
CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]*
@@ -93,7 +95,7 @@
# Reinstall the gs binary so that it's properly stripped.
post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/gs ${PREFIX}/bin/gs
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/gs ${DESTDIR}${PREFIX}/bin/gs
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f78e7fe08785 -r da913b3bf5a2 print/ghostscript-gnu/distinfo
--- a/print/ghostscript-gnu/distinfo Sun Nov 05 17:17:04 2006 +0000
+++ b/print/ghostscript-gnu/distinfo Sun Nov 05 17:31:09 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/11/27 17:06:36 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2006/11/05 17:34:44 joerg Exp $
SHA1 (ghostscript/ghostscript-8.15.tar.bz2) = 9b72a87e0521545265ec207bf12b7c20003ae2ad
RMD160 (ghostscript/ghostscript-8.15.tar.bz2) = fb8f997c164c98c8c73dee032bb4f2fef3e90901
@@ -7,6 +7,6 @@
RMD160 (ghostscript/jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882
Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes
SHA1 (patch-aa) = f9d706b19430c32f568316c0b02eee792e311236
-SHA1 (patch-ab) = ee1cad8503700d088e2a4dcf4c3d14237cb84b0e
+SHA1 (patch-ab) = f8c30796f284d504749adac1847ca6106253fe90
SHA1 (patch-ac) = 9758dcf3427ab1a7b018060b928d60f42dd9fd5e
SHA1 (patch-ad) = 964023e6d5e94f7cd471a9e7c5b29c4ce7db715e
diff -r f78e7fe08785 -r da913b3bf5a2 print/ghostscript-gnu/patches/patch-ab
--- a/print/ghostscript-gnu/patches/patch-ab Sun Nov 05 17:17:04 2006 +0000
+++ b/print/ghostscript-gnu/patches/patch-ab Sun Nov 05 17:31:09 2006 +0000
@@ -1,8 +1,114 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/13 05:43:28 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2006/11/05 17:34:44 joerg Exp $
---- src/unixinst.mak.orig Thu Apr 18 18:10:40 2002
+--- src/unixinst.mak.orig 2003-12-12 22:08:05.000000000 +0000
+++ src/unixinst.mak
-@@ -133,7 +133,7 @@ install-man: $(PSMANDIR)/gs.1
+@@ -28,24 +28,24 @@ install: install-exec install-scripts in
+ # rules, just in case bindir or scriptdir is a subdirectory of any of these.
+
+ install-exec: STDDIRS $(GS_XE)
+- -mkdir -p $(datadir)
+- -mkdir -p $(gsdir)
+- -mkdir -p $(gsdatadir)
+- -mkdir -p $(bindir)
+- $(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
++ -mkdir -p ${DESTDIR}$(datadir)
++ -mkdir -p ${DESTDIR}$(gsdir)
++ -mkdir -p ${DESTDIR}$(gsdatadir)
++ -mkdir -p ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) $(GS_XE) ${DESTDIR}$(bindir)/$(GS)
+
+ install-scripts: $(PSLIBDIR)/gsnd
+- -mkdir -p $(datadir)
+- -mkdir -p $(gsdir)
+- -mkdir -p $(gsdatadir)
+- -mkdir -p $(scriptdir)
++ -mkdir -p ${DESTDIR}$(datadir)
++ -mkdir -p ${DESTDIR}$(gsdir)
++ -mkdir -p ${DESTDIR}$(gsdatadir)
++ -mkdir -p ${DESTDIR}$(scriptdir)
+ $(SH) -c 'for f in \
+ gsbj gsdj gsdj500 gslj gslp gsnd \
+ bdftops dumphints dvipdf eps2eps font2c \
+ pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
+ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps wftopfa \
+ fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
+- do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(scriptdir); fi;\
++ do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f ${DESTDIR}$(scriptdir); fi;\
+ done'
+
+ PSRESDIR=$(PSLIBDIR)/../Resource
+@@ -59,10 +59,10 @@ install-data: install-libdata install-re
+ # one file from each subdirectory just as a sanity check.
+
+ install-libdata:
+- -mkdir -p $(datadir)
+- -mkdir -p $(gsdir)
+- -mkdir -p $(gsdatadir)
+- -mkdir -p $(gsdatadir)/lib
++ -mkdir -p ${DESTDIR}$(datadir)
++ -mkdir -p ${DESTDIR}$(gsdir)
++ -mkdir -p ${DESTDIR}$(gsdatadir)
++ -mkdir -p ${DESTDIR}$(gsdatadir)/lib
+ $(SH) -c 'for f in \
+ Fontmap Fontmap.GS cidfmap \
+ FAPIcidfmap FAPIconfig FAPIfontmap xlatmap \
+@@ -79,24 +79,24 @@ viewcmyk.ps viewgif.ps viewjpeg.ps viewm
+ viewpcx.ps viewpbm.ps viewps2a.ps \
+ winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \
+ pdf2dsc.ps pdfopt.ps ;\
+- do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(gsdatadir)/lib; fi;\
++ do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f ${DESTDIR}$(gsdatadir)/lib; fi;\
+ done'
+ $(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\
+- do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\
++ do $(INSTALL_DATA) $$f ${DESTDIR}$(gsdatadir)/lib ;\
+ done'
+ $(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
+- do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\
++ do $(INSTALL_DATA) $$f ${DESTDIR}$(gsdatadir)/lib ;\
+ done'
+
+ # install the default resource files
+ # copy in every category (directory) but CVS
+ RES_CATEGORIES=`ls $(PSRESDIR) | grep -v CVS`
+ install-resdata: $(PSRESDIR)/Decoding/Unicode
+- -mkdir -p $(datadir)
+- -mkdir -p $(gsdir)
+- -mkdir -p $(gsdatadir)/Resource
++ -mkdir -p ${DESTDIR}$(datadir)
++ -mkdir -p ${DESTDIR}$(gsdir)
++ -mkdir -p ${DESTDIR}$(gsdatadir)/Resource
+ $(SH) -c 'for dir in $(RES_CATEGORIES); do \
+- rdir=$(gsdatadir)/Resource/$$dir ; \
++ rdir=${DESTDIR}$(gsdatadir)/Resource/$$dir ; \
+ test -d $$rdir || mkdir -p $$rdir ; \
+ for file in $(PSRESDIR)/$$dir/*; do \
+ if test -f $$file; then $(INSTALL_DATA) $$file $$rdir ; fi \
+@@ -117,9 +117,9 @@ DOC_PAGES=PUBLIC README index.html gs.cs
+ Psfiles.htm Public.htm Readme.htm Release.htm \
+ Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
+ install-doc: $(PSDOCDIR)/News.htm
+- -mkdir -p $(docdir)
++ -mkdir -p ${DESTDIR}$(docdir)
+ $(SH) -c 'for f in $(DOC_PAGES) ;\
+- do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(docdir); fi;\
++ do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f ${DESTDIR}$(docdir); fi;\
+ done'
+
+ # install the man pages for each locale
+@@ -128,9 +128,9 @@ MAN1_LINKS_PS2PS=eps2eps
+ MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
+ MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
+ install-man: $(PSMANDIR)/gs.1
+- $(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
++ $(SH) -c 'test -d ${DESTDIR}$(mandir) || mkdir -p ${DESTDIR}$(mandir)'
+ $(SH) -c 'for d in $(MAN_LCDIRS) ;\
+- do man1dir=$(mandir)/$$d/man$(man1ext) ;\
++ do man1dir=${DESTDIR}$(mandir)/$$d/man$(man1ext) ;\
+ ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
+ for f in $(PSMANDIR)/$$d/*.1 ;\
+ do $(INSTALL_DATA) $$f $$man1dir ;\
+@@ -146,7 +146,7 @@ install-man: $(PSMANDIR)/gs.1
ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
Home |
Main Index |
Thread Index |
Old Index