pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/time user-destdir support
details: https://anonhg.NetBSD.org/pkgsrc/rev/acef31a28e5b
branches: trunk
changeset: 561151:acef31a28e5b
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jul 07 20:21:37 2009 +0000
description:
user-destdir support
diffstat:
time/gcal/Makefile | 10 +++++++++-
time/gnutime/Makefile | 4 +++-
time/gnutime/distinfo | 4 ++--
time/gnutime/patches/patch-ab | 37 ++++++++++++++++++++++++++++++++-----
4 files changed, 46 insertions(+), 9 deletions(-)
diffs (111 lines):
diff -r cd7f6e1384a1 -r acef31a28e5b time/gcal/Makefile
--- a/time/gcal/Makefile Tue Jul 07 20:17:57 2009 +0000
+++ b/time/gcal/Makefile Tue Jul 07 20:21:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/06/16 11:42:02 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/07 20:22:42 joerg Exp $
#
DISTNAME= gcal-3.01
@@ -10,6 +10,8 @@
HOMEPAGE= http://www.gnu.org/software/gcal/gcal.html
COMMENT= GNU version of the standard calendar utility
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_PKGLOCALEDIR= yes
INFO_FILES= # PLIST
@@ -20,5 +22,11 @@
REPLACE_PERL+= misc/gcalltx/gcalltxp.in
USE_TOOLS+= perl:run
+INSTALL_MAKE_FLAGS+= gnulocaledir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale \
+ bindir=${DESTDIR}${PREFIX}/bin \
+ packagedatadir=${DESTDIR}${PREFIX}/share/gcal \
+ infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} \
+ mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r cd7f6e1384a1 -r acef31a28e5b time/gnutime/Makefile
--- a/time/gnutime/Makefile Tue Jul 07 20:17:57 2009 +0000
+++ b/time/gnutime/Makefile Tue Jul 07 20:21:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/07 20:21:37 joerg Exp $
#
DISTNAME= time-1.7
@@ -10,6 +10,8 @@
HOMEPAGE= http://directory.fsf.org/GNU/time.html
COMMENT= Report user, system, and real time used by a process
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
INFO_FILES= # PLIST
diff -r cd7f6e1384a1 -r acef31a28e5b time/gnutime/distinfo
--- a/time/gnutime/distinfo Tue Jul 07 20:17:57 2009 +0000
+++ b/time/gnutime/distinfo Tue Jul 07 20:21:37 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/04/08 04:22:55 jlam Exp $
+$NetBSD: distinfo,v 1.6 2009/07/07 20:21:37 joerg Exp $
SHA1 (time-1.7.tar.gz) = dde0c28c7426960736933f3e763320680356cc6a
RMD160 (time-1.7.tar.gz) = 547a9bb4bc0b3a34046be8381e9c142977ffd402
Size (time-1.7.tar.gz) = 103066 bytes
SHA1 (patch-aa) = 73cf3ec312be4df97340a77f66c29b59c2afbf18
-SHA1 (patch-ab) = 25f61d7e4bbabc3c5f1a99987d059b279e20576a
+SHA1 (patch-ab) = 235c62c2d35ebbcb65bf6b4a242946740a78a4f0
diff -r cd7f6e1384a1 -r acef31a28e5b time/gnutime/patches/patch-ab
--- a/time/gnutime/patches/patch-ab Tue Jul 07 20:17:57 2009 +0000
+++ b/time/gnutime/patches/patch-ab Tue Jul 07 20:21:37 2009 +0000
@@ -1,14 +1,41 @@
-$NetBSD: patch-ab,v 1.4 2006/04/08 04:22:55 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2009/07/07 20:21:37 joerg Exp $
---- Makefile.in.orig 1996-07-11 17:07:03.000000000 -0400
+--- Makefile.in.orig 1996-07-11 23:07:03.000000000 +0200
+++ Makefile.in
-@@ -178,7 +178,8 @@ time.info: time.texi version.texi
+@@ -114,10 +114,10 @@ distclean-binPROGRAMS:
+ maintainer-clean-binPROGRAMS:
+
+ install-binPROGRAMS: $(bin_PROGRAMS)
+- $(mkinstalldirs) $(bindir)
++ $(mkinstalldirs) ${DESTDIR}$(bindir)
+ list="$(bin_PROGRAMS)"; for p in $$list; do \
+ if test -f $$p; then \
+- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++ $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; \
+ done
+
+@@ -176,10 +176,11 @@ time.info: time.texi version.texi
+ TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+
install-info: $(INFO_DEPS)
- $(mkinstalldirs) $(infodir)
+- $(mkinstalldirs) $(infodir)
++ $(mkinstalldirs) ${DESTDIR}$(infodir)
for file in $(INFO_DEPS); do \
- for ifile in `cd $(srcdir) && echo $$file*`; do \
+- $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+ for ifile in `cd $(srcdir) && echo $$file $$file-[1-9]*`; do \
+ test ! -f $(srcdir)/$$ifile || \
- $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
++ $(INSTALL_DATA) $(srcdir)/$$ifile ${DESTDIR}$(infodir)/$$ifile; \
done; \
done
+
+@@ -279,7 +280,7 @@ all: $(INFO_DEPS) $(PROGRAMS) Makefile
+ install-strip:
+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+ installdirs:
+- $(mkinstalldirs) $(bindir) $(infodir)
++ $(mkinstalldirs) ${DESTDIR}$(bindir) ${DESTDIR}$(infodir)
+
+
+ mostlyclean-generic:
Home |
Main Index |
Thread Index |
Old Index