Date: Sat, 6 Mar 1999 14:55:22 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10424: Port update: graphics/imlib Message-ID: <199903061255.OAA17449@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10424
>Category: ports
>Synopsis: Port update: graphics/imlib
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 6 05:00:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports Collection.
>Description:
Update to imlib-1.9.4.
>How-To-Repeat:
Requires changed bsd.port.mk. Removes patch-ab (worked around),
and pkg/MESSAGE (not applicaple to package, only port).
>Fix:
diff -urN -x CVS /usr/ports.ref/graphics/imlib/Makefile /usr/ports/graphics/imlib/Makefile
--- /usr/ports.ref/graphics/imlib/Makefile Thu Feb 18 13:42:51 1999
+++ /usr/ports/graphics/imlib/Makefile Sat Mar 6 13:15:30 1999
@@ -1,15 +1,15 @@
# New ports collection makefile for: imlib
-# Version required: 1.9.3
+# Version required: 1.9.4
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.44 1999/02/18 04:55:07 vanilla Exp $
#
-DISTNAME= imlib-1.9.3
+DISTNAME= imlib-1.9.4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= imlib
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= vanilla@FreeBSD.ORG
@@ -17,17 +17,25 @@
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34 \
gif.3:${PORTSDIR}/graphics/giflib \
- gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel
+ gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/giflib" \
+ GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
LIBS="-L${LOCALBASE}/lib"
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- ${CAT} ${PKGDIR}/MESSAGE
+ @${ECHO} '************************************************************'
+ @${ECHO} '* *'
+ @${ECHO} '* If you want to use autoconf with imlib, *'
+ @${ECHO} '* Please copy imlib.m4 to /usr/local/share/aclocal *'
+ @${ECHO} '* by yourself, thanks. *'
+ @${ECHO} '* *'
+ @${ECHO} '************************************************************'
.include <bsd.port.mk>
diff -urN -x CVS /usr/ports.ref/graphics/imlib/files/md5 /usr/ports/graphics/imlib/files/md5
--- /usr/ports.ref/graphics/imlib/files/md5 Thu Feb 18 13:42:51 1999
+++ /usr/ports/graphics/imlib/files/md5 Sat Mar 6 13:16:24 1999
@@ -1 +1 @@
-MD5 (imlib-1.9.3.tar.gz) = 52e09ec343d2123609a7e1bcd72a76f9
+MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
diff -urN -x CVS /usr/ports.ref/graphics/imlib/patches/patch-aa /usr/ports/graphics/imlib/patches/patch-aa
--- /usr/ports.ref/graphics/imlib/patches/patch-aa Thu Feb 18 13:42:51 1999
+++ /usr/ports/graphics/imlib/patches/patch-aa Tue Mar 2 16:46:22 1999
@@ -1,13 +1,13 @@
---- configure.orig Fri Feb 12 14:06:46 1999
-+++ configure Thu Feb 18 00:47:01 1999
+--- configure.orig Thu Feb 25 01:44:38 1999
++++ configure Mon Mar 1 20:30:08 1999
@@ -2304,8 +2304,8 @@
echo "configure:2305: checking If dynamic linking works on this system" >&5
oLIBS="$LIBS"
oCFLAGS="$CFLAGS"
- LIBS="$LIBS `glib-config --libs gmodule`"
- CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-+ LIBS="$LIBS `glib11d-config --libs gmodule`"
-+ CFLAGS="$CFLAGS `glib11d-config --cflags gmodule`"
++ LIBS="$LIBS `glib12-config --libs gmodule`"
++ CFLAGS="$CFLAGS `glib12-config --cflags gmodule`"
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
@@ -17,8 +17,8 @@
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+ GMODULE_LIBS="`glib11d-config --libs gmodule`"
-+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`"
++ GMODULE_LIBS="`glib12-config --libs gmodule`"
++ GMODULE_FLAGS="`glib12-config --cflags gmodule`"
echo "$ac_t""yes" 1>&6
@@ -40,24 +40,3 @@
cat > conftest.$ac_ext <<EOF
#line 4494 "configure"
#include "confdefs.h"
-@@ -4715,16 +4715,16 @@
-
-
-
--ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:4721: 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:4721: 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
- cat > conftest.$ac_ext <<EOF
- #line 4726 "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:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff -urN -x CVS /usr/ports.ref/graphics/imlib/patches/patch-ab /usr/ports/graphics/imlib/patches/patch-ab
--- /usr/ports.ref/graphics/imlib/patches/patch-ab Thu Jan 14 18:53:37 1999
+++ /usr/ports/graphics/imlib/patches/patch-ab Tue Mar 2 16:45:37 1999
@@ -1,22 +0,0 @@
---- Imlib/Imlib_private.h.orig Wed Dec 16 11:13:56 1998
-+++ Imlib/Imlib_private.h Thu Dec 24 06:01:57 1998
-@@ -56,7 +56,7 @@
- #include <tiffio.h>
- #endif
- #ifdef HAVE_LIBGIF
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- #endif
-
- #define BYTE_ORD_24_RGB 0
---- gdk_imlib/io-gif.c.orig Wed Jan 13 05:56:51 1999
-+++ gdk_imlib/io-gif.c Thu Jan 14 18:12:05 1999
-@@ -8,7 +8,7 @@
- return NULL;
- }
- #else
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
-
- unsigned char *
- loader_gif(FILE *f, int *w, int *h, int *t)
diff -urN -x CVS /usr/ports.ref/graphics/imlib/patches/patch-ac /usr/ports/graphics/imlib/patches/patch-ac
--- /usr/ports.ref/graphics/imlib/patches/patch-ac Thu Feb 18 13:42:51 1999
+++ /usr/ports/graphics/imlib/patches/patch-ac Mon Mar 1 19:56:36 1999
@@ -1,44 +1,22 @@
---- config/Makefile.in.orig Fri Feb 12 14:29:22 1999
-+++ config/Makefile.in Wed Feb 17 22:12:52 1999
-@@ -23,7 +23,7 @@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @sysconfdir@/imlib
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
---- Imlib/Makefile.in.orig Fri Feb 12 14:29:20 1999
-+++ Imlib/Makefile.in Wed Feb 17 22:13:37 1999
-@@ -123,11 +123,11 @@
+--- Imlib/Makefile.in.orig Thu Feb 25 02:17:45 1999
++++ Imlib/Makefile.in Mon Mar 1 19:55:08 1999
+@@ -123,7 +123,7 @@
libImlib_la_SOURCES = cache.c colors.c load.c misc.c rend.c utils.c save.c snprintf.c
--libImlib_la_LDFLAGS = -version-info 10:3:9
+-libImlib_la_LDFLAGS = -version-info 10:4:9
+libImlib_la_LDFLAGS = -version-info 2:1:0
#libImlib_la_LDDADD = $(SUPPORT_LIBS)
libImlib_la_LIBADD = $(SUPPORT_LIBS)
--DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\"
-+DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\"
-
-
- INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS)
---- gdk_imlib/Makefile.in.orig Fri Feb 12 14:29:16 1999
-+++ gdk_imlib/Makefile.in Wed Feb 17 22:14:09 1999
-@@ -157,12 +157,12 @@
+--- gdk_imlib/Makefile.in.orig Thu Feb 25 02:17:39 1999
++++ gdk_imlib/Makefile.in Mon Mar 1 19:56:18 1999
+@@ -157,7 +157,7 @@
libgdk_imlib_la_SOURCES = cache.c colors.c globals.c load.c misc.c rend.c utils.c save.c modules.c
--libgdk_imlib_la_LDFLAGS = -version-info 10:3:9
+-libgdk_imlib_la_LDFLAGS = -version-info 10:4:9
+libgdk_imlib_la_LDFLAGS = -version-info 2:1:0
libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
-
--DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\" -DIMLIB_LIB=\""$(libdir)"\"
-+DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\" -DIMLIB_LIB=\""$(libdir)"\"
-
-
- INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(GTK_CFLAGS) $(X_CFLAGS) $(GMODULE_FLAGS)
diff -urN -x CVS /usr/ports.ref/graphics/imlib/patches/patch-ae /usr/ports/graphics/imlib/patches/patch-ae
--- /usr/ports.ref/graphics/imlib/patches/patch-ae Tue Feb 2 10:40:37 1999
+++ /usr/ports/graphics/imlib/patches/patch-ae Mon Mar 1 19:58:16 1999
@@ -1,20 +1,11 @@
---- ltconfig.orig Sat Jan 30 20:26:08 1999
-+++ ltconfig Sat Jan 30 20:26:25 1999
-@@ -1201,7 +1201,7 @@
- ;;
-
- # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-- freebsd3*)
-+ freebsd*)
- archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
-@@ -1606,7 +1606,7 @@
- shlibpath_var=PATH
- ;;
-
--freebsd2* | freebsd3*)
-+freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- library_names_spec='${libname}${release}.so$versuffix $libname.so'
+--- ltconfig.orig Wed Feb 24 17:46:26 1999
++++ ltconfig Mon Mar 1 19:57:31 1999
+@@ -1683,7 +1683,7 @@
+ deplibs_check_method=unknown
+ ;;
+ esac
+- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++ library_names_spec='${libname}${release}.so$versuffix $libname.so'
+ finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ need_version=yes
diff -urN -x CVS /usr/ports.ref/graphics/imlib/pkg/MESSAGE /usr/ports/graphics/imlib/pkg/MESSAGE
--- /usr/ports.ref/graphics/imlib/pkg/MESSAGE Mon Sep 28 15:21:47 1998
+++ /usr/ports/graphics/imlib/pkg/MESSAGE Tue Mar 2 16:54:21 1999
@@ -1,7 +0,0 @@
-*****************************************************************
-* *
-* If you want to use autoconf with imlib, *
-* Please copy imlib.m4 to /usr/local/share/aclocal *
-* by yourself, thanks. *
-* *
-*****************************************************************
diff -urN -x CVS /usr/ports.ref/graphics/imlib/pkg/PLIST /usr/ports/graphics/imlib/pkg/PLIST
--- /usr/ports.ref/graphics/imlib/pkg/PLIST Thu Jan 21 00:49:48 1999
+++ /usr/ports/graphics/imlib/pkg/PLIST Mon Mar 1 20:43:08 1999
@@ -1,5 +1,5 @@
-bin/imlib_config
bin/imlib-config
+bin/imlib_config
etc/imlib/im_palette.pal
etc/imlib/imrc
include/Imlib.h
@@ -16,6 +16,38 @@
lib/libgdk_imlib.la
lib/libgdk_imlib.so
lib/libgdk_imlib.so.2.1
+lib/libimlib-bmp.a
+lib/libimlib-bmp.la
+lib/libimlib-bmp.so
+lib/libimlib-bmp.so.0
+lib/libimlib-gif.a
+lib/libimlib-gif.la
+lib/libimlib-gif.so
+lib/libimlib-gif.so.0
+lib/libimlib-jpeg.a
+lib/libimlib-jpeg.la
+lib/libimlib-jpeg.so
+lib/libimlib-jpeg.so.0
+lib/libimlib-png.a
+lib/libimlib-png.la
+lib/libimlib-png.so
+lib/libimlib-png.so.0
+lib/libimlib-ppm.a
+lib/libimlib-ppm.la
+lib/libimlib-ppm.so
+lib/libimlib-ppm.so.0
+lib/libimlib-ps.a
+lib/libimlib-ps.la
+lib/libimlib-ps.so
+lib/libimlib-ps.so.0
+lib/libimlib-tiff.a
+lib/libimlib-tiff.la
+lib/libimlib-tiff.so
+lib/libimlib-tiff.so.0
+lib/libimlib-xpm.a
+lib/libimlib-xpm.la
+lib/libimlib-xpm.so
+lib/libimlib-xpm.so.0
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@dirrm etc/imlib
>Release-Note:
>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?199903061255.OAA17449>