summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJustin M. Seger <jseger@FreeBSD.org>1998-11-25 05:06:28 +0000
committerJustin M. Seger <jseger@FreeBSD.org>1998-11-25 05:06:28 +0000
commitd57d33c65548773bf1859e72b5505ce398a739ca (patch)
treea656e451c71e7e7c0b7004a09a731c2b990891a0 /x11
parentUpgrade to v2.3.3. (diff)
libtiff34->libtiff and include/tiff34/*.h -> include/*.h
Approved by: asami
Notes
Notes: svn path=/head/; revision=14889
Diffstat (limited to 'x11')
-rw-r--r--x11/dgs/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gnome-libs/files/patch-aa21
-rw-r--r--x11/gnomelibs/Makefile4
-rw-r--r--x11/gnomelibs/files/patch-aa21
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/libgnome/files/patch-aa21
-rw-r--r--x11/wdm/Makefile6
8 files changed, 11 insertions, 74 deletions
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 \