aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/electriceyes/Makefile6
-rw-r--r--graphics/electriceyes/files/patch-aa54
-rw-r--r--graphics/imlib/Makefile24
-rw-r--r--graphics/imlib/distinfo2
-rw-r--r--graphics/imlib/files/patch-aa33
-rw-r--r--graphics/imlib/files/patch-ab22
-rw-r--r--graphics/imlib/files/patch-ac38
-rw-r--r--graphics/imlib/pkg-plist34
-rw-r--r--graphics/imlib2-tmp/Makefile24
-rw-r--r--graphics/imlib2-tmp/distinfo2
-rw-r--r--graphics/imlib2-tmp/files/patch-aa33
-rw-r--r--graphics/imlib2-tmp/pkg-plist34
-rw-r--r--graphics/imlib2/Makefile24
-rw-r--r--graphics/imlib2/distinfo2
-rw-r--r--graphics/imlib2/files/patch-aa33
-rw-r--r--graphics/imlib2/pkg-plist34
16 files changed, 203 insertions, 196 deletions
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 02b4c011e6f6..ba5b6688ecb0 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -3,14 +3,14 @@
# Date created: 21 August 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.10 1999/01/31 20:52:33 vanilla Exp $
+# $Id: Makefile,v 1.11 1999/02/24 22:04:23 vanilla Exp $
#
DISTNAME= ee-0.3.8
PKGNAME= electriceyes-0.3.8
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= ee
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= nacai@iname.com
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
--with-gnome=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+ GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
post-install:
diff --git a/graphics/electriceyes/files/patch-aa b/graphics/electriceyes/files/patch-aa
index 06a4aa19d6d1..8cec444ff988 100644
--- a/graphics/electriceyes/files/patch-aa
+++ b/graphics/electriceyes/files/patch-aa
@@ -1,24 +1,5 @@
---- configure.orig Wed Feb 24 05:54:38 1999
-+++ configure Wed Feb 24 05:55:40 1999
-@@ -1113,13 +1113,13 @@
- fi
-
- if test "$no_gnome_config" = "yes"; then
-- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1118: checking for gnomeConf.sh file in $gnome_prefix" >&5
-- if test -f $gnome_prefix/gnomeConf.sh; then
-+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:1118: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+ if test -f $prefix/share/gnome/gnomeConf.sh; then
- echo "$ac_t""found" 1>&6
- echo "loading gnome configuration from" \
-- "$gnome_prefix/gnomeConf.sh"
-- . $gnome_prefix/gnomeConf.sh
-+ "$prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
-
- else
- echo "$ac_t""not found" 1>&6
+--- configure.orig Fri Feb 12 23:04:17 1999
++++ configure Sat Mar 6 22:27:13 1999
@@ -4378,7 +4378,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
@@ -28,12 +9,25 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -4640,7 +4640,7 @@
- USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.cat
- INSTOBJEXT=.cat
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- INTLDEPS='$(top_builddir)/intl/libintl.a'
- INTLLIBS=$INTLDEPS
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -4766,15 +4766,15 @@
+ fi
+
+
+- USE_INCLUDED_LIBINTL=yes
++# USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.gmo
+ INSTOBJEXT=.mo
+ DATADIRNAME=share
+- INTLDEPS='$(top_builddir)/intl/libintl.a'
+- INTLLIBS=$INTLDEPS
+- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+- nls_cv_header_intl=intl/libintl.h
+- nls_cv_header_libgt=intl/libgettext.h
++# INTLDEPS='$(top_builddir)/intl/libintl.a'
++# INTLLIBS=$INTLDEPS
++# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++# nls_cv_header_intl=intl/libintl.h
++# nls_cv_header_libgt=intl/libgettext.h
+ fi
+
+ if test "$XGETTEXT" != ":"; then
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 6fb2f6d4a3a0..3d7cdf3afe80 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -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.43 1999/01/23 07:05:26 vanilla Exp $
+# $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 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
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 --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 378d40d12dc4..b82d90eab08c 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.3.tar.gz) = 52e09ec343d2123609a7e1bcd72a76f9
+MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index cb282fe13003..1d43b872d636 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -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 --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
deleted file mode 100644
index 3af5b0f15868..000000000000
--- a/graphics/imlib/files/patch-ab
+++ /dev/null
@@ -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 --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index 1d81083ae0f3..457515765db9 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -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 --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index 782906f0873f..5fcdb7dd3c00 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -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.a
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
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 6fb2f6d4a3a0..3d7cdf3afe80 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -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.43 1999/01/23 07:05:26 vanilla Exp $
+# $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 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
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 --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo
index 378d40d12dc4..b82d90eab08c 100644
--- a/graphics/imlib2-tmp/distinfo
+++ b/graphics/imlib2-tmp/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.3.tar.gz) = 52e09ec343d2123609a7e1bcd72a76f9
+MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa
index cb282fe13003..1d43b872d636 100644
--- a/graphics/imlib2-tmp/files/patch-aa
+++ b/graphics/imlib2-tmp/files/patch-aa
@@ -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 --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist
index 782906f0873f..5fcdb7dd3c00 100644
--- a/graphics/imlib2-tmp/pkg-plist
+++ b/graphics/imlib2-tmp/pkg-plist
@@ -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.a
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
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 6fb2f6d4a3a0..3d7cdf3afe80 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -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.43 1999/01/23 07:05:26 vanilla Exp $
+# $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 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
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 --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 378d40d12dc4..b82d90eab08c 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.3.tar.gz) = 52e09ec343d2123609a7e1bcd72a76f9
+MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa
index cb282fe13003..1d43b872d636 100644
--- a/graphics/imlib2/files/patch-aa
+++ b/graphics/imlib2/files/patch-aa
@@ -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 --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 782906f0873f..5fcdb7dd3c00 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -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.a
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
generated by cgit (git 2.34.1) at 2024-12-21 08:55:40 +0800