On Sun, Mar 24, 2013 at 05:45:21PM +0100, Christian Weisgerber wrote: Also including a fixed pkg-config file for static linking.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/graphics/tiff/Makefile,v retrieving revision 1.69 diff -u -p -r1.69 Makefile --- Makefile 21 Mar 2013 08:45:19 -0000 1.69 +++ Makefile 25 Mar 2013 00:41:15 -0000 @@ -5,7 +5,7 @@ COMMENT= tools and library routines for DISTNAME= tiff-4.0.3 SHARED_LIBS= tiff 39.2 # 7.0 SHARED_LIBS+= tiffxx 40.1 # 7.0 -REVISION= 0 +REVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/libtiff/ @@ -18,7 +18,8 @@ WANTLIB= c m stdc++ z jpeg # BSD PERMIT_PACKAGE_CDROM= Yes -CONFIGURE_STYLE=gnu +CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION= 2.69 CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --disable-jbig \ --disable-lzma \ Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_ac 25 Mar 2013 03:49:05 -0000 @@ -0,0 +1,29 @@ +$OpenBSD$ +--- configure.ac.orig Sat Sep 22 12:05:24 2012 ++++ configure.ac Sun Mar 24 23:48:40 2013 +@@ -154,17 +154,21 @@ LT_LANG([C++]) + # Enable support for silent build rules + AM_SILENT_RULES + ++tiff_libs_private= ++AC_SUBST(tiff_libs_private) ++ + dnl We don't need to add math library to all targets + case "${host_os}" in + cygwin* | mingw32* | beos* | darwin*) + ;; + *) +- AC_CHECK_LIB(m,sin,,,) ++ AC_CHECK_LIB(m,sin,[libm_lib=yes], [libm_lib=no],) ++ if test "x$libm_lib" = "xyes" ; then ++ LIBS="-lm $LIBS" ++ tiff_libs_private="-lm ${tiff_libs_private}" ++ fi + ;; + esac +- +-tiff_libs_private= +-AC_SUBST(tiff_libs_private) + + dnl Checks for header files. + AC_CHECK_HEADERS([assert.h fcntl.h io.h limits.h malloc.h search.h sys/time.h unistd.h]) Index: patches/patch-libtiff_Makefile_in =================================================================== RCS file: /home/cvs/ports/graphics/tiff/patches/patch-libtiff_Makefile_in,v retrieving revision 1.13 diff -u -p -r1.13 patch-libtiff_Makefile_in --- patches/patch-libtiff_Makefile_in 24 Sep 2012 19:51:04 -0000 1.13 +++ patches/patch-libtiff_Makefile_in 25 Mar 2013 00:34:11 -0000 @@ -1,7 +1,6 @@ $OpenBSD: patch-libtiff_Makefile_in,v 1.13 2012/09/24 19:51:04 naddy Exp $ * Avoid picking up an old libtiff in ${LOCALBASE}. -* Do not record inter-library dependencies. --- libtiff/Makefile.in.orig Sat Sep 22 18:08:19 2012 +++ libtiff/Makefile.in Mon Sep 24 21:30:29 2012 @@ -14,7 +13,7 @@ $OpenBSD: patch-libtiff_Makefile_in,v 1. LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -+LIBS = ++LIBS = @LDFLAGS@ @LIBS@ LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@ LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@ LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@ -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
