Date: Mon, 8 Jun 1998 13:05:15 -0600 (MDT) From: brett@peloton.physics.montana.edu To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/6893: UPDATE - imlib port updated to version 1.4 Message-ID: <199806081905.NAA12638@peloton.physics.montana.edu>
next in thread | raw e-mail | index | archive | help
>Number: 6893 >Category: ports >Synopsis: update imlib port to version 1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 8 12:10:01 PDT 1998 >Last-Modified: >Originator: Brett Taylor >Organization: Montana State University, Bozeman >Release: FreeBSD 2.2.6-STABLE i386 >Environment: FreeBSD 2.2.6-STABLE #0: Thu Apr 2 14:31:47 MST 1998 >Description: updated imlib port to version 1.4 - fixed PLIST (to match shared lib versions) - broke up old patch-ac to 3 separate patches (old patch-ac patched 3 files) - removed WRKSRC definition in Makefile (no longer needed) >How-To-Repeat: apply diff below >Fix: diff -ruN imlib/Makefile imlib/Makefile --- imlib/Makefile Tue May 19 19:56:53 1998 +++ imlib/Makefile Mon Jun 8 12:01:19 1998 @@ -6,7 +6,7 @@ # $Id: Makefile,v 1.21 1998/05/20 01:56:53 chuckr Exp $ # -DISTNAME= imlib-1.3 +DISTNAME= imlib-1.4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.enlightenment.org/pub/imlib/TAR/ \ ftp://ftp.labs.redhat.com/pub/imlib/TAR/ @@ -17,7 +17,7 @@ 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 @@ -25,7 +25,6 @@ CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ LIBS=-L${LOCALBASE}/lib \ INSTALL="/usr/bin/install -c" -WRKSRC= ${WRKDIR}/imlib post-install: ${LDCONFIG} -m ${PREFIX}/lib diff -ruN imlib/files/md5 imlib/files/md5 --- imlib/files/md5 Thu Apr 30 13:13:21 1998 +++ imlib/files/md5 Mon Jun 8 11:39:11 1998 @@ -1 +1 @@ -MD5 (imlib-1.3.tar.gz) = 6b672e10e70c0a8b0a51de823c6f6859 +MD5 (imlib-1.4.tar.gz) = 8a363fdfb9983f398d5d3b4b2027ce90 diff -ruN imlib/patches/patch-aa imlib/patches/patch-aa --- imlib/patches/patch-aa Thu Apr 30 13:13:21 1998 +++ imlib/patches/patch-aa Mon Jun 8 11:51:00 1998 @@ -1,30 +1,50 @@ ---- 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" - 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 - 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" - #include "confdefs.h" -@@ -3252,7 +3252,7 @@ - #define $ac_tr_lib 1 - EOF - -- LIBS="-ltiff $LIBS" -+ LIBS="-ltiff34 $LIBS" - - else - echo "$ac_t""no" 1>&6 +*** configure.orig Fri Jun 5 21:56:24 1998 +--- configure Mon Jun 8 11:50:43 1998 +*************** +*** 3629,3642 **** + echo "$ac_t""no" 1>&6 + fi + +! echo $ac_n "checking for main in -ltiff""... $ac_c" 1>&6 +! echo "configure:3634: checking for main in -ltiff" >&5 +! ac_lib_var=`echo tiff'_'main | 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 $GX_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3642 "configure" + #include "confdefs.h" +--- 3629,3642 ---- + echo "$ac_t""no" 1>&6 + fi + +! 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 + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +! LIBS="-ltiff34 $GX_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3642 "configure" + #include "confdefs.h" +*************** +*** 3666,3672 **** + #define $ac_tr_lib 1 + EOF + +! LIBS="-ltiff $LIBS" + + else + echo "$ac_t""no" 1>&6 +--- 3666,3672 ---- + #define $ac_tr_lib 1 + EOF + +! LIBS="-ltiff34 $LIBS" + + else + echo "$ac_t""no" 1>&6 diff -ruN imlib/patches/patch-ab imlib/patches/patch-ab --- imlib/patches/patch-ab Thu Apr 30 13:13:22 1998 +++ imlib/patches/patch-ab Mon Jun 8 11:51:51 1998 @@ -1,30 +1,25 @@ ---- Imlib/Imlib_private.h.orig Thu Apr 30 04:23:24 1998 -+++ Imlib/Imlib_private.h Thu Apr 30 04:23:46 1998 -@@ -38,10 +38,10 @@ - #include <png.h> - #endif - #ifdef HAVE_LIBTIFF --#include <tiffio.h> -+#include <tiff34/tiffio.h> - #endif - #ifdef HAVE_LIBGIF --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - #endif - - #define BYTE_ORD_24_RGB 0 ---- gdk_imlib/gdk_imlib_private.h.orig Thu Apr 30 04:34:52 1998 -+++ gdk_imlib/gdk_imlib_private.h Thu Apr 30 04:35:11 1998 -@@ -46,10 +46,10 @@ - #include <png.h> - #endif - #ifdef HAVE_LIBTIFF --#include <tiffio.h> -+#include <tiff34/tiffio.h> - #endif - #ifdef HAVE_LIBGIF --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - #endif - - #define BYTE_ORD_24_RGB 0 +*** gdk_imlib/gdk_imlib_private.h.orig Fri Jun 5 12:57:13 1998 +--- gdk_imlib/gdk_imlib_private.h Mon Jun 8 11:51:11 1998 +*************** +*** 50,59 **** + #include <png.h> + #endif + #ifdef HAVE_LIBTIFF +! #include <tiffio.h> + #endif + #ifdef HAVE_LIBGIF +! #include <gif_lib.h> + #endif + + #define BYTE_ORD_24_RGB 0 +--- 50,59 ---- + #include <png.h> + #endif + #ifdef HAVE_LIBTIFF +! #include <tiff34/tiffio.h> + #endif + #ifdef HAVE_LIBGIF +! #include <giflib/gif_lib.h> + #endif + + #define BYTE_ORD_24_RGB 0 diff -ruN imlib/patches/patch-ac imlib/patches/patch-ac --- imlib/patches/patch-ac Thu Apr 30 13:13:22 1998 +++ imlib/patches/patch-ac Mon Jun 8 11:57:02 1998 @@ -1,33 +1,19 @@ ---- 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 @@ - utils.c \ - save.c - --libgdk_imlib_la_LDFLAGS = -version-info 4:0:3 -+libgdk_imlib_la_LDFLAGS = -version-info 1:3: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 @@ - utils.c \ - save.c - --libImlib_la_LDFLAGS = -version-info 4:0:3 -+libImlib_la_LDFLAGS = -version-info 1:3: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 -@@ -23,7 +23,7 @@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @sysconfdir@/imlib - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ +*** gdk_imlib/Makefile.in.orig Fri Jun 5 21:56:42 1998 +--- gdk_imlib/Makefile.in Mon Jun 8 11:55:41 1998 +*************** +*** 113,119 **** + utils.c \ + save.c + +! libgdk_imlib_la_LDFLAGS = -version-info 5:0:4 + libgdk_imlib_la_LDDADD = $(LIBS) + + DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \ +--- 113,119 ---- + utils.c \ + save.c + +! libgdk_imlib_la_LDFLAGS = -version-info 1:4:0 + libgdk_imlib_la_LDDADD = $(LIBS) + + DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \ diff -ruN imlib/patches/patch-ae imlib/patches/patch-ae --- imlib/patches/patch-ae Wed Dec 31 17:00:00 1969 +++ imlib/patches/patch-ae Mon Jun 8 11:57:21 1998 @@ -0,0 +1,19 @@ +*** Imlib/Makefile.in.orig Fri Jun 5 21:56:43 1998 +--- Imlib/Makefile.in Mon Jun 8 11:56:51 1998 +*************** +*** 111,117 **** + utils.c \ + save.c + +! libImlib_la_LDFLAGS = -version-info 5:0:4 + libImlib_la_LDDADD = $(LIBS) + + DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \ +--- 111,117 ---- + utils.c \ + save.c + +! libImlib_la_LDFLAGS = -version-info 1:4:0 + libImlib_la_LDDADD = $(LIBS) + + DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \ diff -ruN imlib/patches/patch-af imlib/patches/patch-af --- imlib/patches/patch-af Wed Dec 31 17:00:00 1969 +++ imlib/patches/patch-af Mon Jun 8 12:09:34 1998 @@ -0,0 +1,25 @@ +*** Imlib/Imlib_private.h.orig Mon Jun 8 12:08:53 1998 +--- Imlib/Imlib_private.h Mon Jun 8 12:09:16 1998 +*************** +*** 44,53 **** + #include <png.h> + #endif + #ifdef HAVE_LIBTIFF +! #include <tiffio.h> + #endif + #ifdef HAVE_LIBGIF +! #include <gif_lib.h> + #endif + + #define BYTE_ORD_24_RGB 0 +--- 44,53 ---- + #include <png.h> + #endif + #ifdef HAVE_LIBTIFF +! #include <tiff34/tiffio.h> + #endif + #ifdef HAVE_LIBGIF +! #include <giflib/gif_lib.h> + #endif + + #define BYTE_ORD_24_RGB 0 diff -ruN imlib/pkg/PLIST imlib/pkg/PLIST --- imlib/pkg/PLIST Thu Apr 30 13:13:22 1998 +++ imlib/pkg/PLIST Mon Jun 8 11:59:41 1998 @@ -10,9 +10,9 @@ lib/libImlib.a lib/libImlib.la lib/libImlib.so -lib/libImlib.so.1.3 +lib/libImlib.so.1.4 lib/libgdk_imlib.a lib/libgdk_imlib.la lib/libgdk_imlib.so -lib/libgdk_imlib.so.1.3 +lib/libgdk_imlib.so.1.4 @dirrm etc/imlib >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199806081905.NAA12638>