Date: Sun, 16 Jun 2002 23:11:33 -0500 (CDT) From: Jeremy Norris <ishmael@mchsi.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39390: Make graphics/imlib not depend upon GTK+ port. Message-ID: <200206170411.g5H4BX748980@babylon.merseine.nu>
next in thread | raw e-mail | index | archive | help
>Number: 39390
>Category: ports
>Synopsis: Make graphics/imlib not depend upon GTK+ port.
>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: Sun Jun 16 21:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Norris
>Release: FreeBSD 4.5-STABLE i386
>Organization:
None
>Environment:
System: FreeBSD babylon.merseine.nu 4.5-STABLE FreeBSD 4.5-STABLE #0: Fri Mar 22 17:10:21 CST 2002 ishmael@babylon.merseine.nu:/usr/src/sys/compile/BABYLON i386
>Description:
graphics/imlib doesn't need to depend upon x11-toolkits/gtk12. This PR
rectifies this and creates a new port, graphics/gdk_imlib, which adds
libgdk_imlib, the part of imlib package that depends upon GTK+. This is useful
for several ports which need libImlib, but don't need libgdk_imlib. For now
I've made USE_IMLIB depend upon new gdk_imlib port to avoid any breakage, but
ports can be migrated to simple LIB_DEPENDS=Imlib.5... if they don't requre
gdk_imlib. I've already done so for 3 ports (www/w3m, x11-wm/enlightenment, &
x11-wm/libepplet).
>How-To-Repeat:
>Fix:
Index: ports/graphics/imlib/Makefile
--- ports/graphics/imlib/Makefile Sun Jun 16 22:47:47 CDT 2002
+++ ports/graphics/imlib/Makefile Sun Jun 16 22:47:47 CDT 2002
@@ -6,15 +6,16 @@
#
-PORTNAME= imlib
+PORTNAME?= imlib
PORTVERSION= 1.9.14
-PORTREVISION= 1
-CATEGORIES= graphics
+PORTREVISION= 2
+CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/imlib
+DISTNAME= imlib-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS?= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif
@@ -23,17 +24,16 @@
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GTK= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules \
- --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
+CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-MAN1= imlib-config.1 imlib_config.1
+MAN1?= imlib-config.1
pre-configure:
- ${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in
+ ${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^ ; \
+ s^\@GTK_CONFIG\@^${X11BASE}/bin/gtk12-config^" \
+ ${WRKSRC}/imlib-config.in
.include <bsd.port.mk>
Index: ports/graphics/imlib/files/patch-Makefile.in
--- ports/graphics/imlib/files/patch-Makefile.in Sun Jun 16 22:47:47 CDT 2002
+++ ports/graphics/imlib/files/patch-Makefile.in Sun Jun 16 22:47:47 CDT 2002
@@ -1,12 +1,25 @@
---- Makefile.in.orig Tue Mar 27 22:21:26 2001
-+++ Makefile.in Mon May 21 19:43:10 2001
-@@ -37,3 +37,3 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig Mon Mar 25 10:50:22 2002
++++ Makefile.in Thu Jun 13 20:54:53 2002
+@@ -35,7 +35,7 @@
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(prefix)/libdata/pkgconfig
pkgincludedir = $(includedir)/@PACKAGE@
-@@ -109,3 +109,3 @@
+
+ top_builddir = .
+@@ -105,8 +105,8 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = imlib.m4
-pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = imlib.pc imlibgdk.pc
+pkgconfigdir = $(pkglibdir)
- pkgconfig_DATA = imlib.pc imlibgdk.pc
++pkgconfig_DATA = imlib.pc
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
Index: ports/graphics/imlib/pkg-descr
--- ports/graphics/imlib/pkg-descr Sun Jun 16 22:47:47 CDT 2002
+++ ports/graphics/imlib/pkg-descr Sun Jun 16 22:47:47 CDT 2002
@@ -1 +1 @@
-a graphic library for enlightenment package
+A graphic library for enlightenment package.
Index: ports/graphics/imlib/pkg-plist
--- ports/graphics/imlib/pkg-plist Sun Jun 16 22:47:47 CDT 2002
+++ ports/graphics/imlib/pkg-plist Sun Jun 16 22:47:47 CDT 2002
@@ -1,4 +1,4 @@
+@comment $FreeBSD$
bin/imlib-config
-bin/imlib_config
etc/imlib/im_palette-small.pal
etc/imlib/im_palette-tiny.pal
@@ -8,15 +8,8 @@
include/Imlib_private.h
include/Imlib_types.h
-include/gdk_imlib.h
-include/gdk_imlib_private.h
-include/gdk_imlib_types.h
lib/libImlib.a
lib/libImlib.so
lib/libImlib.so.5
-lib/libgdk_imlib.a
-lib/libgdk_imlib.so
-lib/libgdk_imlib.so.5
libdata/pkgconfig/imlib.pc
-libdata/pkgconfig/imlibgdk.pc
share/aclocal/imlib.m4
@dirrm etc/imlib
Index: ports/Mk/bsd.gnome.mk
--- ports/Mk/bsd.gnome.mk Sun Jun 16 22:50:05 CDT 2002
+++ ports/Mk/bsd.gnome.mk Sun Jun 16 22:50:05 CDT 2002
@@ -257,5 +257,5 @@
.if defined(USE_IMLIB)
-LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS+= gdk_imlib.5:${PORTSDIR}/graphics/gdk_imlib
IMLIB_CONFIG?= ${X11BASE}/bin/imlib-config
CONFIGURE_ENV+= IMLIB_CONFIG="${IMLIB_CONFIG}"
Index: ports/www/w3m/Makefile
--- ports/www/w3m/Makefile Sun Jun 16 22:51:24 CDT 2002
+++ ports/www/w3m/Makefile Sun Jun 16 22:51:24 CDT 2002
@@ -90,5 +90,5 @@
.if defined(INLINE_IMAGE)
-USE_IMLIB= yes
+LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib
DOCS+= README.img
Index: ports/x11-wm/enlightenment/Makefile
--- ports/x11-wm/enlightenment/Makefile Sun Jun 16 22:51:24 CDT 2002
+++ ports/x11-wm/enlightenment/Makefile Sun Jun 16 22:51:24 CDT 2002
@@ -23,4 +23,5 @@
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
+ Imlib.5:${PORTSDIR}/graphics/imlib \
ghttp.1:${PORTSDIR}/www/libghttp \
intl.2:${PORTSDIR}/devel/gettext
@@ -29,5 +30,4 @@
USE_X_PREFIX= yes
USE_ESOUND= yes
-USE_IMLIB= yes
USE_FREETYPE= yes
GNU_CONFIGURE= yes
Index: ports/x11-wm/libepplet/Makefile
--- ports/x11-wm/libepplet/Makefile Sun Jun 16 22:51:24 CDT 2002
+++ ports/x11-wm/libepplet/Makefile Sun Jun 16 22:51:24 CDT 2002
@@ -16,8 +16,9 @@
MAINTAINER= cmc@groupofnine.org
+LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib
+
WRKSRC= ${WRKDIR}/Epplets-${PORTVERSION}
USE_X_PREFIX= yes
-USE_IMLIB= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= EROOT=${X11BASE}/share/enlightenment \
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# gdk_imlib
# gdk_imlib/Makefile
# gdk_imlib/pkg-plist
# gdk_imlib/pkg-descr
# gdk_imlib/pkg-comment
#
echo c - gdk_imlib
mkdir -p gdk_imlib > /dev/null 2>&1
echo x - gdk_imlib/Makefile
sed 's/^X//' >gdk_imlib/Makefile << 'END-of-gdk_imlib/Makefile'
X# New ports collection makefile for: gdk_imlib
X# Date created: 13 June 2002
X# Whom: Jeremy Norris <ishmael@mchsi.com>
X#
X# $FreeBSD$
X#
X
XPORTNAME= gdk_imlib
XCATEGORIES= graphics x11-toolkits
X
XLIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib
X
XMASTERDIR= ${.CURDIR}/../imlib
X
XCOMMENT= ${.CURDIR}/pkg-comment
XDESCR= ${.CURDIR}/pkg-descr
XPLIST= ${.CURDIR}/pkg-plist
X
XUSE_GTK= yes
X
XMAN1= imlib_config.1
X
Xdo-install:
X ${INSTALL_PROGRAM} ${WRKSRC}/utils/.libs/imlib_config ${PREFIX}/bin
X ${INSTALL_MAN} ${WRKSRC}/utils/imlib_config.1 ${PREFIX}/man/man1
X ${INSTALL_DATA} ${WRKSRC}/imlibgdk.pc ${PREFIX}/libdata/pkgconfig
X cd ${WRKSRC}/gdk_imlib/.libs && \
X ${INSTALL_DATA} ../gdk_imlib.h ${PREFIX}/include && \
X ${INSTALL_DATA} ../gdk_imlib_private.h ${PREFIX}/include && \
X ${INSTALL_DATA} ../gdk_imlib_types.h ${PREFIX}/include && \
X ${INSTALL_DATA} libgdk_imlib.a ${PREFIX}/lib && \
X ${INSTALL_PROGRAM} libgdk_imlib.so.5 ${PREFIX}/lib && \
X ${LN} -sf libgdk_imlib.so.5 ${PREFIX}/lib/libgdk_imlib.so
X
X.include "${MASTERDIR}/Makefile"
END-of-gdk_imlib/Makefile
echo x - gdk_imlib/pkg-plist
sed 's/^X//' >gdk_imlib/pkg-plist << 'END-of-gdk_imlib/pkg-plist'
X@comment $FreeBSD$
Xbin/imlib_config
Xinclude/gdk_imlib.h
Xinclude/gdk_imlib_private.h
Xinclude/gdk_imlib_types.h
Xlib/libgdk_imlib.a
Xlib/libgdk_imlib.so
Xlib/libgdk_imlib.so.5
Xlibdata/pkgconfig/imlibgdk.pc
END-of-gdk_imlib/pkg-plist
echo x - gdk_imlib/pkg-descr
sed 's/^X//' >gdk_imlib/pkg-descr << 'END-of-gdk_imlib/pkg-descr'
XAn image loader library for GTK1.
END-of-gdk_imlib/pkg-descr
echo x - gdk_imlib/pkg-comment
sed 's/^X//' >gdk_imlib/pkg-comment << 'END-of-gdk_imlib/pkg-comment'
XAn image loader library for GTK1
END-of-gdk_imlib/pkg-comment
exit
>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?200206170411.g5H4BX748980>