Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/cfitsio/files: cfitsio-3.060-autotools.patch
Date: Thu, 24 Jan 2008 15:19:02
Message-Id: E1JI3r1-0004Op-Es@stork.gentoo.org
1 bicatali 08/01/24 15:18:59
2
3 Modified: cfitsio-3.060-autotools.patch
4 Log:
5 Moved smem binary to examples in doc directory (fixing bug #207023). Now supports library versioning
6 (Portage version: 2.1.4)
7
8 Revision Changes Path
9 1.2 sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch?r1=1.1&r2=1.2
14
15 Index: cfitsio-3.060-autotools.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- cfitsio-3.060-autotools.patch 10 Sep 2007 20:27:58 -0000 1.1
22 +++ cfitsio-3.060-autotools.patch 24 Jan 2008 15:18:58 -0000 1.2
23 @@ -1,5 +1,52 @@
24 +--- Makefile.am 1970-01-01 01:00:00.000000000 +0100
25 ++++ Makefile.am 2008-01-24 14:48:14.000000000 +0000
26 +@@ -0,0 +1,44 @@
27 ++lib_LTLIBRARIES = libcfitsio.la
28 ++
29 ++C_SOURCES = \
30 ++ buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
31 ++ drvrnet.c drvrsmem.c drvrgsiftp.c editcol.c edithdu.c eval_l.c \
32 ++ eval_y.c eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \
33 ++ getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \
34 ++ getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \
35 ++ histo.c iraffits.c \
36 ++ modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \
37 ++ putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
38 ++ putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
39 ++ swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
40 ++ pliocomp.c fits_hcompress.c fits_hdecompress.c
41 ++
42 ++F77_SOURCES=
43 ++if ENABLE_FORTRAN
44 ++F77_SOURCES += f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c f77_wrap.h
45 ++endif
46 ++
47 ++include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h
48 ++libcfitsio_la_SOURCES = $(C_SOURCES) $(F77_SOURCES) $(include_HEADERS)
49 ++libcfitsio_la_LDFLAGS = -no-undefined -version-info 3:0:0
50 ++
51 ++pkgconfigdir = $(libdir)/pkgconfig
52 ++pkgconfig_DATA = cfitsio.pc
53 ++
54 ++LDADD = libcfitsio.la
55 ++noinst_PROGRAMS = testprog speed cookbook smem
56 ++bin_PROGRAMS = fitscopy imcopy listhead
57 ++
58 ++testprog_SOURCES = testprog.c
59 ++speed_SOURCES = speed.c
60 ++cookbook_SOURCES = cookbook.c
61 ++smem_SOURCES = smem.c
62 ++
63 ++fitscopy_SOURCES = fitscopy.c
64 ++listhead_SOURCES = listhead.c
65 ++imcopy_SOURCES = imcopy.c
66 ++
67 ++if ENABLE_FORTRAN
68 ++noinst_PROGRAMS += testf77
69 ++testf77_SOURCES = testf77.f
70 ++endif
71 --- configure.ac 1970-01-01 01:00:00.000000000 +0100
72 -+++ configure.ac 2007-09-10 19:04:36.382298581 +0100
73 ++++ configure.ac 2008-01-24 14:46:39.000000000 +0000
74 @@ -0,0 +1,230 @@
75 +AC_PREREQ(2.59)
76 +AC_INIT(cfitsio, 3.060, pence@×××××××××××××××.gov)
77 @@ -7,7 +54,7 @@
78 +AM_INIT_AUTOMAKE([foreign])
79 +
80 +AC_PROG_LIBTOOL
81 -+
82 ++SHARED_VERSION_INFO="3:0:0"
83 +AC_MSG_CHECKING([whether to enable fortran api])
84 +AC_ARG_ENABLE([fortran],
85 + AS_HELP_STRING([--enable-fortran], [Build the fortran API]),
86 @@ -231,54 +278,8 @@
87 +AC_CHECK_LIB(m, cos)
88 +AC_CONFIG_FILES([Makefile cfitsio.pc])
89 +AC_OUTPUT
90 ---- Makefile.am 1970-01-01 01:00:00.000000000 +0100
91 -+++ Makefile.am 2007-09-10 16:02:13.520646341 +0100
92 -@@ -0,0 +1,43 @@
93 -+lib_LTLIBRARIES = libcfitsio.la
94 -+
95 -+C_SOURCES = \
96 -+ buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
97 -+ drvrnet.c drvrsmem.c drvrgsiftp.c editcol.c edithdu.c eval_l.c \
98 -+ eval_y.c eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \
99 -+ getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \
100 -+ getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \
101 -+ histo.c iraffits.c \
102 -+ modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \
103 -+ putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
104 -+ putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
105 -+ swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
106 -+ pliocomp.c fits_hcompress.c fits_hdecompress.c
107 -+
108 -+F77_SOURCES=
109 -+if ENABLE_FORTRAN
110 -+F77_SOURCES += f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c f77_wrap.h
111 -+endif
112 -+
113 -+include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h
114 -+libcfitsio_la_SOURCES = $(C_SOURCES) $(F77_SOURCES) $(include_HEADERS)
115 -+
116 -+pkgconfigdir = $(libdir)/pkgconfig
117 -+pkgconfig_DATA = cfitsio.pc
118 -+
119 -+LDADD = libcfitsio.la
120 -+noinst_PROGRAMS = testprog speed cookbook
121 -+bin_PROGRAMS = fitscopy imcopy listhead smem
122 -+
123 -+testprog_SOURCES = testprog.c
124 -+speed_SOURCES = speed.c
125 -+cookbook_SOURCES = cookbook.c
126 -+
127 -+fitscopy_SOURCES = fitscopy.c
128 -+listhead_SOURCES = listhead.c
129 -+imcopy_SOURCES = imcopy.c
130 -+smem_SOURCES = smem.c
131 -+
132 -+if ENABLE_FORTRAN
133 -+noinst_PROGRAMS += testf77
134 -+testf77_SOURCES = testf77.f
135 -+endif
136 ---- cfitsio.pc.in.orig 2007-09-05 12:35:29.153211202 +0100
137 -+++ cfitsio.pc.in 2007-09-05 12:30:31.664258273 +0100
138 +--- cfitsio.pc.in.orig 2006-07-24 15:35:56.000000000 +0100
139 ++++ cfitsio.pc.in 2008-01-24 14:23:31.000000000 +0000
140 @@ -1,10 +1,10 @@
141 prefix=@prefix@
142 exec_prefix=@exec_prefix@
143
144
145
146 --
147 gentoo-commits@l.g.o mailing list