summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-05-29 04:02:00 +0000
committerSteve Price <steve@FreeBSD.org>1999-05-29 04:02:00 +0000
commita77eab2b6ca12e61e72c7c0474b301c24f254ea4 (patch)
tree2b438a1287ca77b01c158d25196476f973608b9e /graphics
parentUpdate to use gtk version 1.2.3. (diff)
Use gtk version 1.2.3, bump minor version, and USE_LIBTOOL.
PR: 11843 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Notes
Notes: svn path=/head/; revision=19056
Diffstat (limited to 'graphics')
-rw-r--r--graphics/imlib/Makefile20
-rw-r--r--graphics/imlib/files/patch-ac4
-rw-r--r--graphics/imlib/pkg-plist15
-rw-r--r--graphics/imlib2-tmp/Makefile20
-rw-r--r--graphics/imlib2-tmp/pkg-plist15
-rw-r--r--graphics/imlib2/Makefile20
-rw-r--r--graphics/imlib2/pkg-plist15
7 files changed, 29 insertions, 80 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 917abbff87e5..de66692e60fc 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.48 1999/05/27 07:31:59 tg Exp $
+# $Id: Makefile,v 1.49 1999/05/27 21:52:21 jkh Exp $
#
DISTNAME= imlib-1.9.4
@@ -17,24 +17,16 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34 \
gif.3:${PORTSDIR}/graphics/giflib \
- gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_GMAKE= yes
USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+ GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
-post-install:
- @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- @${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 --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index c3128b5ed513..205e21a9d237 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -5,7 +5,7 @@
-libImlib_la_LDFLAGS = -version-info 10:4:9
-+libImlib_la_LDFLAGS = -version-info 3:0:0
++libImlib_la_LDFLAGS = -version-info 4:0:0
#libImlib_la_LDDADD = $(SUPPORT_LIBS)
libImlib_la_LIBADD = $(SUPPORT_LIBS)
@@ -16,7 +16,7 @@
-libgdk_imlib_la_LDFLAGS = -version-info 10:4:9
-+libgdk_imlib_la_LDFLAGS = -version-info 3:0:0
++libgdk_imlib_la_LDFLAGS = -version-info 4:0:0
libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index 4b6384f7cf15..3844624f5149 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -9,45 +9,36 @@ include/gdk_imlib.h
include/gdk_imlib_private.h
include/gdk_imlib_types.h
lib/libImlib.a
-lib/libImlib.la
lib/libImlib.so
-lib/libImlib.so.3.0
+lib/libImlib.so.4
lib/libgdk_imlib.a
-lib/libgdk_imlib.la
lib/libgdk_imlib.so
-lib/libgdk_imlib.so.3.0
+lib/libgdk_imlib.so.4
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
+share/aclocal/imlib.m4
@dirrm etc/imlib
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 917abbff87e5..de66692e60fc 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.48 1999/05/27 07:31:59 tg Exp $
+# $Id: Makefile,v 1.49 1999/05/27 21:52:21 jkh Exp $
#
DISTNAME= imlib-1.9.4
@@ -17,24 +17,16 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34 \
gif.3:${PORTSDIR}/graphics/giflib \
- gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_GMAKE= yes
USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+ GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
-post-install:
- @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- @${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 --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist
index 4b6384f7cf15..3844624f5149 100644
--- a/graphics/imlib2-tmp/pkg-plist
+++ b/graphics/imlib2-tmp/pkg-plist
@@ -9,45 +9,36 @@ include/gdk_imlib.h
include/gdk_imlib_private.h
include/gdk_imlib_types.h
lib/libImlib.a
-lib/libImlib.la
lib/libImlib.so
-lib/libImlib.so.3.0
+lib/libImlib.so.4
lib/libgdk_imlib.a
-lib/libgdk_imlib.la
lib/libgdk_imlib.so
-lib/libgdk_imlib.so.3.0
+lib/libgdk_imlib.so.4
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
+share/aclocal/imlib.m4
@dirrm etc/imlib
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 917abbff87e5..de66692e60fc 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.48 1999/05/27 07:31:59 tg Exp $
+# $Id: Makefile,v 1.49 1999/05/27 21:52:21 jkh Exp $
#
DISTNAME= imlib-1.9.4
@@ -17,24 +17,16 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34 \
gif.3:${PORTSDIR}/graphics/giflib \
- gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_GMAKE= yes
USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+ GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
-post-install:
- @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- @${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 --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 4b6384f7cf15..3844624f5149 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -9,45 +9,36 @@ include/gdk_imlib.h
include/gdk_imlib_private.h
include/gdk_imlib_types.h
lib/libImlib.a
-lib/libImlib.la
lib/libImlib.so
-lib/libImlib.so.3.0
+lib/libImlib.so.4
lib/libgdk_imlib.a
-lib/libgdk_imlib.la
lib/libgdk_imlib.so
-lib/libgdk_imlib.so.3.0
+lib/libgdk_imlib.so.4
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
+share/aclocal/imlib.m4
@dirrm etc/imlib