summaryrefslogtreecommitdiff
path: root/graphics/imlib
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 /graphics/imlib
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 '')
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib/files/patch-aa21
-rw-r--r--graphics/imlib/files/patch-ab4
-rw-r--r--graphics/imlib2-tmp/Makefile4
-rw-r--r--graphics/imlib2-tmp/files/patch-aa21
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/imlib2/files/patch-aa21
7 files changed, 8 insertions, 71 deletions
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 @@