pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Support staged installation.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f91dfcce8f2a
branches:  trunk
changeset: 568328:f91dfcce8f2a
user:      asau <asau%pkgsrc.org@localhost>
date:      Fri Dec 11 01:34:38 2009 +0000

description:
Support staged installation.

diffstat:

 devel/rcs/Makefile            |  11 ++++++-----
 devel/rcs/distinfo            |   5 +++--
 devel/rcs/patches/patch-ab    |  28 ++++++++++++++++++++++++----
 devel/rcs/patches/patch-ad    |  18 ++++++++++++++++++
 math/linpack/Makefile         |   5 ++++-
 math/linpack/distinfo         |   4 ++--
 math/linpack/patches/patch-aa |   4 ++--
 7 files changed, 59 insertions(+), 16 deletions(-)

diffs (161 lines):

diff -r 5b60aadc3be3 -r f91dfcce8f2a devel/rcs/Makefile
--- a/devel/rcs/Makefile        Fri Dec 11 00:17:55 2009 +0000
+++ b/devel/rcs/Makefile        Fri Dec 11 01:34:38 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/02/15 15:48:46 gdt Exp $
+# $NetBSD: Makefile,v 1.28 2009/12/11 01:41:53 asau Exp $
 #
 
 DISTNAME=              rcs-5.7
@@ -10,6 +10,7 @@
 HOMEPAGE=              http://www.cs.purdue.edu/homes/trinkle/RCS/
 COMMENT=               GNU Revision Control System - version control software
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 MAKE_JOBS_SAFE=                no
 
 .include "../../mk/bsd.prefs.mk"
@@ -25,9 +26,9 @@
 CONFIGURE_HAS_MANDIR=  no
 
 post-install:
-       ${RM} -f ${PREFIX}/bin/rcslog
-       ${LN} -s ${PREFIX}/bin/rlog ${PREFIX}/bin/rcslog
-       ${RM} -f ${PREFIX}/${PKGMANDIR}/man1/rcslog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1.gz
-       ${LN} -s ${PREFIX}/${PKGMANDIR}/man1/rlog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1
+       ${RM} -f ${DESTDIR}${PREFIX}/bin/rcslog
+       ${LN} -s ${DESTDIR}${PREFIX}/bin/rlog ${DESTDIR}${PREFIX}/bin/rcslog
+       ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcslog.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcslog.1.gz
+       ${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rlog.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcslog.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5b60aadc3be3 -r f91dfcce8f2a devel/rcs/distinfo
--- a/devel/rcs/distinfo        Fri Dec 11 00:17:55 2009 +0000
+++ b/devel/rcs/distinfo        Fri Dec 11 01:34:38 2009 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/02/14 21:42:20 tnn Exp $
+$NetBSD: distinfo,v 1.10 2009/12/11 01:41:53 asau Exp $
 
 SHA1 (rcs-5.7.tar.gz) = a5c7982cf538d5e006b5db40f0aefaea5eb2cbba
 RMD160 (rcs-5.7.tar.gz) = 6ade4d835f7586416abe8b9bc768912eb722dff3
 Size (rcs-5.7.tar.gz) = 282413 bytes
-SHA1 (patch-ab) = aec735f6e1746ced1179049bab46f4f1521996ee
+SHA1 (patch-ab) = ea5df55a17845ea8255ae3cc454d7ba0b90958dc
 SHA1 (patch-ac) = d529a44d9562c5c734555391e8cf594b4fc858a3
+SHA1 (patch-ad) = 26fc5bed4f4fdcbb5b4b1d508d128d2528a6815c
diff -r 5b60aadc3be3 -r f91dfcce8f2a devel/rcs/patches/patch-ab
--- a/devel/rcs/patches/patch-ab        Fri Dec 11 00:17:55 2009 +0000
+++ b/devel/rcs/patches/patch-ab        Fri Dec 11 01:34:38 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2008/02/14 21:42:21 tnn Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/11 01:41:53 asau Exp $
 
---- man/Makefile.in.orig       1995-06-16 08:19:24.000000000 +0200
-+++ man/Makefile.in
-@@ -34,8 +34,8 @@ INSTALL_DATA = @INSTALL_DATA@
+--- man/Makefile.in.orig       1995-06-16 10:19:24.000000000 +0400
++++ man/Makefile.in    2009-12-11 03:40:07.000000000 +0300
+@@ -34,8 +34,8 @@
  PIC = @PIC@
  
  prefix = @prefix@
@@ -13,3 +13,23 @@
  man1ext = .1
  man5ext = .5
  
+@@ -49,16 +49,16 @@
+ check dvi info TAGS ::
+ 
+ installdirs :: ../mkinstalldirs
+-      -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
++      -$(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
+ 
+ man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
+ 
+ install :: installdirs
+       -for m in $(man1pages); do \
+-              $(INSTALL_DATA) $(srcdir)/$$m.1 $(man1dir)/$$m$(man1ext); \
++              $(INSTALL_DATA) $(srcdir)/$$m.1 $(DESTDIR)$(man1dir)/$$m$(man1ext); \
+       done
+       -{ test -f rcsfile.5 || cd $(srcdir); } && \
+-      $(INSTALL_DATA) rcsfile.5 $(man5dir)/rcsfile$(man5ext)
++      $(INSTALL_DATA) rcsfile.5 $(DESTDIR)$(man5dir)/rcsfile$(man5ext)
+ 
+ uninstall ::
+       for m in $(man1pages); do \
diff -r 5b60aadc3be3 -r f91dfcce8f2a devel/rcs/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/rcs/patches/patch-ad        Fri Dec 11 01:34:38 2009 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2009/12/11 01:41:53 asau Exp $
+
+--- src/Makefile.in.orig       1995-06-16 10:19:24.000000000 +0400
++++ src/Makefile.in    2009-12-11 03:38:57.000000000 +0300
+@@ -110,11 +110,11 @@
+       $(CC) -c $(ALL_CFLAGS) $<
+ 
+ installdirs :: ../mkinstalldirs
+-      $(srcdir)/../mkinstalldirs $(bindir)
++      $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
+ 
+ install :: all installdirs
+       for p in $(PROGRAMS); do \
+-        $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
++        $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
+       done
+ 
+ uninstall ::
diff -r 5b60aadc3be3 -r f91dfcce8f2a math/linpack/Makefile
--- a/math/linpack/Makefile     Fri Dec 11 00:17:55 2009 +0000
+++ b/math/linpack/Makefile     Fri Dec 11 01:34:38 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/12/03 13:06:55 asau Exp $
+# $NetBSD: Makefile,v 1.12 2009/12/11 01:34:38 asau Exp $
 
 DISTNAME=      linpack-20010510
 PKGREVISION=   2
@@ -10,8 +10,11 @@
 
 DEPENDS+=      blas-[0-9]*:../../math/blas
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
 USE_LANGUAGES= fortran
 WRKSRC=                ${WRKDIR}/linpack
+INSTALLATION_DIRS=     lib
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5b60aadc3be3 -r f91dfcce8f2a math/linpack/distinfo
--- a/math/linpack/distinfo     Fri Dec 11 00:17:55 2009 +0000
+++ b/math/linpack/distinfo     Fri Dec 11 01:34:38 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 12:06:55 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/12/11 01:34:38 asau Exp $
 
 SHA1 (linpack-20010510.tar.gz) = b10aca3f0232719c1fa3de455f91230393829b12
 RMD160 (linpack-20010510.tar.gz) = 72015366e8f9342d58c2429896fd75810f2df6f3
 Size (linpack-20010510.tar.gz) = 334832 bytes
-SHA1 (patch-aa) = 07195ee4920fe53559ef68f8fe696d7728b67337
+SHA1 (patch-aa) = 9993203f6b17bef939df4f958d0f458a5962edee
 SHA1 (patch-ab) = 2c6ea54300b0bca78268d5ca6e23637e8059b201
 SHA1 (patch-ac) = c83d40137147445a8dd9fb72c97004759ce8366a
 SHA1 (patch-ad) = d73a1e4f1287c56842037158a413d90b4faee8fa
diff -r 5b60aadc3be3 -r f91dfcce8f2a math/linpack/patches/patch-aa
--- a/math/linpack/patches/patch-aa     Fri Dec 11 00:17:55 2009 +0000
+++ b/math/linpack/patches/patch-aa     Fri Dec 11 01:34:38 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:57:31 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/11 01:34:39 asau Exp $
 
 --- /dev/null  Fri Apr 27 22:55:43 2001
 +++ Makefile
@@ -38,7 +38,7 @@
 +      $(RANLIB) $@
 +
 +install:      lib$(LIB).a
-+      $(BSD_INSTALL_DATA) lib$(LIB).a $(LIBDIR)
++      $(BSD_INSTALL_DATA) lib$(LIB).a $(DESTDIR)$(LIBDIR)
 +
 +clean:
 +      rm -f *.o lib$(LIB).a



Home | Main Index | Thread Index | Old Index