diff options
| author | recht <recht> | 2005-03-24 17:46:29 +0000 |
|---|---|---|
| committer | recht <recht> | 2005-03-24 17:46:29 +0000 |
| commit | 51ca35eaedfd5f671c376bf4dc27b1dcaee86070 (patch) | |
| tree | d2367d4f8b6edfd59c3a31ef93cf9f30c846f22c /graphics/tiff | |
| parent | a1cc7c413693678373ea86a90f2540a3787b9396 (diff) | |
| download | pkgsrc-51ca35eaedfd5f671c376bf4dc27b1dcaee86070.tar.gz | |
Pull in libtiff/Makefile.in rev. 1.54 and 1.55 without the rpath changes
from libtiff CVS to fix the build on Darwin.
Diffstat (limited to 'graphics/tiff')
| -rw-r--r-- | graphics/tiff/distinfo | 3 | ||||
| -rw-r--r-- | graphics/tiff/patches/patch-ab | 58 |
2 files changed, 60 insertions, 1 deletions
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index f76ff37b0fd..1cc9d0a3de2 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.26 2005/03/23 01:17:45 wiz Exp $ +$NetBSD: distinfo,v 1.27 2005/03/24 17:46:29 recht Exp $ SHA1 (tiff-3.7.2.tar.gz) = 0eb69e88bf6c430160ad2897cd0ae637d507ed66 RMD160 (tiff-3.7.2.tar.gz) = fb156e17f55b1d565adbc5247f01d836d5f25824 Size (tiff-3.7.2.tar.gz) = 1260598 bytes SHA1 (patch-aa) = 06ecb34e5eeae5650020b456dddd40c8b9fe9647 +SHA1 (patch-ab) = 0363e36d8c7575b4a55fee587aa4d92ee6c6db0b diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab new file mode 100644 index 00000000000..ff876457163 --- /dev/null +++ b/graphics/tiff/patches/patch-ab @@ -0,0 +1,58 @@ +$NetBSD: patch-ab,v 1.16 2005/03/24 17:46:29 recht Exp $ + +--- libtiff/Makefile.in.orig Wed Mar 9 10:49:43 2005 ++++ libtiff/Makefile.in Thu Mar 24 01:25:26 2005 +@@ -103,7 +103,8 @@ + tif_warning.lo tif_write.lo tif_zip.lo + am_libtiff_la_OBJECTS = $(am__objects_1) + libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS) +-libtiffxx_la_LIBADD = ++am__DEPENDENCIES_1 = $(top_builddir)/libtiff/libtiff.la ++libtiffxx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + am__objects_2 = tif_stream.lo + am_libtiffxx_la_OBJECTS = $(am__objects_2) + libtiffxx_la_OBJECTS = $(am_libtiffxx_la_OBJECTS) +@@ -111,8 +112,8 @@ + PROGRAMS = $(noinst_PROGRAMS) + am_mkg3states_OBJECTS = mkg3states.$(OBJEXT) + mkg3states_OBJECTS = $(am_mkg3states_OBJECTS) +-am__DEPENDENCIES_1 = +-mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1) ++am__DEPENDENCIES_2 = $(top_builddir)/port/libport.la ++mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_2) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I. + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -271,7 +272,8 @@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-LIBPORT = -L$(top_builddir)/port -lport ++LIBPORT = $(top_builddir)/port/libport.la ++LIBTIFF = $(top_builddir)/libtiff/libtiff.la + EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc libtiff.def \ + $(EXTRA_SRCS) + +@@ -338,15 +340,14 @@ + noinst_HEADERS = $(EXTRA_HDRS) + lib_LTLIBRARIES = libtiff.la $(am__append_2) + libtiff_la_SOURCES = $(SRCS) +-libtiff_la_LDFLAGS = \ +- -no-undefined \ +- -version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) +- ++libtiff_la_LDFLAGS = -no-undefined -version-number \ ++ $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) \ ++ $(am__append_3) + libtiffxx_la_SOURCES = $(SRCSXX) +-libtiffxx_la_LDFLAGS = \ +- -no-undefined \ +- -version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) +- ++libtiffxx_la_LDFLAGS = -no-undefined -version-number \ ++ $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) \ ++ $(am__append_4) ++libtiffxx_la_LIBADD = $(LIBTIFF) + mkg3states_SOURCES = mkg3states.c tif_fax3.h + mkg3states_LDADD = $(LIBPORT) + all: tif_config.h tiffconf.h |