Thu Feb 19 16:43:13 2009 UTC ()
DESTDIR support
(joerg)
diff -r1.3 -r1.4 pkgsrc/textproc/ebview/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/ebview/distinfo
diff -r0 -r1.1 pkgsrc/textproc/ebview/patches/patch-ac
diff -r0 -r1.1 pkgsrc/textproc/ebview/patches/patch-ad
diff -r0 -r1.1 pkgsrc/textproc/ebview/patches/patch-ae
--- pkgsrc/textproc/ebview/Makefile 2008/06/09 14:33:49 1.3
+++ pkgsrc/textproc/ebview/Makefile 2009/02/19 16:43:13 1.4
| @@ -1,18 +1,20 @@ | | | @@ -1,18 +1,20 @@ |
| 1 | # $NetBSD: Makefile,v 1.3 2008/06/09 14:33:49 obache Exp $ | | 1 | # $NetBSD: Makefile,v 1.4 2009/02/19 16:43:13 joerg Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= ebview-0.3.6 | | 3 | DISTNAME= ebview-0.3.6 |
| 4 | CATEGORIES= textproc | | 4 | CATEGORIES= textproc |
| 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ebview/} | | 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ebview/} |
| 6 | | | 6 | |
| 7 | MAINTAINER= yamajun@ofug.net | | 7 | MAINTAINER= yamajun@ofug.net |
| 8 | HOMEPAGE= http://ebview.sourceforge.net/ | | 8 | HOMEPAGE= http://ebview.sourceforge.net/ |
| 9 | COMMENT= GTK2 based EPWING dictionary browser | | 9 | COMMENT= GTK2 based EPWING dictionary browser |
| 10 | | | 10 | |
| | | 11 | PKG_DESTDIR_SUPPORT= user-destdir |
| | | 12 | |
| 11 | USE_PKGLOCALEDIR= YES | | 13 | USE_PKGLOCALEDIR= YES |
| 12 | USE_TOOLS+= gmake pkg-config msgfmt | | 14 | USE_TOOLS+= gmake pkg-config msgfmt |
| 13 | GNU_CONFIGURE= YES | | 15 | GNU_CONFIGURE= YES |
| 14 | | | 16 | |
| 15 | .include "../../converters/libiconv/buildlink3.mk" | | 17 | .include "../../converters/libiconv/buildlink3.mk" |
| 16 | .include "../../textproc/eb/buildlink3.mk" | | 18 | .include "../../textproc/eb/buildlink3.mk" |
| 17 | .include "../../x11/gtk2/buildlink3.mk" | | 19 | .include "../../x11/gtk2/buildlink3.mk" |
| 18 | .include "../../mk/bsd.pkg.mk" | | 20 | .include "../../mk/bsd.pkg.mk" |
--- pkgsrc/textproc/ebview/distinfo 2007/12/12 08:34:16 1.1.1.1
+++ pkgsrc/textproc/ebview/distinfo 2009/02/19 16:43:13 1.2
| @@ -1,7 +1,10 @@ | | | @@ -1,7 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.1.1.1 2007/12/12 08:34:16 obache Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2009/02/19 16:43:13 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (ebview-0.3.6.tar.gz) = 47b63fb2f265c83cc5bf7aeb92f96d0e1cc7f9af | | 3 | SHA1 (ebview-0.3.6.tar.gz) = 47b63fb2f265c83cc5bf7aeb92f96d0e1cc7f9af |
| 4 | RMD160 (ebview-0.3.6.tar.gz) = c32de00be68c13794f2c1d9c08edc34fc5dcb613 | | 4 | RMD160 (ebview-0.3.6.tar.gz) = c32de00be68c13794f2c1d9c08edc34fc5dcb613 |
| 5 | Size (ebview-0.3.6.tar.gz) = 564915 bytes | | 5 | Size (ebview-0.3.6.tar.gz) = 564915 bytes |
| 6 | SHA1 (patch-aa) = 8ecee1eeb1fddb9f1378a3258c8b8ae9a91c1640 | | 6 | SHA1 (patch-aa) = 8ecee1eeb1fddb9f1378a3258c8b8ae9a91c1640 |
| 7 | SHA1 (patch-ab) = ffedc7cc8b931f63f5a661314ef3703f88498434 | | 7 | SHA1 (patch-ab) = ffedc7cc8b931f63f5a661314ef3703f88498434 |
| | | 8 | SHA1 (patch-ac) = 642df47bfd8bd421ec3788e6054397c2a52f49ab |
| | | 9 | SHA1 (patch-ad) = d8c111b61ac1100caf6963c26e485c42616702f8 |
| | | 10 | SHA1 (patch-ae) = 71043b455d7c0ea4ef237d3ab7c1c2d6f8e91f92 |
$NetBSD: patch-ac,v 1.1 2009/02/19 16:43:13 joerg Exp $
--- data/Makefile.in.orig 2009-02-16 15:39:52.000000000 +0100
+++ data/Makefile.in
@@ -304,13 +304,13 @@ check: all
install:
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(pkgdatadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(pkgdatadir); \
else \
- $(top_srcdir)/mkinstalldirs $(pkgdatadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(pkgdatadir); \
fi; \
data="$(data)"; \
for file in $$data; do \
- $(INSTALL_DATA) $(srcdir)/$$file $(pkgdatadir)/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$file ${DESTDIR}$(pkgdatadir)/$$file; \
done;
# Define this as empty until I found a useful application.
$NetBSD: patch-ad,v 1.1 2009/02/19 16:43:13 joerg Exp $
--- doc/Makefile.in.orig 2009-02-16 15:46:52.000000000 +0100
+++ doc/Makefile.in
@@ -308,15 +308,15 @@ install:
dir="$(dir)"; \
for lang in $$dir; do \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(pkgdatadir)/help/$$lang; \
+ $(MKINSTALLDIRS) ${DESTDIR}$(pkgdatadir)/help/$$lang; \
else \
- $(top_srcdir)/mkinstalldirs $(pkgdatadir)/help/$$lang; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(pkgdatadir)/help/$$lang; \
fi; \
done; \
data="$(data)"; \
for lang in $$dir; do \
for file in $$data; do \
- $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(pkgdatadir)/help/$$lang/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$lang/$$file ${DESTDIR}$(pkgdatadir)/help/$$lang/$$file; \
done; \
done;
$NetBSD: patch-ae,v 1.1 2009/02/19 16:43:13 joerg Exp $
--- po/Makefile.in.in.orig 2009-02-19 17:39:10.000000000 +0100
+++ po/Makefile.in.in
@@ -115,9 +115,9 @@ 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)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -127,7 +127,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=${DESTDIR}$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \