3 files changed, 6 insertions, 90 deletions

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 \