| 1 |
bicatali 09/03/21 15:46:50 |
| 2 |
|
| 3 |
Modified: ast-4.6.2-makefile.in.patch |
| 4 |
Added: ast-5.1.0-makefile.in.patch |
| 5 |
Log: |
| 6 |
Version bump and fixed a libtool file (bug #261077) |
| 7 |
(Portage version: 2.2_rc26/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: ast-4.6.2-makefile.in.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- ast-4.6.2-makefile.in.patch 23 Feb 2009 17:31:46 -0000 1.2 |
| 23 |
+++ ast-4.6.2-makefile.in.patch 21 Mar 2009 15:46:50 -0000 1.3 |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
---- Makefile.in.orig 2008-09-10 11:59:21.000000000 +0100 |
| 26 |
-+++ Makefile.in 2009-02-23 17:01:16.196714977 +0000 |
| 27 |
+--- Makefile.in.orig 2009-03-21 11:48:33.829215706 +0000 |
| 28 |
++++ Makefile.in 2009-03-21 11:50:56.901572460 +0000 |
| 29 |
@@ -76,7 +76,14 @@ |
| 30 |
"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" |
| 31 |
libLTLIBRARIES_INSTALL = $(INSTALL) |
| 32 |
@@ -71,3 +71,20 @@ |
| 33 |
else \ |
| 34 |
echo "Installation of component $(DESTDIR)$(STAR_MANIFEST_DIR)/$(PACKAGE) failed" >&2; \ |
| 35 |
fi; \ |
| 36 |
+@@ -2720,14 +2726,14 @@ |
| 37 |
+ $(mkdir_p) $(DESTDIR)$(libdir) |
| 38 |
+ cd $(DESTDIR)$(libdir); \ |
| 39 |
+ for f in `ls libast.*`; do \ |
| 40 |
+- ff=`echo $$f | sed -e 's/libast/libast_pass2/'`; \ |
| 41 |
++ ff=`echo $$f | sed -e 's/libast\./libast_pass2\./'`; \ |
| 42 |
+ if test -f "$$ff"; then rm "$$ff"; fi; \ |
| 43 |
+ $(LN_S) $$f $$ff; \ |
| 44 |
+ $(MANIFEST) && echo "MANIFEST:$(DESTDIR)$(libdir)/$$ff" || :; \ |
| 45 |
+ done; \ |
| 46 |
+ if test -f "libast.la"; then \ |
| 47 |
+ if test -f "libast_pass2.la"; then rm "libast_pass2.la"; fi; \ |
| 48 |
+- sed -e 's/libast/libast_pass2/g' libast.la > libast_pass2.la; \ |
| 49 |
++ sed -e 's/libast\./libast_pass2\./g' libast.la > libast_pass2.la; \ |
| 50 |
+ fi |
| 51 |
+ @PREDIST@version.h: version.h.in configure.ac |
| 52 |
+ @PREDIST@ rm -f $@; $(predist_subs) version.h.in >$@ |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.1 sci-astronomy/ast/files/ast-5.1.0-makefile.in.patch |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ast/files/ast-5.1.0-makefile.in.patch?rev=1.1&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ast/files/ast-5.1.0-makefile.in.patch?rev=1.1&content-type=text/plain |
| 60 |
|
| 61 |
Index: ast-5.1.0-makefile.in.patch |
| 62 |
=================================================================== |
| 63 |
--- Makefile.in.orig 2009-03-20 20:05:18.314466717 +0000 |
| 64 |
+++ Makefile.in 2009-03-21 15:07:59.217879770 +0000 |
| 65 |
@@ -77,7 +77,14 @@ |
| 66 |
"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" |
| 67 |
libLTLIBRARIES_INSTALL = $(INSTALL) |
| 68 |
LTLIBRARIES = $(lib_LTLIBRARIES) |
| 69 |
-libast_la_LIBADD = |
| 70 |
+libast_la_LIBADD = \ |
| 71 |
+ libast_err.la \ |
| 72 |
+ libast_grf3d.la \ |
| 73 |
+ libast_grf_2.0.la \ |
| 74 |
+ libast_grf_3.2.la \ |
| 75 |
+ libast_pal.la \ |
| 76 |
+ libast_wcslib.la |
| 77 |
+ |
| 78 |
am__objects_1 = libast_la-axis.lo libast_la-box.lo libast_la-c2f77.lo \ |
| 79 |
libast_la-channel.lo libast_la-circle.lo libast_la-cmpframe.lo \ |
| 80 |
libast_la-cmpmap.lo libast_la-cmpregion.lo \ |
| 81 |
@@ -163,10 +170,10 @@ |
| 82 |
libast_pal_la_LIBADD = |
| 83 |
am_libast_pal_la_OBJECTS = libast_pal_la-pal.lo |
| 84 |
libast_pal_la_OBJECTS = $(am_libast_pal_la_OBJECTS) |
| 85 |
-libast_pgplot_la_LIBADD = |
| 86 |
+libast_pgplot_la_LIBADD = -lpgplot |
| 87 |
am_libast_pgplot_la_OBJECTS = libast_pgplot_la-grf_pgplot.lo |
| 88 |
libast_pgplot_la_OBJECTS = $(am_libast_pgplot_la_OBJECTS) |
| 89 |
-libast_pgplot3d_la_LIBADD = |
| 90 |
+libast_pgplot3d_la_LIBADD = -lpgplot |
| 91 |
am_libast_pgplot3d_la_OBJECTS = libast_pgplot3d_la-grf3d_pgplot.lo |
| 92 |
libast_pgplot3d_la_OBJECTS = $(am_libast_pgplot3d_la_OBJECTS) |
| 93 |
libast_wcslib_la_LIBADD = |
| 94 |
@@ -682,7 +689,6 @@ |
| 95 |
nodist_include_HEADERS = ast.h AST_PAR |
| 96 |
include_MESSAGES = AST_ERR ast_err.h |
| 97 |
lib_LTLIBRARIES = \ |
| 98 |
- libast.la \ |
| 99 |
libast_err.la \ |
| 100 |
libast_ems.la \ |
| 101 |
libast_drama.la \ |
| 102 |
@@ -692,11 +698,12 @@ |
| 103 |
libast_pgplot.la \ |
| 104 |
libast_pgplot3d.la \ |
| 105 |
libast_pal.la \ |
| 106 |
- libast_wcslib.la |
| 107 |
+ libast_wcslib.la \ |
| 108 |
+ libast.la |
| 109 |
|
| 110 |
-stardocs_DATA = @STAR_LATEX_DOCUMENTATION@ |
| 111 |
-dist_starnews_DATA = ast.news |
| 112 |
-dist_pkgdata_DATA = LICENCE |
| 113 |
+stardocs_DATA = |
| 114 |
+dist_starnews_DATA = |
| 115 |
+dist_pkgdata_DATA = |
| 116 |
|
| 117 |
# Make all library code position independent by default. This is handy for |
| 118 |
# creating shareable libraries from the static ones (Java JNI libraries). |
| 119 |
@@ -813,7 +820,7 @@ |
| 120 |
#ast_test_LDADD = `ast_link` |
| 121 |
# Expand ast_link to avoid libast_pass2, which causes problems for Solaris |
| 122 |
ast_test_LDADD = libast.la libast_pal.la libast_grf_3.2.la libast_wcslib.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm |
| 123 |
-starfacs_DATA = fac_1521_err |
| 124 |
+starfacs_DATA = |
| 125 |
all: $(BUILT_SOURCES) config.h |
| 126 |
$(MAKE) $(AM_MAKEFLAGS) all-am |
| 127 |
|
| 128 |
@@ -2608,7 +2615,6 @@ |
| 129 |
echo "</files>"; \ |
| 130 |
echo "</manifest>"; \ |
| 131 |
) >$$MF; \ |
| 132 |
- $(INSTALL_DATA) $$MF $(DESTDIR)$(STAR_MANIFEST_DIR)/$(PACKAGE); \ |
| 133 |
else \ |
| 134 |
echo "Installation of component $(DESTDIR)$(STAR_MANIFEST_DIR)/$(PACKAGE) failed" >&2; \ |
| 135 |
fi; \ |
| 136 |
@@ -2762,14 +2768,14 @@ |
| 137 |
$(mkdir_p) $(DESTDIR)$(libdir) |
| 138 |
cd $(DESTDIR)$(libdir); \ |
| 139 |
for f in `ls libast.*`; do \ |
| 140 |
- ff=`echo $$f | sed -e 's/libast/libast_pass2/'`; \ |
| 141 |
+ ff=`echo $$f | sed -e 's/libast\./libast_pass2\./'`; \ |
| 142 |
if test -f "$$ff"; then rm "$$ff"; fi; \ |
| 143 |
$(LN_S) $$f $$ff; \ |
| 144 |
$(MANIFEST) && echo "MANIFEST:$(DESTDIR)$(libdir)/$$ff" || :; \ |
| 145 |
done; \ |
| 146 |
if test -f "libast.la"; then \ |
| 147 |
if test -f "libast_pass2.la"; then rm "libast_pass2.la"; fi; \ |
| 148 |
- sed -e 's/libast/libast_pass2/g' libast.la > libast_pass2.la; \ |
| 149 |
+ sed -e 's/libast\./libast_pass2\./g' libast.la > libast_pass2.la; \ |
| 150 |
fi |
| 151 |
@PREDIST@version.h: version.h.in configure.ac |
| 152 |
@PREDIST@ rm -f $@; $(predist_subs) version.h.in >$@ |
Archives