| 1 |
bicatali 10/01/29 03:04:28 |
| 2 |
|
| 3 |
Added: wcslib-4.4.4-destdir.patch |
| 4 |
Removed: wcslib-4.3.3-flibs.patch wcslib-4.3.3-tests.patch |
| 5 |
Log: |
| 6 |
Version bump |
| 7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wcslib-4.4.4-destdir.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nur wcslib-4.4.4.orig/C/GNUmakefile wcslib-4.4.4/C/GNUmakefile |
| 18 |
--- wcslib-4.4.4.orig/C/GNUmakefile 2009-08-13 00:55:50.000000000 +0100 |
| 19 |
+++ wcslib-4.4.4/C/GNUmakefile 2010-01-29 02:48:25.000000000 +0000 |
| 20 |
@@ -180,36 +180,36 @@ |
| 21 |
-@ echo '' |
| 22 |
-@ $(RM) -r tmp |
| 23 |
mkdir tmp |
| 24 |
- cd tmp && $(AR) x ../$(PICLIB) && $(SHRLD) -o $@ *.o && mv $@ .. |
| 25 |
+ cd tmp && $(AR) x ../$(PICLIB) && $(SHRLD) $(LDFLAGS) -o $@ *.o && mv $@ .. |
| 26 |
- $(RM) -r tmp |
| 27 |
|
| 28 |
$(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ; |
| 29 |
|
| 30 |
install : build |
| 31 |
- - if [ ! -d "$(LIBDIR)" ] ; then \ |
| 32 |
- $(INSTALL) -d -m 2775 $(LIBDIR) ; \ |
| 33 |
+ - if [ ! -d "$(DESTDIR)$(LIBDIR)" ] ; then \ |
| 34 |
+ $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR) ; \ |
| 35 |
fi |
| 36 |
- $(INSTALL) -m 644 $(LIBWCS) $(LIBDIR) |
| 37 |
- $(RANLIB) $(LIBDIR)/$(LIBWCS) |
| 38 |
- - if [ -L "$(LIBDIR)/libwcs.a" ] ; then \ |
| 39 |
- $(RM) $(LIBDIR)/libwcs.a ; \ |
| 40 |
+ $(INSTALL) -m 644 $(LIBWCS) $(DESTDIR)$(LIBDIR) |
| 41 |
+ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBWCS) |
| 42 |
+ - if [ -L "$(DESTDIR)$(LIBDIR)/libwcs.a" ] ; then \ |
| 43 |
+ $(RM) $(DESTDIR)$(LIBDIR)/libwcs.a ; \ |
| 44 |
fi |
| 45 |
- $(LN_S) $(LIBWCS) $(LIBDIR)/libwcs.a |
| 46 |
+ $(LN_S) $(LIBWCS) $(DESTDIR)$(LIBDIR)/libwcs.a |
| 47 |
- if [ "$(SHRLIB)" != "" ] ; then \ |
| 48 |
- $(INSTALL) -m 644 $(SHRLIB) $(LIBDIR) ; \ |
| 49 |
+ $(INSTALL) -m 644 $(SHRLIB) $(DESTDIR)$(LIBDIR) ; \ |
| 50 |
if [ "$(SHRLN)" != "" ] ; then \ |
| 51 |
- if [ -L "$(LIBDIR)/$(SHRLN)" ] ; then \ |
| 52 |
- $(RM) $(LIBDIR)/$(SHRLN) ; \ |
| 53 |
+ if [ -L "$(DESTDIR)$(LIBDIR)/$(SHRLN)" ] ; then \ |
| 54 |
+ $(RM) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \ |
| 55 |
fi ; \ |
| 56 |
- $(LN_S) $(SHRLIB) $(LIBDIR)/$(SHRLN) ; \ |
| 57 |
+ $(LN_S) $(SHRLIB) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \ |
| 58 |
fi ; \ |
| 59 |
fi |
| 60 |
- - if [ ! -d "$(INCDIR)" ] ; then \ |
| 61 |
- $(INSTALL) -d -m 2775 $(INCDIR) ; \ |
| 62 |
+ - if [ ! -d "$(DESTDIR)$(INCDIR)" ] ; then \ |
| 63 |
+ $(INSTALL) -d -m 2775 $(DESTDIR)$(INCDIR) ; \ |
| 64 |
fi |
| 65 |
- $(INSTALL) -m 444 *.h $(INCDIR) |
| 66 |
- $(RM) $(INCLINK) |
| 67 |
- $(LN_S) $(WCSLIBV) $(INCLINK) |
| 68 |
+ $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR) |
| 69 |
+ $(RM) $(DESTDIR)$(INCLINK) |
| 70 |
+ $(LN_S) $(WCSLIBV) $(DESTDIR)$(INCLINK) |
| 71 |
|
| 72 |
clean : |
| 73 |
- $(RM) *.o *.i a.out core $(EXTRA_CLEAN) |
| 74 |
diff -Nur wcslib-4.4.4.orig/Fortran/GNUmakefile wcslib-4.4.4/Fortran/GNUmakefile |
| 75 |
--- wcslib-4.4.4.orig/Fortran/GNUmakefile 2009-08-11 00:56:25.000000000 +0100 |
| 76 |
+++ wcslib-4.4.4/Fortran/GNUmakefile 2010-01-29 02:19:49.000000000 +0000 |
| 77 |
@@ -177,7 +177,7 @@ |
| 78 |
|
| 79 |
install : build |
| 80 |
$(MAKE) -C ../C install |
| 81 |
- $(INSTALL) -m 444 *.inc $(INCDIR) |
| 82 |
+ $(INSTALL) -m 444 *.inc $(DESTDIR)$(INCDIR) |
| 83 |
|
| 84 |
clean : |
| 85 |
- $(RM) *.o *.i a.out core fort.* $(EXTRA_CLEAN) |
| 86 |
diff -Nur wcslib-4.4.4.orig/GNUmakefile wcslib-4.4.4/GNUmakefile |
| 87 |
--- wcslib-4.4.4.orig/GNUmakefile 2009-09-14 07:49:58.000000000 +0100 |
| 88 |
+++ wcslib-4.4.4/GNUmakefile 2010-01-29 02:32:59.000000000 +0000 |
| 89 |
@@ -51,14 +51,13 @@ |
| 90 |
@ for DIR in $(INSTDIR) ; do \ |
| 91 |
$(MAKE) -k -C $$DIR $@ ; \ |
| 92 |
done |
| 93 |
- $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR) |
| 94 |
- $(INSTALL) -m 444 CHANGES $(INCDIR)/CHANGES |
| 95 |
- $(INSTALL) -m 444 COPYING $(INCDIR)/COPYING |
| 96 |
- $(INSTALL) -m 444 README $(INCDIR)/README |
| 97 |
- if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \ |
| 98 |
- $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \ |
| 99 |
+ $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(DESTDIR)$(INCDIR) |
| 100 |
+ $(INSTALL) -m 444 CHANGES $(DESTDIR)$(INCDIR)/CHANGES |
| 101 |
+ $(INSTALL) -m 444 README $(DESTDIR)$(INCDIR)/README |
| 102 |
+ if [ ! -d "$(DESTDIR)$(LIBDIR)/pkgconfig" ] ; then \ |
| 103 |
+ $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR)/pkgconfig ; \ |
| 104 |
fi |
| 105 |
- $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc |
| 106 |
+ $(INSTALL) -m 444 wcslib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/wcslib.pc |
| 107 |
|
| 108 |
realclean cleanest : |
| 109 |
for DIR in $(SUBDIRS) doxygen ; do \ |
| 110 |
diff -Nur wcslib-4.4.4.orig/pgsbox/GNUmakefile wcslib-4.4.4/pgsbox/GNUmakefile |
| 111 |
--- wcslib-4.4.4.orig/pgsbox/GNUmakefile 2009-08-11 00:57:05.000000000 +0100 |
| 112 |
+++ wcslib-4.4.4/pgsbox/GNUmakefile 2010-01-29 02:19:49.000000000 +0000 |
| 113 |
@@ -128,11 +128,11 @@ |
| 114 |
|
| 115 |
install : build |
| 116 |
$(MAKE) -C ../Fortran install |
| 117 |
- $(INSTALL) -m 644 $(PGSBOXLIB) $(LIBDIR) |
| 118 |
- $(RANLIB) $(LIBDIR)/$(PGSBOXLIB) |
| 119 |
- $(RM) $(LIBDIR)/libpgsbox.a |
| 120 |
- $(LN_S) $(LIBDIR)/$(PGSBOXLIB) $(LIBDIR)/libpgsbox.a |
| 121 |
- $(INSTALL) -m 444 *.h $(INCDIR) |
| 122 |
+ $(INSTALL) -m 644 $(PGSBOXLIB) $(DESTDIR)$(LIBDIR) |
| 123 |
+ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB) |
| 124 |
+ $(RM) $(DESTDIR)$(LIBDIR)/libpgsbox.a |
| 125 |
+ $(LN_S) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB) $(DESTDIR)$(LIBDIR)/libpgsbox.a |
| 126 |
+ $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR) |
| 127 |
|
| 128 |
pgtest : pgtest.o lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS) |
| 129 |
-@ rm -f $@ |
| 130 |
diff -Nur wcslib-4.4.4.orig/utils/GNUmakefile wcslib-4.4.4/utils/GNUmakefile |
| 131 |
--- wcslib-4.4.4.orig/utils/GNUmakefile 2009-08-10 09:56:04.000000000 +0100 |
| 132 |
+++ wcslib-4.4.4/utils/GNUmakefile 2010-01-29 02:19:49.000000000 +0000 |
| 133 |
@@ -101,10 +101,10 @@ |
| 134 |
$(MAKE) -C ../C lib |
| 135 |
|
| 136 |
install : build |
| 137 |
- - if [ ! -d "$(BINDIR)" ] ; then \ |
| 138 |
- $(INSTALL) -d -m 2775 $(BINDIR) ; \ |
| 139 |
+ - if [ ! -d "$(DESTDIR)$(BINDIR)" ] ; then \ |
| 140 |
+ $(INSTALL) -d -m 2775 $(DESTDIR)$(BINDIR) ; \ |
| 141 |
fi |
| 142 |
- $(INSTALL) -m 755 $(UTILS) $(BINDIR) |
| 143 |
+ $(INSTALL) -m 755 $(UTILS) $(DESTDIR)$(BINDIR) |
| 144 |
|
| 145 |
GNUmakefile : ../makedefs ; |
Archives