Date: Wed, 26 Jan 2000 07:06:07 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/16379: Update port: graphics/imlib Message-ID: <20000126150607.8AD7F14C43@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 16379
>Category: ports
>Synopsis: Update port: graphics/imlib
>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: Wed Jan 26 07:10:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Remove redundant LIB_DEPENDS
- Use GLIB_CONFIG instead of hardcoded glib12-config
New file:
patches/patch-ai patches/patch-aj
Remove file:
patches/patch-ac
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/imlib/Makefile graphics/imlib/Makefile
--- /usr/ports/graphics/imlib/Makefile Sun Dec 5 08:15:32 1999
+++ graphics/imlib/Makefile Mon Jan 24 23:19:41 2000
@@ -12,20 +12,22 @@
MAINTAINER= vanilla@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
gif.5:${PORTSDIR}/graphics/giflib \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
- GTK_CONFIG="${GTK_CONFIG}" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
+ GLIB_CONFIG='${GLIB_CONFIG}' \
+ GTK_CONFIG='${GTK_CONFIG}' \
+ LIBS='-L${LOCALBASE}/lib'
+CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib \
+ --disable-gtktest
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/imlib/patches/patch-aa graphics/imlib/patches/patch-aa
--- /usr/ports/graphics/imlib/patches/patch-aa Fri Oct 8 19:14:37 1999
+++ graphics/imlib/patches/patch-aa Mon Jan 24 22:38:12 2000
@@ -1,22 +1,13 @@
--- configure.orig Wed Sep 1 04:00:37 1999
+++ configure Mon Sep 6 15:17:37 1999
-@@ -1826,7 +1826,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) /usr/local/bin/libtool'
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
@@ -2367,8 +2367,8 @@
echo "configure:2368: checking whether to build gmodulized imlib" >&5
oLIBS="$LIBS"
oCFLAGS="$CFLAGS"
- LIBS="$LIBS `glib-config --libs gmodule`"
- CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-+ LIBS="$LIBS `glib12-config --libs gmodule`"
-+ CFLAGS="$CFLAGS `glib12-config --cflags gmodule`"
++ LIBS="$LIBS `${GLIB_CONFIG} --libs gmodule`"
++ CFLAGS="$CFLAGS `${GLIB_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
@@ -26,8 +17,8 @@
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+ GMODULE_LIBS="`glib12-config --libs gmodule`"
-+ GMODULE_FLAGS="`glib12-config --cflags gmodule`"
++ GMODULE_LIBS="`${GLIB_CONFIG} --libs gmodule`"
++ GMODULE_FLAGS="`${GLIB_CONFIG} --cflags gmodule`"
echo "$ac_t""yes" 1>&6
@@ -45,7 +36,7 @@
if test "$jpeg_ok" = yes; then
JPEGLIBS="-ljpeg"
- SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
-+ SUPPORT_LIBS="$SUPPORT_LIBS -L/usr/local/lib"; cat >> confdefs.h <<\EOF
++ SUPPORT_LIBS="$SUPPORT_LIBS"; cat >> confdefs.h <<\EOF
#define HAVE_LIBJPEG 1
EOF
diff -urN /usr/ports/graphics/imlib/patches/patch-ac graphics/imlib/patches/patch-ac
--- /usr/ports/graphics/imlib/patches/patch-ac Sat Oct 30 07:14:51 1999
+++ graphics/imlib/patches/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,22 +0,0 @@
---- Imlib/Makefile.in.orig Tue Oct 19 07:55:03 1999
-+++ Imlib/Makefile.in Thu Oct 28 19:35:24 1999
-@@ -125,7 +125,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:8:9
-+libImlib_la_LDFLAGS = -version-info 5:0:0
- #libImlib_la_LDDADD = $(SUPPORT_LIBS)
- libImlib_la_LIBADD = $(SUPPORT_LIBS)
-
---- gdk_imlib/Makefile.in.orig Tue Oct 19 07:55:01 1999
-+++ gdk_imlib/Makefile.in Thu Oct 28 19:36:16 1999
-@@ -152,7 +152,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:8:9
-+libgdk_imlib_la_LDFLAGS = -version-info 5:0:0
- libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
-
- include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
diff -urN /usr/ports/graphics/imlib/patches/patch-ai graphics/imlib/patches/patch-ai
--- /usr/ports/graphics/imlib/patches/patch-ai Thu Jan 1 09:00:00 1970
+++ graphics/imlib/patches/patch-ai Mon Jan 24 22:37:11 2000
@@ -0,0 +1,11 @@
+--- Imlib/Makefile.in.orig Tue Oct 19 07:55:03 1999
++++ Imlib/Makefile.in Thu Oct 28 19:35:24 1999
+@@ -125,7 +125,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:8:9
++libImlib_la_LDFLAGS = -version-info 5:0:0
+ #libImlib_la_LDDADD = $(SUPPORT_LIBS)
+ libImlib_la_LIBADD = $(SUPPORT_LIBS)
+
diff -urN /usr/ports/graphics/imlib/patches/patch-aj graphics/imlib/patches/patch-aj
--- /usr/ports/graphics/imlib/patches/patch-aj Thu Jan 1 09:00:00 1970
+++ graphics/imlib/patches/patch-aj Mon Jan 24 22:37:20 2000
@@ -0,0 +1,11 @@
+--- gdk_imlib/Makefile.in.orig Tue Oct 19 07:55:01 1999
++++ gdk_imlib/Makefile.in Thu Oct 28 19:36:16 1999
+@@ -152,7 +152,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:8:9
++libgdk_imlib_la_LDFLAGS = -version-info 5:0:0
+ libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
+
+ include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
>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?20000126150607.8AD7F14C43>