diff options
| author | joerg <joerg@pkgsrc.org> | 2006-11-05 17:31:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-11-05 17:31:09 +0000 |
| commit | aa48c982406bf3ae2fc7616f0d5dfd0654627380 (patch) | |
| tree | 9c7b8d7af3ab6f4c4b742fb364df84b9851cf76c /www/lynx | |
| parent | 6e82078eeffa2d3575e27ed632f26e8ec04106e6 (diff) | |
| download | pkgsrc-aa48c982406bf3ae2fc7616f0d5dfd0654627380.tar.gz | |
DESTDIR support.
Diffstat (limited to 'www/lynx')
| -rw-r--r-- | www/lynx/Makefile | 11 | ||||
| -rw-r--r-- | www/lynx/distinfo | 4 | ||||
| -rw-r--r-- | www/lynx/patches/patch-af | 36 |
3 files changed, 42 insertions, 9 deletions
diff --git a/www/lynx/Makefile b/www/lynx/Makefile index aef9cb0addb..3bf75e3700d 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2006/10/09 01:53:06 rillig Exp $ +# $NetBSD: Makefile,v 1.93 2006/11/05 17:37:55 joerg Exp $ # # NOTE: Please do not enable the lynxcgi feature unless it is lynx @@ -26,6 +26,7 @@ HOMEPAGE= http://lynx.isc.org/ COMMENT= Alphanumeric display oriented World-Wide Web Client PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir DIST_SUBDIR= lynx WRKSRC= ${WRKDIR}/${DISTNAME:S/./-/g} @@ -78,10 +79,10 @@ CONFIGURE_ARGS+= --enable-read-eta .include "../../security/openssl/buildlink3.mk" post-install: - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx - ${FIND} ${PREFIX}/share/lynx -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/lynx + ${FIND} ${DESTDIR}${PREFIX}/share/lynx -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} # gets created when applying 2.8.5.2 patch -- remove on # patchless update - ${RM} -f ${PREFIX}/share/lynx/lynx_doc/CHANGES.orig_dist + ${RM} -f ${DESTDIR}${PREFIX}/share/lynx/lynx_doc/CHANGES.orig_dist -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk"
\ No newline at end of file diff --git a/www/lynx/distinfo b/www/lynx/distinfo index 0cfaf446706..98fd0a030e8 100644 --- a/www/lynx/distinfo +++ b/www/lynx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2006/05/29 16:58:18 drochner Exp $ +$NetBSD: distinfo,v 1.21 2006/11/05 17:37:55 joerg Exp $ SHA1 (lynx/lynx2.8.5.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4 RMD160 (lynx/lynx2.8.5.tar.bz2) = 80d20261ac6eaebe1d940fb5de485daaad7bb3b7 @@ -18,7 +18,7 @@ Size (lynx/2.8.5rel.5.patch.gz) = 2117 bytes SHA1 (patch-aa) = ac17101b5dfa296298f1fcd58e8b14673c2855bb SHA1 (patch-ab) = 2cc647d06d97127546bf2511fbfac6a5eef67d07 SHA1 (patch-ae) = 5dff036d9fc35dca528acb530f779dce4a98cddd -SHA1 (patch-af) = 819cdfae5e8181423f5be68cc202a6e074560e75 +SHA1 (patch-af) = 852c574bc5600604b0b04b9f345dd0352d27b545 SHA1 (patch-ag) = 93d1ff507f8533e54a45f50d0310d2bb8017f1d2 SHA1 (patch-ba) = 14aa7dd1026127753f6f8e5bf18bcf83a7a246fc SHA1 (patch-bb) = 33ebf1ad1f7471ec5afba8b436b7fdc2214ac6d7 diff --git a/www/lynx/patches/patch-af b/www/lynx/patches/patch-af index 0ee1607d35c..37aaef3108b 100644 --- a/www/lynx/patches/patch-af +++ b/www/lynx/patches/patch-af @@ -1,7 +1,18 @@ -$NetBSD: patch-af,v 1.1 2004/03/11 22:10:48 ben Exp $ +$NetBSD: patch-af,v 1.2 2006/11/05 17:37:55 joerg Exp $ ---- po/makefile.inn.orig 2004-01-28 11:30:38.000000000 -0800 +--- po/makefile.inn.orig 2004-01-28 19:30:38.000000000 +0000 +++ po/makefile.inn +@@ -21,8 +21,8 @@ DESTDIR= @DESTDIR@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @NLS_DATADIR@ +-localedir = $(DESTDIR)$(datadir)/locale +-gnulocaledir = $(DESTDIR)$(prefix)/share/locale ++localedir = /usr/pkg/share/locale ++gnulocaledir = /usr/pkg/share/locale + gettextsrcdir = $(DESTDIR)$(prefix)/share/gettext/po + subdir = po + @@ -71,6 +71,11 @@ INSTOBJEXT = @INSTOBJEXT@ $(MSGFMT) -o $@ $< @@ -14,3 +25,24 @@ $NetBSD: patch-af,v 1.1 2004/03/11 22:10:48 ben Exp $ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< +@@ -113,16 +118,16 @@ install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkdirs.sh $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkdirs.sh $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ +- *.gmo) destdir=$(gnulocaledir);; \ +- *) destdir=$(localedir);; \ ++ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ ++ *) destdir=$(DESTDIR)$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ |