1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00

Upgrade imlib to 1.6.

PR:		ports/6893
Submitted by:	Brett Taylor <brett@peloton.physics.montana.edu>
This commit is contained in:
Vanilla I. Shu 1998-06-23 06:43:20 +00:00
parent 4cec5593ec
commit 77550d8d18
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=11487
13 changed files with 151 additions and 109 deletions

View File

@ -1,12 +1,12 @@
# New ports collection makefile for: imlib
# Version required: 1.3
# Version required: 1.6
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.20 1998/05/04 20:22:44 jseger Exp $
# $Id: Makefile,v 1.21 1998/05/20 01:56:53 chuckr Exp $
#
DISTNAME= imlib-1.3
DISTNAME= imlib-1.6
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
ftp://ftp.labs.redhat.com/pub/imlib/TAR/
@ -17,14 +17,14 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
gtk\\.1\\.:${PORTSDIR}/x11/gtk
gtk\\.1\\.4:${PORTSDIR}/x11/gtk
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LIBS=-L${LOCALBASE}/lib \
INSTALL="/usr/bin/install -c"
INSTALL="$${INSTALL} -c"
WRKSRC= ${WRKDIR}/imlib
post-install:

View File

@ -1 +1 @@
MD5 (imlib-1.3.tar.gz) = 6b672e10e70c0a8b0a51de823c6f6859
MD5 (imlib-1.6.tar.gz) = 5c80d6ee9a769c0a9e5fcd7921c3fd85

View File

@ -1,30 +1,44 @@
--- configure.orig Wed Apr 22 07:47:30 1998
+++ configure Thu Apr 30 05:05:50 1998
@@ -3215,14 +3215,14 @@
GX_LIBS="$GTK_LIBS"
--- configure.orig Tue Jun 23 14:08:14 1998
+++ configure Tue Jun 23 14:10:55 1998
@@ -3762,16 +3762,16 @@
fi
-echo $ac_n "checking for main in -ltiff""... $ac_c" 1>&6
-echo "configure:3220: checking for main in -ltiff" >&5
-ac_lib_var=`echo tiff'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -ltiff34""... $ac_c" 1>&6
+echo "configure:3220: checking for main in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
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:3768: 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:3768: 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
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff34 $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3228 "configure"
cat > conftest.$ac_ext <<EOF
#line 3773 "configure"
#include "confdefs.h"
@@ -3252,7 +3252,7 @@
#define $ac_tr_lib 1
-#include <tiffio.h>
+#include <tiff34/tiffio.h>
EOF
- LIBS="-ltiff $LIBS"
+ LIBS="-ltiff34 $LIBS"
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -3844,16 +3844,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:3850: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
+echo "configure:3850: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
cat > conftest.$ac_ext <<EOF
#line 3855 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

View File

@ -1,27 +1,27 @@
--- gdk_imlib/Makefile.in.orig Wed Apr 22 07:47:28 1998
+++ gdk_imlib/Makefile.in Thu Apr 30 05:14:53 1998
@@ -111,7 +111,7 @@
--- gdk_imlib/Makefile.in.orig Wed Jun 10 03:52:33 1998
+++ gdk_imlib/Makefile.in Tue Jun 23 14:06:05 1998
@@ -113,7 +113,7 @@
utils.c \
save.c
save.c
-libgdk_imlib_la_LDFLAGS = -version-info 4:0:3
+libgdk_imlib_la_LDFLAGS = -version-info 1:3:0
-libgdk_imlib_la_LDFLAGS = -version-info 7:0:6
+libgdk_imlib_la_LDFLAGS = -version-info 1:6:0
libgdk_imlib_la_LDDADD = $(LIBS)
DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \
--- Imlib/Makefile.in.orig Wed Apr 22 07:47:28 1998
+++ Imlib/Makefile.in Thu Apr 30 05:15:06 1998
@@ -109,7 +109,7 @@
--- Imlib/Makefile.in.orig Wed Jun 10 03:52:33 1998
+++ Imlib/Makefile.in Tue Jun 23 14:05:43 1998
@@ -111,7 +111,7 @@
utils.c \
save.c
-libImlib_la_LDFLAGS = -version-info 4:0:3
+libImlib_la_LDFLAGS = -version-info 1:3:0
-libImlib_la_LDFLAGS = -version-info 7:0:6
+libImlib_la_LDFLAGS = -version-info 1:6:0
libImlib_la_LDDADD = $(LIBS)
DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \
--- config/Makefile.in.orig Thu Apr 30 05:14:05 1998
+++ config/Makefile.in Thu Apr 30 05:14:35 1998
--- config/Makefile.in.orig Wed Jun 10 03:52:34 1998
+++ config/Makefile.in Tue Jun 23 14:04:38 1998
@@ -23,7 +23,7 @@
sbindir = @sbindir@
libexecdir = @libexecdir@

View File

@ -10,9 +10,9 @@ include/gdk_imlib_types.h
lib/libImlib.a
lib/libImlib.la
lib/libImlib.so
lib/libImlib.so.1.3
lib/libImlib.so.1.6
lib/libgdk_imlib.a
lib/libgdk_imlib.la
lib/libgdk_imlib.so
lib/libgdk_imlib.so.1.3
lib/libgdk_imlib.so.1.6
@dirrm etc/imlib

View File

@ -1,12 +1,12 @@
# New ports collection makefile for: imlib
# Version required: 1.3
# Version required: 1.6
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.20 1998/05/04 20:22:44 jseger Exp $
# $Id: Makefile,v 1.21 1998/05/20 01:56:53 chuckr Exp $
#
DISTNAME= imlib-1.3
DISTNAME= imlib-1.6
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
ftp://ftp.labs.redhat.com/pub/imlib/TAR/
@ -17,14 +17,14 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
gtk\\.1\\.:${PORTSDIR}/x11/gtk
gtk\\.1\\.4:${PORTSDIR}/x11/gtk
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LIBS=-L${LOCALBASE}/lib \
INSTALL="/usr/bin/install -c"
INSTALL="$${INSTALL} -c"
WRKSRC= ${WRKDIR}/imlib
post-install:

View File

@ -1 +1 @@
MD5 (imlib-1.3.tar.gz) = 6b672e10e70c0a8b0a51de823c6f6859
MD5 (imlib-1.6.tar.gz) = 5c80d6ee9a769c0a9e5fcd7921c3fd85

View File

@ -1,30 +1,44 @@
--- configure.orig Wed Apr 22 07:47:30 1998
+++ configure Thu Apr 30 05:05:50 1998
@@ -3215,14 +3215,14 @@
GX_LIBS="$GTK_LIBS"
--- configure.orig Tue Jun 23 14:08:14 1998
+++ configure Tue Jun 23 14:10:55 1998
@@ -3762,16 +3762,16 @@
fi
-echo $ac_n "checking for main in -ltiff""... $ac_c" 1>&6
-echo "configure:3220: checking for main in -ltiff" >&5
-ac_lib_var=`echo tiff'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -ltiff34""... $ac_c" 1>&6
+echo "configure:3220: checking for main in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
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:3768: 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:3768: 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
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff34 $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3228 "configure"
cat > conftest.$ac_ext <<EOF
#line 3773 "configure"
#include "confdefs.h"
@@ -3252,7 +3252,7 @@
#define $ac_tr_lib 1
-#include <tiffio.h>
+#include <tiff34/tiffio.h>
EOF
- LIBS="-ltiff $LIBS"
+ LIBS="-ltiff34 $LIBS"
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -3844,16 +3844,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:3850: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
+echo "configure:3850: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
cat > conftest.$ac_ext <<EOF
#line 3855 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

View File

@ -10,9 +10,9 @@ include/gdk_imlib_types.h
lib/libImlib.a
lib/libImlib.la
lib/libImlib.so
lib/libImlib.so.1.3
lib/libImlib.so.1.6
lib/libgdk_imlib.a
lib/libgdk_imlib.la
lib/libgdk_imlib.so
lib/libgdk_imlib.so.1.3
lib/libgdk_imlib.so.1.6
@dirrm etc/imlib

View File

@ -1,12 +1,12 @@
# New ports collection makefile for: imlib
# Version required: 1.3
# Version required: 1.6
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.20 1998/05/04 20:22:44 jseger Exp $
# $Id: Makefile,v 1.21 1998/05/20 01:56:53 chuckr Exp $
#
DISTNAME= imlib-1.3
DISTNAME= imlib-1.6
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
ftp://ftp.labs.redhat.com/pub/imlib/TAR/
@ -17,14 +17,14 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
gtk\\.1\\.:${PORTSDIR}/x11/gtk
gtk\\.1\\.4:${PORTSDIR}/x11/gtk
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LIBS=-L${LOCALBASE}/lib \
INSTALL="/usr/bin/install -c"
INSTALL="$${INSTALL} -c"
WRKSRC= ${WRKDIR}/imlib
post-install:

View File

@ -1 +1 @@
MD5 (imlib-1.3.tar.gz) = 6b672e10e70c0a8b0a51de823c6f6859
MD5 (imlib-1.6.tar.gz) = 5c80d6ee9a769c0a9e5fcd7921c3fd85

View File

@ -1,30 +1,44 @@
--- configure.orig Wed Apr 22 07:47:30 1998
+++ configure Thu Apr 30 05:05:50 1998
@@ -3215,14 +3215,14 @@
GX_LIBS="$GTK_LIBS"
--- configure.orig Tue Jun 23 14:08:14 1998
+++ configure Tue Jun 23 14:10:55 1998
@@ -3762,16 +3762,16 @@
fi
-echo $ac_n "checking for main in -ltiff""... $ac_c" 1>&6
-echo "configure:3220: checking for main in -ltiff" >&5
-ac_lib_var=`echo tiff'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -ltiff34""... $ac_c" 1>&6
+echo "configure:3220: checking for main in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
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:3768: 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:3768: 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
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff34 $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3228 "configure"
cat > conftest.$ac_ext <<EOF
#line 3773 "configure"
#include "confdefs.h"
@@ -3252,7 +3252,7 @@
#define $ac_tr_lib 1
-#include <tiffio.h>
+#include <tiff34/tiffio.h>
EOF
- LIBS="-ltiff $LIBS"
+ LIBS="-ltiff34 $LIBS"
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -3844,16 +3844,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:3850: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
+echo "configure:3850: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
cat > conftest.$ac_ext <<EOF
#line 3855 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

View File

@ -10,9 +10,9 @@ include/gdk_imlib_types.h
lib/libImlib.a
lib/libImlib.la
lib/libImlib.so
lib/libImlib.so.1.3
lib/libImlib.so.1.6
lib/libgdk_imlib.a
lib/libgdk_imlib.la
lib/libgdk_imlib.so
lib/libgdk_imlib.so.1.3
lib/libgdk_imlib.so.1.6
@dirrm etc/imlib