summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>1999-10-28 00:23:08 +0000
committerjlam <jlam@pkgsrc.org>1999-10-28 00:23:08 +0000
commit0382b8cf61186fae9e1093e35a0ada43d27bf580 (patch)
tree0e41a72936e50a463d9d955fef4f671a1e4c56e9 /graphics
parent759a6ebd3a9338213ffda3c22682eba925a3db66 (diff)
downloadpkgsrc-0382b8cf61186fae9e1093e35a0ada43d27bf580.tar.gz
Update to imlib-1.9.8.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/imlib/Makefile17
-rw-r--r--graphics/imlib/files/md54
-rw-r--r--graphics/imlib/files/patch-sum5
-rw-r--r--graphics/imlib/patches/patch-aa42
-rw-r--r--graphics/imlib/patches/patch-ac17
-rw-r--r--graphics/imlib/pkg/PLIST8
6 files changed, 38 insertions, 55 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 89224ff5fd9..a72a622d31a 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.27 1999/10/24 16:49:31 tron Exp $
+# $NetBSD: Makefile,v 1.28 1999/10/28 00:23:08 jlam Exp $
#
-DISTNAME= imlib-1.9.7
+DISTNAME= imlib-1.9.8
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GNOME:=gnome-1.0.53/sources/}
+MASTER_SITES= ftp://ftp.enlightenment.org/pub/e/enlightenment/libs/ \
+ ${MASTER_SITE_GNOME:=sources/imlib/}
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.labs.redhat.com/imlib/
@@ -17,14 +18,16 @@ DEPENDS+= tiff-*:../../graphics/tiff
USE_X11BASE= yes
USE_LIBTOOL= yes
-USE_GMAKE= yes
-
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CPPFLAGS+= -DENABLE_NLS
+.endif
+
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib \
- -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib
diff --git a/graphics/imlib/files/md5 b/graphics/imlib/files/md5
index aa378721cf6..58c5beebf08 100644
--- a/graphics/imlib/files/md5
+++ b/graphics/imlib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/10/24 16:49:32 tron Exp $
+$NetBSD: md5,v 1.7 1999/10/28 00:23:09 jlam Exp $
-MD5 (imlib-1.9.7.tar.gz) = 0b897b599e6e651d8ec189971aef4eca
+MD5 (imlib-1.9.8.tar.gz) = b6a8034777554bc5287b367301c25635
diff --git a/graphics/imlib/files/patch-sum b/graphics/imlib/files/patch-sum
index 38b237b61a2..68e0d78e94b 100644
--- a/graphics/imlib/files/patch-sum
+++ b/graphics/imlib/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.3 1999/10/24 16:49:32 tron Exp $
+$NetBSD: patch-sum,v 1.4 1999/10/28 00:23:10 jlam Exp $
-MD5 (patch-aa) = 792e3607ed89b4c2690f6adfb415a8b8
-MD5 (patch-ac) = 7870aab85a57c2635c04f960066dc162
+MD5 (patch-aa) = a5b00b12a2802f68100acd33a7507666
diff --git a/graphics/imlib/patches/patch-aa b/graphics/imlib/patches/patch-aa
index 783b29a1cef..cbef76089cd 100644
--- a/graphics/imlib/patches/patch-aa
+++ b/graphics/imlib/patches/patch-aa
@@ -1,34 +1,30 @@
-$NetBSD: patch-aa,v 1.8 1999/10/24 16:49:33 tron Exp $
+$NetBSD: patch-aa,v 1.9 1999/10/28 00:23:10 jlam Exp $
---- configure.orig Tue Sep 7 01:53:10 1999
-+++ configure Fri Oct 22 21:38:23 1999
-@@ -1530,7 +1530,7 @@
- ac_tool_prefix=
+--- configure.orig Mon Oct 18 19:52:34 1999
++++ configure Wed Oct 27 20:20:38 1999
+@@ -1531,6 +1531,7 @@
fi
--
+
+if false; then
# Check for any special flags to pass to ltconfig.
libtool_flags="--cache-file=$cache_file"
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1827,6 +1827,7 @@
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
-
+@@ -1831,6 +1832,7 @@
# Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.
-@@ -5378,10 +5379,12 @@
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
-+if false; then
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
+ exec 5>>./config.log
+fi
- echo creating "$ac_file"
- rm -f "$ac_file"
+
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+@@ -2400,6 +2402,9 @@
+ LIBS="$oLIBS"
+ CFLAGS="$oCFLAGS"
+ fi
++
++# NetBSD's ld.so doesn't support library dependencies
++dynworks=false
+
+ if $dynworks; then
+ imlib_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
deleted file mode 100644
index 92cf76b00ef..00000000000
--- a/graphics/imlib/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1999/04/06 15:38:00 agc Exp $
-
-Enable the native NLS on Solaris.
-
---- utils/imlib_config.c 1999/04/06 13:27:10 1.1
-+++ utils/imlib_config.c 1999/04/06 13:28:56
-@@ -1,4 +1,10 @@
- #include <config.h>
-+
-+/* On Solaris, enable the native nls */
-+#if defined(__sun__) && defined(__svr4__)
-+#define ENABLE_NLS 1
-+#endif
-+
- #ifndef GNOMELOCALEDIR
- #define GNOMELOCALEDIR "/usr/share/locale"
- #endif
diff --git a/graphics/imlib/pkg/PLIST b/graphics/imlib/pkg/PLIST
index 84fa89db3de..ba446a1e615 100644
--- a/graphics/imlib/pkg/PLIST
+++ b/graphics/imlib/pkg/PLIST
@@ -1,18 +1,20 @@
-@comment $NetBSD: PLIST,v 1.6 1999/10/24 16:49:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1999/10/28 00:23:12 jlam Exp $
bin/imlib_config
bin/imlib-config
etc/imrc
etc/im_palette.pal
+etc/im_palette-small.pal
+etc/im_palette-tiny.pal
include/gdk_imlib.h
include/gdk_imlib_private.h
include/gdk_imlib_types.h
include/Imlib.h
include/Imlib_private.h
include/Imlib_types.h
-lib/libImlib.so.10.7
+lib/libImlib.so.10.8
lib/libImlib.a
lib/libgdk_imlib.a
-lib/libgdk_imlib.so.10.7
+lib/libgdk_imlib.so.10.8
share/aclocal/imlib.m4
share/doc/imlib/bg.gif
share/doc/imlib/border_diag.gif