diff options
43 files changed, 100 insertions, 412 deletions
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 2dd9959e7390..8a9831a36c6a 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -3,7 +3,7 @@ # Date created: 19 Apr 1997 # Whom: Jun-ichiro itojun Itoh <itojun@itojun.org> # -# $Id: Makefile,v 1.17 1998/09/15 11:45:48 asami Exp $ +# $Id: Makefile,v 1.18 1998/09/19 05:46:00 steve Exp $ # DISTNAME= hylafax-v4.0pl2 @@ -21,14 +21,14 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ # no dependency on ghostscript because we don't know which # version the user prefers RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 -LIB_DEPENDS= tiff34.1:${PORTSDIR}/graphics/tiff34 \ +LIB_DEPENDS= tiff.1:${PORTSDIR}/graphics/tiff34 \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_GMAKE= yes CONFIGURE_ARGS= --with-INSTALL="" \ --with-MAKE=gmake --with-CC=/usr/bin/cc \ - --with-LIBTIFF="-L${PREFIX}/lib -ltiff34 -ljpeg" \ - --with-TIFFINC="${PREFIX}/include/tiff34" + --with-LIBTIFF="-L${PREFIX}/lib -ltiff -ljpeg" \ + --with-TIFFINC="${PREFIX}/include" HAS_CONFIGURE= yes MAN1= hylafax.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 sendfax.1 \ sendpage.1 sgi2fax.1 textfmt.1 diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 78cf827f6a81..9f9ff0117e21 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -3,7 +3,7 @@ # Date created: 15 November 1994 # Whom: torstenb # -# $Id: Makefile,v 1.56 1998/10/31 15:34:41 jseger Exp $ +# $Id: Makefile,v 1.57 1998/11/23 12:48:53 jseger Exp $ # DISTNAME= ImageMagick-4.1.4 @@ -21,7 +21,7 @@ MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ - tiff34.1:${PORTSDIR}/graphics/tiff34 \ + tiff.1:${PORTSDIR}/graphics/tiff34 \ png.2:${PORTSDIR}/graphics/png \ jbig.1:${PORTSDIR}/graphics/jbigkit \ ttf.2:${PORTSDIR}/print/freetype diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index 97e9e7c4105f..680f9918ea97 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -3,7 +3,7 @@ # Date created: Sun Sep 7 17:55:07 EDT 1997 # Whom: Randall Hopper <rhh@ct.picker.com> # -# $Id: Makefile,v 1.11 1998/09/17 00:32:41 asami Exp $ +# $Id: Makefile,v 1.12 1998/11/21 07:27:35 steve Exp $ # DISTNAME= fxtv-0.47 @@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= rhh@ct.picker.com -LIB_DEPENDS= tiff34.1:${PORTSDIR}/graphics/tiff34 \ +LIB_DEPENDS= tiff.1:${PORTSDIR}/graphics/tiff34 \ Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ Xpm.4:${PORTSDIR}/graphics/xpm diff --git a/graphics/fxtv/files/patch-aa b/graphics/fxtv/files/patch-aa index 2ece4b2e3999..dcb78760ac83 100644 --- a/graphics/fxtv/files/patch-aa +++ b/graphics/fxtv/files/patch-aa @@ -6,7 +6,7 @@ override LDFLAGS = $(LD_INC) -override LIBS = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lSM -lICE \ - -lXext -lX11 -+override LIBS = -ltiff34 -ljpeg -lXaw3d -lXmu -lXt -lXpm -lSM \ ++override LIBS = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm -lSM \ + -lICE -lXext -lX11 -lm ifeq ($(HAVE_XFREE86),YES) override LIBS += -lXxf86dga -lXxf86vm diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index 10eba4561bb8..790c67cd93ae 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.48 1998/09/30 14:52:20 vanilla Exp $ +# $Id: Makefile,v 1.49 1998/10/19 14:14:19 vanilla Exp $ # DISTNAME= gimp-1.0.2 @@ -21,7 +21,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gtk.1:${PORTSDIR}/x11-toolkits/gtk LIB_DEPENDS+= mpeg.1:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= xdelta.0:${PORTSDIR}/misc/xdelta USE_X_PREFIX= yes @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-xdelta=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${LOCALBASE}/include/tiff34" \ + -I${LOCALBASE}/include" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' MAN1= gimp.1 gimptool.1 diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 10eba4561bb8..790c67cd93ae 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.48 1998/09/30 14:52:20 vanilla Exp $ +# $Id: Makefile,v 1.49 1998/10/19 14:14:19 vanilla Exp $ # DISTNAME= gimp-1.0.2 @@ -21,7 +21,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gtk.1:${PORTSDIR}/x11-toolkits/gtk LIB_DEPENDS+= mpeg.1:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= xdelta.0:${PORTSDIR}/misc/xdelta USE_X_PREFIX= yes @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-xdelta=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${LOCALBASE}/include/tiff34" \ + -I${LOCALBASE}/include" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' MAN1= gimp.1 gimptool.1 diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index 10eba4561bb8..790c67cd93ae 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.48 1998/09/30 14:52:20 vanilla Exp $ +# $Id: Makefile,v 1.49 1998/10/19 14:14:19 vanilla Exp $ # DISTNAME= gimp-1.0.2 @@ -21,7 +21,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gtk.1:${PORTSDIR}/x11-toolkits/gtk LIB_DEPENDS+= mpeg.1:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= xdelta.0:${PORTSDIR}/misc/xdelta USE_X_PREFIX= yes @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-xdelta=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${LOCALBASE}/include/tiff34" \ + -I${LOCALBASE}/include" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' MAN1= gimp.1 gimptool.1 diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 10eba4561bb8..790c67cd93ae 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.48 1998/09/30 14:52:20 vanilla Exp $ +# $Id: Makefile,v 1.49 1998/10/19 14:14:19 vanilla Exp $ # DISTNAME= gimp-1.0.2 @@ -21,7 +21,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gtk.1:${PORTSDIR}/x11-toolkits/gtk LIB_DEPENDS+= mpeg.1:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= xdelta.0:${PORTSDIR}/misc/xdelta USE_X_PREFIX= yes @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-xdelta=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${LOCALBASE}/include/tiff34" \ + -I${LOCALBASE}/include" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' MAN1= gimp.1 gimptool.1 diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index 10eba4561bb8..790c67cd93ae 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.48 1998/09/30 14:52:20 vanilla Exp $ +# $Id: Makefile,v 1.49 1998/10/19 14:14:19 vanilla Exp $ # DISTNAME= gimp-1.0.2 @@ -21,7 +21,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gtk.1:${PORTSDIR}/x11-toolkits/gtk LIB_DEPENDS+= mpeg.1:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= xdelta.0:${PORTSDIR}/misc/xdelta USE_X_PREFIX= yes @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-xdelta=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${LOCALBASE}/include/tiff34" \ + -I${LOCALBASE}/include" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' MAN1= gimp.1 gimptool.1 diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 10eba4561bb8..790c67cd93ae 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.48 1998/09/30 14:52:20 vanilla Exp $ +# $Id: Makefile,v 1.49 1998/10/19 14:14:19 vanilla Exp $ # DISTNAME= gimp-1.0.2 @@ -21,7 +21,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gtk.1:${PORTSDIR}/x11-toolkits/gtk LIB_DEPENDS+= mpeg.1:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= xdelta.0:${PORTSDIR}/misc/xdelta USE_X_PREFIX= yes @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-xdelta=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${LOCALBASE}/include/tiff34" \ + -I${LOCALBASE}/include" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' MAN1= gimp.1 gimptool.1 diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 46e2a15d5976..405a9914cc85 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -3,7 +3,7 @@ # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.33 1998/09/23 17:07:43 vanilla Exp $ +# $Id: Makefile,v 1.34 1998/09/28 13:21:46 vanilla Exp $ # DISTNAME= imlib-1.8.1 @@ -16,7 +16,7 @@ MAINTAINER= vanilla@FreeBSD.ORG LIB_DEPENDS= png.2:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff34.1:${PORTSDIR}/graphics/tiff34 \ + tiff.1:${PORTSDIR}/graphics/tiff34 \ gif.3:${PORTSDIR}/graphics/giflib \ gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index f4eeb1fb5bfd..baa16c3006da 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -144,27 +144,6 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo "configure:1844: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. -@@ -3773,16 +3636,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 --echo "configure:3779: checking for tiffio.h" >&5 -+ ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6 -+echo "configure:3779: checking for tiff34/tiffio.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 3784 "configure" - #include "confdefs.h" --#include <tiffio.h> -+#include <tiff34/tiffio.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:3789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @@ -3821,16 +3684,16 @@ diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab index 3b96717ada1a..4f86d7df5071 100644 --- a/graphics/imlib/files/patch-ab +++ b/graphics/imlib/files/patch-ab @@ -5,7 +5,7 @@ #endif #ifdef HAVE_LIBTIFF -#include <tiffio.h> -+#include <tiff34/tiffio.h> ++#include <tiffio.h> #endif #ifdef HAVE_LIBGIF -#include <gif_lib.h> @@ -20,7 +20,7 @@ #endif #ifdef HAVE_LIBTIFF -#include <tiffio.h> -+#include <tiff34/tiffio.h> ++#include <tiffio.h> #endif #ifdef HAVE_LIBGIF -#include <gif_lib.h> diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index 46e2a15d5976..405a9914cc85 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -3,7 +3,7 @@ # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.33 1998/09/23 17:07:43 vanilla Exp $ +# $Id: Makefile,v 1.34 1998/09/28 13:21:46 vanilla Exp $ # DISTNAME= imlib-1.8.1 @@ -16,7 +16,7 @@ MAINTAINER= vanilla@FreeBSD.ORG LIB_DEPENDS= png.2:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff34.1:${PORTSDIR}/graphics/tiff34 \ + tiff.1:${PORTSDIR}/graphics/tiff34 \ gif.3:${PORTSDIR}/graphics/giflib \ gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa index f4eeb1fb5bfd..baa16c3006da 100644 --- a/graphics/imlib2-tmp/files/patch-aa +++ b/graphics/imlib2-tmp/files/patch-aa @@ -144,27 +144,6 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo "configure:1844: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. -@@ -3773,16 +3636,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 --echo "configure:3779: checking for tiffio.h" >&5 -+ ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6 -+echo "configure:3779: checking for tiff34/tiffio.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 3784 "configure" - #include "confdefs.h" --#include <tiffio.h> -+#include <tiff34/tiffio.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:3789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @@ -3821,16 +3684,16 @@ diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 46e2a15d5976..405a9914cc85 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -3,7 +3,7 @@ # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.33 1998/09/23 17:07:43 vanilla Exp $ +# $Id: Makefile,v 1.34 1998/09/28 13:21:46 vanilla Exp $ # DISTNAME= imlib-1.8.1 @@ -16,7 +16,7 @@ MAINTAINER= vanilla@FreeBSD.ORG LIB_DEPENDS= png.2:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff34.1:${PORTSDIR}/graphics/tiff34 \ + tiff.1:${PORTSDIR}/graphics/tiff34 \ gif.3:${PORTSDIR}/graphics/giflib \ gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa index f4eeb1fb5bfd..baa16c3006da 100644 --- a/graphics/imlib2/files/patch-aa +++ b/graphics/imlib2/files/patch-aa @@ -144,27 +144,6 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo "configure:1844: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. -@@ -3773,16 +3636,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 --echo "configure:3779: checking for tiffio.h" >&5 -+ ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6 -+echo "configure:3779: checking for tiff34/tiffio.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 3784 "configure" - #include "confdefs.h" --#include <tiffio.h> -+#include <tiff34/tiffio.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:3789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @@ -3821,16 +3684,16 @@ diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 60c76cc340d4..f9f8ede37585 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -3,7 +3,7 @@ # Date created: ? # Whom: jmz (original) # -# $Id: Makefile,v 1.11 1998/09/19 05:46:06 steve Exp $ +# $Id: Makefile,v 1.12 1998/10/03 21:34:07 steve Exp $ # DISTNAME= netpbm @@ -14,7 +14,7 @@ DISTFILES= netpbm-1mar1994.tar.gz MAINTAINER= ports@FreeBSD.ORG -LIB_DEPENDS= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS= tiff.1:${PORTSDIR}/graphics/tiff34 USE_IMAKE= yes MAN1= anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.1 \ diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 47dcff37309a..6a0e40d83d5d 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -5,7 +5,7 @@ # Mikhail Teterin <mi@aldan.ziplink.net> # Jun-ichiro itojun Itoh <itojun@itojun.org> # -# $Id: Makefile,v 1.9 1998/09/15 11:45:58 asami Exp $ +# $Id: Makefile,v 1.10 1998/09/18 22:04:16 smace Exp $ # DISTNAME= tiff-v3.4 @@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-ZIP --with-JPEG --with-DIR_BIN=${PREFIX}/bin \ --with-DIR_LIB=${PREFIX}/lib \ - --with-DIR_INC=${PREFIX}/include/tiff34 \ + --with-DIR_INC=${PREFIX}/include \ --with-CC="${CC}" --with-GCOPTS="${CFLAGS}" \ --with-DIRS_LIBINC=${PREFIX}/include \ --with-DIR_GZLIB=/usr/lib \ diff --git a/graphics/tiff/files/patch-aa b/graphics/tiff/files/patch-aa index c395d2f467a3..aa3fffb91973 100644 --- a/graphics/tiff/files/patch-aa +++ b/graphics/tiff/files/patch-aa @@ -1,5 +1,5 @@ ---- libtiff/Makefile.in.orig Mon Apr 29 17:16:21 1996 -+++ libtiff/Makefile.in Fri Sep 18 16:46:03 1998 +--- libtiff/Makefile.in.orig Mon Apr 29 18:16:21 1996 ++++ libtiff/Makefile.in Mon Nov 23 22:11:22 1998 @@ -62,7 +62,7 @@ # CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@ @@ -9,126 +9,21 @@ CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY} # SRCS = \ -@@ -133,7 +133,7 @@ - tif_write.o \ - tif_zip.o \ - ${NULL} --TARGETS = libtiff.a -+TARGETS = libtiff34.a - - all: ${TARGETS} - if [ @DSO@dso != nodso ]; then \ -@@ -142,9 +142,9 @@ - true; \ - fi - --libtiff.a: ${OBJS} -- ${AR} ${AROPTS} libtiff.a $? -- ${RANLIB} libtiff.a -+libtiff34.a: ${OBJS} -+ ${AR} ${AROPTS} libtiff34.a $? -+ ${RANLIB} libtiff34.a - - # - # NB: The configure script verifies that the configured -@@ -159,47 +159,56 @@ - - # default IRIX DSO building rule - IRIXdso: ${OBJS} -- ${CC} -o libtiff.@DSOSUF@ -shared -rdata_shared \ -+ ${CC} -o libtiff34.@DSOSUF@ -shared -rdata_shared \ - -check_registry ${SRCDIR}/../port/irix/so_locations \ - -quickstart_info \ - ${OBJS} @LIBJPEG@ @LIBGZ@ - touch $@ - # special rule for IRIX 5.2 - IRIX52dso: ${OBJS} -- ${LD} -elf -o libtiff.@DSOSUF@ -shared -no_unresolved -all ${OBJS} \ -+ ${LD} -elf -o libtiff34.@DSOSUF@ -shared -no_unresolved -all ${OBJS} \ - @LIBJPEG@ @LIBGZ@ -lc -lm - touch $@ - # Solaris 2.4 - SOLARISdso: ${OBJS} -- ${LD} -L@DIR_LIB@ -G -o libtiff.@DSOSUF@ ${OBJS} -+ ${LD} -L@DIR_LIB@ -G -o libtiff34.@DSOSUF@ ${OBJS} - touch $@ - # HP-UX A.09.03 - HPUXdso: ${OBJS} -- ${LD} +b@DIR_LIB@ -b -o libtiff.@DSOSUF@ ${OBJS} -+ ${LD} +b@DIR_LIB@ -b -o libtiff34.@DSOSUF@ ${OBJS} - touch $@ - # AIX 2.3.5 and 4.1.1 - AIXdso: ${OBJS} -- rm -f libtiff.syms shr.o -- echo "#!" > libtiff.syms -- /bin/dump -g libtiff.a | sed -n -e \ -+ rm -f libtiff34.syms shr.o -+ echo "#!" > libtiff34.syms -+ /bin/dump -g libtiff34.a | sed -n -e \ - 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' \ -- >> libtiff.syms -- ${LD} -o shr.o libtiff.a -H512 -T512 -bM\:SRE \ -- -bE\:libtiff.syms @LIBJPEG@ @LIBGZ@ -lc -lm -L@DIR_LIB@ -- rm -f libtiff.syms libtiff.@DSOSUF@ -- ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o -+ >> libtiff34.syms -+ ${LD} -o shr.o libtiff34.a -H512 -T512 -bM\:SRE \ -+ -bE\:libtiff34.syms @LIBJPEG@ @LIBGZ@ -lc -lm -L@DIR_LIB@ -+ rm -f libtiff34.syms libtiff34.@DSOSUF@ -+ ${AR} ${AROPTS} libtiff34.@DSOSUF@ shr.o - rm -f shr.o - touch $@ - # linux ELF shared lib rule - LINUXdso: ${OBJS} -- ${CC} -shared -Wl,-soname,libtiff.@DSOSUF@ \ -- -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ -- @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ -+ ${CC} -shared -Wl,-soname,libtiff34.@DSOSUF@ \ -+ -o libtiff34.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ -+ @LN@ @LN_S@ libtiff34.@DSOSUF_VERSION@ libtiff34.@DSOSUF@ - touch $@ +@@ -199,7 +199,16 @@ # OSF/1 3.2 shared lib rule OSFdso: ${OBJS} -- ${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm + ${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm - -+ ${LD} -o libtiff34.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm +FREEBSD_AOUTdso: ${OBJS} -+ ${LD} -Bshareable -x ${LIBDIR}/c++rt0.o -o libtiff34.@DSOSUF_VERSION@ \ ++ ${LD} -Bshareable -x ${LIBDIR}/c++rt0.o -o libtiff.@DSOSUF_VERSION@ \ + ${OBJS} @LIBJPEG@ @LIBGZ@ -+ @LN@ @LN_S@ libtiff34.@DSOSUF_VERSION@ libtiff34.@DSOSUF@ ++ @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ + touch $@ +FREEBSD_ELFdso: ${OBJS} -+ ${CC} -shared -Wl,-soname,libtiff34.@DSOSUF_VERSION@ -o libtiff34.@DSOSUF_VERSION@ \ ++ ${CC} -shared -Wl,-soname,libtiff.@DSOSUF_VERSION@ -o libtiff.@DSOSUF_VERSION@ \ + ${OBJS} @LIBJPEG@ @LIBGZ@ -+ @LN@ @LN_S@ libtiff34.@DSOSUF_VERSION@ libtiff34.@DSOSUF@ ++ @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ + touch $@ ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h -@@ -307,16 +316,16 @@ - installDSO: @DSO@dso - if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \ - ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ -- -O libtiff.@DSOSUF_VERSION@; \ -+ -O libtiff34.@DSOSUF_VERSION@; \ - ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \ -- -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ -+ -lns libtiff34.@DSOSUF_VERSION@ -O libtiff34.@DSOSUF@; \ - else \ - ${INSTALL} -idb tiff.sw.tools -m 444 -F @DIR_LIB@ \ -- -O libtiff.@DSOSUF@; \ -+ -O libtiff34.@DSOSUF@; \ - fi - install: all installHdrs - ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@ -- ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a -+ ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff34.a - if [ @DSO@dso != nodso ]; then \ - ${MAKE} installDSO; \ - else \ -@@ -327,4 +336,4 @@ - rm -f ${TARGETS} ${OBJS} core a.out \ - mkg3states tif_fax3sm.c \ - mkversion version.h \ -- libtiff.a libtiff.@DSOSUF@ libtiff.@DSOSUF_VERSION@ *dso -+ libtiff34.a libtiff34.@DSOSUF@ libtiff34.@DSOSUF_VERSION@ *dso diff --git a/graphics/tiff/files/patch-ac b/graphics/tiff/files/patch-ac index 6b2d32e5b5d9..0c9fb4a77e3f 100644 --- a/graphics/tiff/files/patch-ac +++ b/graphics/tiff/files/patch-ac @@ -11,11 +11,11 @@ +CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff # -LIBTIFF = ${DEPTH}/libtiff/libtiff.@DSOSUF@ -+LIBTIFF = ${DEPTH}/libtiff/libtiff34.@DSOSUF_VERSION@ ++LIBTIFF = ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@ LIBJPEG = @LIBJPEG@ LIBGZ = @LIBGZ@ -LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ -+LIBS = ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ -ltiff34 ++LIBS = ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ -ltiff # OBJS= \ fax2tiff.o \ diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist index 34c586b9f57f..3b46e7950703 100644 --- a/graphics/tiff/pkg-plist +++ b/graphics/tiff/pkg-plist @@ -1,6 +1,6 @@ -lib/libtiff34.a -lib/libtiff34.so.1 -lib/libtiff34.so +lib/libtiff.a +lib/libtiff.so.1 +lib/libtiff.so @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R bin/fax2tiff @@ -20,8 +20,8 @@ bin/tiffdump bin/tiffinfo bin/tiffmedian bin/tiffsplit -include/tiff34/tiff.h -include/tiff34/tiffio.h +include/tiff.h +include/tiffio.h share/doc/tiff/bugs.html share/doc/tiff/build.html share/doc/tiff/contrib.html @@ -61,4 +61,3 @@ share/doc/tiff/images/strike.gif share/doc/tiff/images/warning.gif @dirrm share/doc/tiff/images @dirrm share/doc/tiff -@dirrm include/tiff34 diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index f762bcc53cd2..6d262e011098 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -3,7 +3,7 @@ # Date created: Jan 5 1997 # Whom: cfs@ing.puc.cl (original) # -# $Id: Makefile,v 1.8 1998/10/05 03:19:33 steve Exp $ +# $Id: Makefile,v 1.9 1998/10/05 04:49:49 steve Exp $ # DISTNAME= urt @@ -14,7 +14,7 @@ DISTFILES= urt-3.1b.tar.Z urt-doc.tar urt-img.tar MAINTAINER= giffunip@asme.org -LIB_DEPENDS= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS= tiff.1:${PORTSDIR}/graphics/tiff34 BUILD_DEPENDS= ${X11BASE}/lib/libpbm.a:${PORTSDIR}/graphics/netpbm EXTRACT_ONLY= urt-3.1b.tar.Z diff --git a/graphics/urt/files/patch-aa b/graphics/urt/files/patch-aa index d54cac3ac94f..26b77e34155b 100644 --- a/graphics/urt/files/patch-aa +++ b/graphics/urt/files/patch-aa @@ -152,8 +152,8 @@ -INCTIFF = -I$(TIFFDIR) -LIBTIFF = $(TIFFDIR)/libtiff.a +##defpath TIFFDIR -+INCTIFF = -I${PREFIX}/include/tiff34 -+LIBTIFF = -L${PREFIX}/lib -ltiff34 ++INCTIFF = -I${PREFIX}/include ++LIBTIFF = -L${PREFIX}/lib -ltiff +.if ${PORTOBJFORMAT} == "elf" +LIBTIFF +=-Wl,-rpath,${PREFIX}/lib +.endif diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 0d2214820316..c2f934a25a0f 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -3,7 +3,7 @@ # Date created: 2 Jan 1995 # Whom: swallace # -# $Id: Makefile,v 1.28 1998/10/05 03:13:40 steve Exp $ +# $Id: Makefile,v 1.29 1998/11/21 07:27:37 steve Exp $ # DISTNAME= xpaint-2.5.4 @@ -13,7 +13,7 @@ MASTER_SITES= http://www.danbbs.dk/~torsten/xpaint/ MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff34.1:${PORTSDIR}/graphics/tiff34 \ + tiff.1:${PORTSDIR}/graphics/tiff34 \ Xpm.4:${PORTSDIR}/graphics/xpm \ png.2:${PORTSDIR}/graphics/png diff --git a/graphics/xpaint/files/patch-aa b/graphics/xpaint/files/patch-aa new file mode 100644 index 000000000000..e77a91d1e2eb --- /dev/null +++ b/graphics/xpaint/files/patch-aa @@ -0,0 +1,13 @@ +--- Local.config.orig Mon Nov 23 23:09:51 1998 ++++ Local.config Mon Nov 23 23:10:04 1998 +@@ -142,8 +142,8 @@ + + #if defined(FreeBSDArchitecture) + ARCH_DEFINES = -DHAVE_PARAM_H +-TIFF_INCLUDE = -I/usr/local/include/tiff34 +-TIFF_LIB = -L/usr/local/lib -ltiff34 ++TIFF_INCLUDE = -I/usr/local/include ++TIFF_LIB = -L/usr/local/lib -ltiff + JPEG_INCLUDE = -I/usr/local/include + JPEG_LIB = -L/usr/local/lib -ljpeg + XPM_INCLUDE = -I/usr/X11R6/include/X11 diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index ce717e2cbc2a..39653e0e6cd2 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -3,7 +3,7 @@ # Date created: 30 October 1994 # Whom: smace # -# $Id: Makefile,v 1.28 1998/10/25 15:24:40 kuriyama Exp $ +# $Id: Makefile,v 1.29 1998/11/21 07:27:37 steve Exp $ # DISTNAME= xv-3.10a @@ -25,7 +25,7 @@ PATCHFILES= xv-3.10a.JPEG-patch xv-3.10a.TIFF-patch MAINTAINER?= shige@kuis.kyoto-u.ac.jp LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff34.1:${PORTSDIR}/graphics/tiff34 \ + tiff.1:${PORTSDIR}/graphics/tiff34 \ png.2:${PORTSDIR}/graphics/png USE_IMAKE= yes diff --git a/graphics/xv/files/patch-ad b/graphics/xv/files/patch-ad index 72deb1629eb2..f76139c992ef 100644 --- a/graphics/xv/files/patch-ad +++ b/graphics/xv/files/patch-ad @@ -42,8 +42,8 @@ +#ifdef UseInstalledTiff +TIFF = -DDOTIFF -+LIBTIFF = -L/usr/local/lib -ltiff34 -+TIFFINCLUDE = -I/usr/local/include/tiff34 ++LIBTIFF = -L/usr/local/lib -ltiff ++TIFFINCLUDE = -I/usr/local/include +#endif + #ifdef HavePDS diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index 97e9e7c4105f..680f9918ea97 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -3,7 +3,7 @@ # Date created: Sun Sep 7 17:55:07 EDT 1997 # Whom: Randall Hopper <rhh@ct.picker.com> # -# $Id: Makefile,v 1.11 1998/09/17 00:32:41 asami Exp $ +# $Id: Makefile,v 1.12 1998/11/21 07:27:35 steve Exp $ # DISTNAME= fxtv-0.47 @@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= rhh@ct.picker.com -LIB_DEPENDS= tiff34.1:${PORTSDIR}/graphics/tiff34 \ +LIB_DEPENDS= tiff.1:${PORTSDIR}/graphics/tiff34 \ Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ Xpm.4:${PORTSDIR}/graphics/xpm diff --git a/multimedia/fxtv/files/patch-aa b/multimedia/fxtv/files/patch-aa index 2ece4b2e3999..dcb78760ac83 100644 --- a/multimedia/fxtv/files/patch-aa +++ b/multimedia/fxtv/files/patch-aa @@ -6,7 +6,7 @@ override LDFLAGS = $(LD_INC) -override LIBS = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lSM -lICE \ - -lXext -lX11 -+override LIBS = -ltiff34 -ljpeg -lXaw3d -lXmu -lXt -lXpm -lSM \ ++override LIBS = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm -lSM \ + -lICE -lXext -lX11 -lm ifeq ($(HAVE_XFREE86),YES) override LIBS += -lXxf86dga -lXxf86vm diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile index d969a5f1bd55..1f1ffe674f5d 100644 --- a/x11-toolkits/tkstep80/Makefile +++ b/x11-toolkits/tkstep80/Makefile @@ -3,7 +3,7 @@ # Date created: 06 November 1997 # Whom: Thomas Gellekum <tg@FreeBSD.ORG> # -# $Id: Makefile,v 1.15 1998/09/17 00:32:55 asami Exp $ +# $Id: Makefile,v 1.16 1998/09/19 05:46:07 steve Exp $ # DISTNAME= tk8.0p2 @@ -20,14 +20,14 @@ MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80 \ Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff34.1:${PORTSDIR}/graphics/tiff34 + tiff.1:${PORTSDIR}/graphics/tiff34 FETCH_BEFORE_ARGS= -b PATCH_DIST_ARGS= -p1 -d ${WRKDIR}/tk8.0 -E --quiet WRKSRC= ${WRKDIR}/tk8.0/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-xpm --enable-step --enable-dnd \ - --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include -I${PREFIX}/include/tiff34" + --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include" CONFIGURE_ENV= PORTSDIR=${PORTSDIR} post-install: diff --git a/x11-toolkits/tkstep80/files/patch-aa b/x11-toolkits/tkstep80/files/patch-aa index 04df1b4db329..0e6759cbd6e5 100644 --- a/x11-toolkits/tkstep80/files/patch-aa +++ b/x11-toolkits/tkstep80/files/patch-aa @@ -43,15 +43,6 @@ RANLIB=":" else TK_SHARED_BUILD=0 -@@ -2480,7 +2487,7 @@ - - if test "$ok" = "yes" ; then - ENABLE_TIFF="-DENABLE_TIFF" -- EXTRA_LIBS="$EXTRA_LIBS -ltiff -ljpeg -lz" -+ EXTRA_LIBS="$EXTRA_LIBS -ltiff34 -ljpeg -lz" - IMAGE_OBJ="$IMAGE_OBJ tkImgTIFF.o" - else - ENABLE_TIFF="" @@ -2736,6 +2743,7 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile index fa572f48fb24..4493ef030e96 100644 --- a/x11-wm/windowmaker-i18n/Makefile +++ b/x11-wm/windowmaker-i18n/Makefile @@ -3,7 +3,7 @@ # Date created: August 13, 1997 # Whom: handy@physics.montana.edu # -# $Id: Makefile,v 1.37 1998/11/14 09:43:33 asami Exp $ +# $Id: Makefile,v 1.38 1998/11/24 16:04:41 tg Exp $ DISTNAME= WindowMaker-0.20.2 PKGNAME= windowmaker-0.20.2 @@ -19,7 +19,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ gif.3:${PORTSDIR}/graphics/giflib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.2:${PORTSDIR}/graphics/png \ - tiff34.1:${PORTSDIR}/graphics/tiff34 + tiff.1:${PORTSDIR}/graphics/tiff34 USE_X_PREFIX= yes GNU_CONFIGURE= yes @@ -27,7 +27,7 @@ CONFIGURE_ENV= X11BASE=${X11BASE} CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --with-nlsdir=${LOCALBASE}/lib/locale \ --with-gfx-libs="-L${LOCALBASE}/lib" \ - --with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \ + --with-gfx-incs="-I${LOCALBASE}/include -I${LOCALBASE}/include" \ --disable-debug MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad index e712cf0a9732..917306ce2aea 100644 --- a/x11-wm/windowmaker-i18n/files/patch-ad +++ b/x11-wm/windowmaker-i18n/files/patch-ad @@ -9,87 +9,3 @@ cat > conftest.$ac_ext <<EOF #line 3684 "configure" #include "confdefs.h" -@@ -3778,14 +3778,14 @@ - - if test "$tif" = yes; then - my_libname="" -- echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 --echo "configure:3783: checking for TIFFGetVersion in -ltiff" >&5 --ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -+echo "configure:3783: checking for TIFFGetVersion in -ltiff34" >&5 -+ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" -+LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" - cat > conftest.$ac_ext <<EOF - #line 3791 "configure" - #include "confdefs.h" -@@ -3813,7 +3813,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- my_libok=yes my_libname="-ltiff" -+ my_libok=yes my_libname="-ltiff34" - else - echo "$ac_t""no" 1>&6 - my_libok=no -@@ -3821,14 +3821,14 @@ - - if test "$my_libok" = no; then - if test "$zlib" = "yes"; then -- echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 --echo "configure:3826: checking for TIFFGetVersion in -ltiff" >&5 --ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -+echo "configure:3826: checking for TIFFGetVersion in -ltiff34" >&5 -+ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lz -lm $LIBS" -+LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lz -lm $LIBS" - cat > conftest.$ac_ext <<EOF - #line 3834 "configure" - #include "confdefs.h" -@@ -3856,7 +3856,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- my_libok=yes my_libname="-ltiff -lz" -+ my_libok=yes my_libname="-ltiff34 -lz" - else - echo "$ac_t""no" 1>&6 - my_libok=no -@@ -3866,14 +3866,14 @@ - fi - - if test "$my_libok" = no; then -- echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 --echo "configure:3871: checking for TIFFGetVersion in -ltiff34" >&5 --ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -+echo "configure:3871: checking for TIFFGetVersion in -ltiff" >&5 -+ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" -+LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" - cat > conftest.$ac_ext <<EOF - #line 3879 "configure" - #include "confdefs.h" -@@ -3901,7 +3901,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- my_libok=yes my_libname="-ltiff34" -+ my_libok=yes my_libname="-ltiff" - else - echo "$ac_t""no" 1>&6 - my_libok=no diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index fa572f48fb24..4493ef030e96 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -3,7 +3,7 @@ # Date created: August 13, 1997 # Whom: handy@physics.montana.edu # -# $Id: Makefile,v 1.37 1998/11/14 09:43:33 asami Exp $ +# $Id: Makefile,v 1.38 1998/11/24 16:04:41 tg Exp $ DISTNAME= WindowMaker-0.20.2 PKGNAME= windowmaker-0.20.2 @@ -19,7 +19,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ gif.3:${PORTSDIR}/graphics/giflib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.2:${PORTSDIR}/graphics/png \ - tiff34.1:${PORTSDIR}/graphics/tiff34 + tiff.1:${PORTSDIR}/graphics/tiff34 USE_X_PREFIX= yes GNU_CONFIGURE= yes @@ -27,7 +27,7 @@ CONFIGURE_ENV= X11BASE=${X11BASE} CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --with-nlsdir=${LOCALBASE}/lib/locale \ --with-gfx-libs="-L${LOCALBASE}/lib" \ - --with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \ + --with-gfx-incs="-I${LOCALBASE}/include -I${LOCALBASE}/include" \ --disable-debug MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile index cb8fc75953f4..31001ea171ce 100644 --- a/x11/dgs/Makefile +++ b/x11/dgs/Makefile @@ -3,7 +3,7 @@ # Date created: 22 April 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1998/09/19 05:46:07 steve Exp $ +# $Id: Makefile,v 1.7 1998/10/05 05:20:08 steve Exp $ # DISTNAME= dgs-0.5.0 @@ -14,7 +14,7 @@ MAINTAINER= Nakai@technologist.com LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.2:${PORTSDIR}/graphics/png \ - tiff34.1:${PORTSDIR}/graphics/tiff34 + tiff.1:${PORTSDIR}/graphics/tiff34 WRKSRC= ${WRKDIR}/${DISTNAME}/dgs diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 2723ad6b76ac..dbbdadf2f5e2 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -3,7 +3,7 @@ # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.14 1998/11/02 17:23:51 vanilla Exp $ +# $Id: Makefile,v 1.15 1998/11/17 17:35:21 vanilla Exp $ # DISTNAME= gnome-libs-0.30.1 @@ -17,7 +17,7 @@ MAINTAINER= Nakai@technologist.com BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= gdk_imlib.1:${PORTSDIR}/graphics/imlib LIB_DEPENDS+= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gif.3:${PORTSDIR}/graphics/giflib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa index f4cbc5141344..a0dfe69c317a 100644 --- a/x11/gnome-libs/files/patch-aa +++ b/x11/gnome-libs/files/patch-aa @@ -1,26 +1,5 @@ --- configure.orig Wed Sep 23 23:37:33 1998 +++ configure Sat Sep 26 22:02:01 1998 -@@ -6129,16 +6129,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 --echo "configure:6135: checking for tiffio.h" >&5 -+ ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6 -+echo "configure:6135: checking for tiff34/tiffio.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 6140 "configure" - #include "confdefs.h" --#include <tiffio.h> -+#include <tiff34/tiffio.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @@ -6209,16 +6209,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 2723ad6b76ac..dbbdadf2f5e2 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -3,7 +3,7 @@ # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.14 1998/11/02 17:23:51 vanilla Exp $ +# $Id: Makefile,v 1.15 1998/11/17 17:35:21 vanilla Exp $ # DISTNAME= gnome-libs-0.30.1 @@ -17,7 +17,7 @@ MAINTAINER= Nakai@technologist.com BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= gdk_imlib.1:${PORTSDIR}/graphics/imlib LIB_DEPENDS+= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gif.3:${PORTSDIR}/graphics/giflib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa index f4cbc5141344..a0dfe69c317a 100644 --- a/x11/gnomelibs/files/patch-aa +++ b/x11/gnomelibs/files/patch-aa @@ -1,26 +1,5 @@ --- configure.orig Wed Sep 23 23:37:33 1998 +++ configure Sat Sep 26 22:02:01 1998 -@@ -6129,16 +6129,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 --echo "configure:6135: checking for tiffio.h" >&5 -+ ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6 -+echo "configure:6135: checking for tiff34/tiffio.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 6140 "configure" - #include "confdefs.h" --#include <tiffio.h> -+#include <tiff34/tiffio.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @@ -6209,16 +6209,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 2723ad6b76ac..dbbdadf2f5e2 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,7 +3,7 @@ # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.14 1998/11/02 17:23:51 vanilla Exp $ +# $Id: Makefile,v 1.15 1998/11/17 17:35:21 vanilla Exp $ # DISTNAME= gnome-libs-0.30.1 @@ -17,7 +17,7 @@ MAINTAINER= Nakai@technologist.com BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= gdk_imlib.1:${PORTSDIR}/graphics/imlib LIB_DEPENDS+= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 -LIB_DEPENDS+= tiff34.1:${PORTSDIR}/graphics/tiff34 +LIB_DEPENDS+= tiff.1:${PORTSDIR}/graphics/tiff34 LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= gif.3:${PORTSDIR}/graphics/giflib LIB_DEPENDS+= png.2:${PORTSDIR}/graphics/png diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa index f4cbc5141344..a0dfe69c317a 100644 --- a/x11/libgnome/files/patch-aa +++ b/x11/libgnome/files/patch-aa @@ -1,26 +1,5 @@ --- configure.orig Wed Sep 23 23:37:33 1998 +++ configure Sat Sep 26 22:02:01 1998 -@@ -6129,16 +6129,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 --echo "configure:6135: checking for tiffio.h" >&5 -+ ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6 -+echo "configure:6135: checking for tiff34/tiffio.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 6140 "configure" - #include "confdefs.h" --#include <tiffio.h> -+#include <tiff34/tiffio.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @@ -6209,16 +6209,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index a9f3bb672823..d1f5f79f5e0c 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -3,7 +3,7 @@ # Date created: August 31, 1998 # Whom: Thomas Gellekum <tg@FreeBSD.ORG> # -# $Id: Makefile,v 1.13 1998/10/01 07:39:33 tg Exp $ +# $Id: Makefile,v 1.14 1998/11/24 16:06:23 tg Exp $ DISTNAME= wdm-1.0 CATEGORIES= x11 @@ -19,7 +19,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ gif.3:${PORTSDIR}/graphics/giflib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.2:${PORTSDIR}/graphics/png \ - tiff34.1:${PORTSDIR}/graphics/tiff34 + tiff.1:${PORTSDIR}/graphics/tiff34 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= wdm @@ -28,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= X11BASE=${X11BASE} CPPFLAGS=-I${PREFIX}/include \ CFLAGS="${CFLAGS} -DHAS_SETUSERCONTEXT" CONFIGURE_ARGS= --with-gfx-libs="-L${PREFIX}/lib -L${LOCALBASE}/lib -lgif" \ - --with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \ + --with-gfx-incs="-I${LOCALBASE}/include" \ --with-tiff-libs="-ljpeg" \ --with-logdir=/var/log --with-runlockdir=/var/run \ --with-wdmdir=${PREFIX}/lib/X11/wdm --with-Logo=Earth200x130.xpm \ |