mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
Code Issues Releases Activity

Upgrade to 1.9.0.

Browse Source
This commit is contained in:
Vanilla I. Shu 1999-01-14 16:53:38 +00:00
parent 7592e932d6
commit 19ca39a572
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=16038
14 changed files with 303 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/imlib/Makefile
View File

@ -1,18 +1,17 @@
# New ports collection makefile for: imlib
# Version required: 1.8.2
# Version required: 1.9.0
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.38 1998/12/26 19:54:26 vanilla Exp $
# $Id: Makefile,v 1.39 1999/01/04 08:43:07 vanilla Exp $
#
DISTNAME= imlib-1.8.2
DISTNAME= imlib-1.9.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
ftp://ftp.gnome.org/pub/GNOME/sources/
#MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
# ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
# ftp://ftp.labs.redhat.com/pub/imlib/TAR/
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
ftp://ftp.geo.net/pub/gnome/sources/latest/ \
ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
ftp://ftp.gnome.org/pub/GNOME/sources/latest/
MAINTAINER= vanilla@FreeBSD.ORG

2
graphics/imlib/distinfo
View File

@ -1 +1 @@
MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d
MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9

77
graphics/imlib/files/patch-aa
View File

@ -1,15 +1,35 @@
--- configure.orig Wed Dec 16 11:14:28 1998
+++ configure Sun Jan 3 15:06:35 1999
@@ -1711,143 +1711,6 @@
rm -f conf.gtktest
--- configure.orig Thu Jan 14 17:51:21 1999
+++ configure Thu Jan 14 17:56:31 1999
@@ -1725,8 +1725,8 @@
echo "configure:1726: 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`"
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
@@ -1763,8 +1763,8 @@
#define USE_GMODULE 1
EOF
-
-
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
+ GMODULE_LIBS="`glib11d-config --libs gmodule`"
+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`"
echo "$ac_t""yes" 1>&6
@@ -1788,140 +1788,6 @@
DYNAMIC_MODULES_WORK_TRUE='#'
DYNAMIC_MODULES_WORK_FALSE=
fi
-# Extract the first word of "djpeg", so it can be a program name with args.
-set dummy djpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1720: checking for $ac_word" >&5
-echo "configure:1795: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -40,7 +60,7 @@
-# Extract the first word of "cjpeg", so it can be a program name with args.
-set dummy cjpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1751: checking for $ac_word" >&5
-echo "configure:1826: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -72,7 +92,7 @@
-# Extract the first word of "convert", so it can be a program name with args.
-set dummy convert; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1783: checking for $ac_word" >&5
-echo "configure:1858: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -108,7 +128,7 @@
-# Extract the first word of "giftopnm", so it can be a program name with args.
-set dummy giftopnm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1819: checking for $ac_word" >&5
-echo "configure:1894: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -140,58 +160,57 @@
-NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'`
-echo "NETPBM_PATH is $NETPBM_PATH"
-
-
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1853: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
@@ -3452,7 +3315,7 @@
echo "configure:1928: checking how to run the C preprocessor" >&5
@@ -3527,7 +3393,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext $X_LIBS $LIBS"
+LIBS="-lXext -lX11 $X_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3458 "configure"
#line 3533 "configure"
#include "confdefs.h"
@@ -3786,7 +3649,7 @@
@@ -3862,7 +3728,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3792 "configure"
#line 3868 "configure"
#include "confdefs.h"
@@ -4010,16 +3873,16 @@
@@ -4089,16 +3955,16 @@
-ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:4016: checking for gif_lib.h" >&5
-echo "configure:4095: 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:4016: checking for giflib/gif_lib.h" >&5
+echo "configure:4095: 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 4021 "configure"
#line 4100 "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:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -4234,24 +4097,6 @@
{ (eval echo configure:4105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -4317,26 +4183,6 @@
else
echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
fi
-
-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
-echo "configure:4323: checking for libpng version other than 1.0.2" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4242 "configure"
-#line 4325 "configure"
-#include "confdefs.h"
-#include <png.h>
-PNG_LIBPNG_VER_STRING
@ -205,6 +224,8 @@
- png_ok=yes
-fi
-rm -f conftest*
-
-echo "$ac_t""$png_ok" 1>&6
echo "$ac_t""$png_ok" 1>&6
if test "$png_ok" = yes; then
PNGLIBS="-lpng -lz"

16
graphics/imlib/files/patch-ab
View File

@ -9,14 +9,14 @@
#endif
#define BYTE_ORD_24_RGB 0
--- gdk_imlib/gdk_imlib_private.h.orig Wed Dec 16 11:14:01 1998
+++ gdk_imlib/gdk_imlib_private.h Thu Dec 24 06:01:57 1998
@@ -57,7 +57,7 @@
#include <tiffio.h>
#endif
#ifdef HAVE_LIBGIF
--- 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>
#endif
#define BYTE_ORD_24_RGB 0
unsigned char *
loader_gif(FILE *f, int *w, int *h, int *t)

42
graphics/imlib/files/patch-ac
View File

@ -1,5 +1,5 @@
--- config/Makefile.in.orig Wed Dec 16 11:15:46 1998
+++ config/Makefile.in Thu Dec 24 06:02:32 1998
--- config/Makefile.in.orig Thu Jan 14 18:24:27 1999
+++ config/Makefile.in Thu Jan 14 18:24:37 1999
@@ -23,7 +23,7 @@
sbindir = @sbindir@
libexecdir = @libexecdir@
@ -9,15 +9,15 @@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
--- Imlib/Makefile.in.orig Wed Dec 16 11:15:45 1998
+++ Imlib/Makefile.in Thu Dec 24 06:02:55 1998
@@ -119,12 +119,12 @@
--- Imlib/Makefile.in.orig Wed Jan 13 06:05:39 1999
+++ Imlib/Makefile.in Thu Jan 14 18:07:58 1999
@@ -127,12 +127,12 @@
save.c \
snprintf.c
-libImlib_la_LDFLAGS = -version-info 9:1:8
+libImlib_la_LDFLAGS = -version-info 1:9:0
libImlib_la_LDDADD = $(LIBS)
-libImlib_la_LDFLAGS = -version-info 10:0:9
+libImlib_la_LDFLAGS = -version-info 2:0:0
libImlib_la_LDDADD = $(SUPPORT_LIBS)
DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \
-DCONVERT_PATH=\"@CONVERT_PATH@\" \
@ -26,20 +26,22 @@
INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- gdk_imlib/Makefile.in.orig Wed Dec 16 11:15:43 1998
+++ gdk_imlib/Makefile.in Thu Dec 24 06:03:08 1998
@@ -119,12 +119,12 @@
utils.c \
save.c
--- gdk_imlib/Makefile.in.orig Wed Jan 13 06:05:37 1999
+++ gdk_imlib/Makefile.in Thu Jan 14 18:07:58 1999
@@ -164,14 +164,14 @@
save.c \
modules.c
-libgdk_imlib_la_LDFLAGS = -version-info 9:1:8
+libgdk_imlib_la_LDFLAGS = -version-info 1:9:0
libgdk_imlib_la_LDDADD = $(LIBS)
-libgdk_imlib_la_LDFLAGS = -version-info 10:0:9
+libgdk_imlib_la_LDFLAGS = -version-info 2:0: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\"
+ -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\"
- -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\" \
+ -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\" \
-DIMLIB_LIB=\""$(libdir)"\"
INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(GTK_CFLAGS) $(X_CFLAGS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. \

36
graphics/imlib/pkg-plist
View File

@ -11,11 +11,43 @@ include/gdk_imlib_types.h
lib/libImlib.a
lib/libImlib.la
lib/libImlib.so
lib/libImlib.so.1.9
lib/libImlib.so.2
lib/libgdk_imlib.a
lib/libgdk_imlib.la
lib/libgdk_imlib.so
lib/libgdk_imlib.so.1.9
lib/libgdk_imlib.so.2
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

15
graphics/imlib2-tmp/Makefile
View File

@ -1,18 +1,17 @@
# New ports collection makefile for: imlib
# Version required: 1.8.2
# Version required: 1.9.0
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.38 1998/12/26 19:54:26 vanilla Exp $
# $Id: Makefile,v 1.39 1999/01/04 08:43:07 vanilla Exp $
#
DISTNAME= imlib-1.8.2
DISTNAME= imlib-1.9.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
ftp://ftp.gnome.org/pub/GNOME/sources/
#MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
# ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
# ftp://ftp.labs.redhat.com/pub/imlib/TAR/
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
ftp://ftp.geo.net/pub/gnome/sources/latest/ \
ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
ftp://ftp.gnome.org/pub/GNOME/sources/latest/
MAINTAINER= vanilla@FreeBSD.ORG

2
graphics/imlib2-tmp/distinfo
View File

@ -1 +1 @@
MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d
MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9

77
graphics/imlib2-tmp/files/patch-aa
View File

@ -1,15 +1,35 @@
--- configure.orig Wed Dec 16 11:14:28 1998
+++ configure Sun Jan 3 15:06:35 1999
@@ -1711,143 +1711,6 @@
rm -f conf.gtktest
--- configure.orig Thu Jan 14 17:51:21 1999
+++ configure Thu Jan 14 17:56:31 1999
@@ -1725,8 +1725,8 @@
echo "configure:1726: 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`"
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
@@ -1763,8 +1763,8 @@
#define USE_GMODULE 1
EOF
-
-
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
+ GMODULE_LIBS="`glib11d-config --libs gmodule`"
+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`"
echo "$ac_t""yes" 1>&6
@@ -1788,140 +1788,6 @@
DYNAMIC_MODULES_WORK_TRUE='#'
DYNAMIC_MODULES_WORK_FALSE=
fi
-# Extract the first word of "djpeg", so it can be a program name with args.
-set dummy djpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1720: checking for $ac_word" >&5
-echo "configure:1795: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -40,7 +60,7 @@
-# Extract the first word of "cjpeg", so it can be a program name with args.
-set dummy cjpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1751: checking for $ac_word" >&5
-echo "configure:1826: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -72,7 +92,7 @@
-# Extract the first word of "convert", so it can be a program name with args.
-set dummy convert; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1783: checking for $ac_word" >&5
-echo "configure:1858: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -108,7 +128,7 @@
-# Extract the first word of "giftopnm", so it can be a program name with args.
-set dummy giftopnm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1819: checking for $ac_word" >&5
-echo "configure:1894: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -140,58 +160,57 @@
-NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'`
-echo "NETPBM_PATH is $NETPBM_PATH"
-
-
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1853: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
@@ -3452,7 +3315,7 @@
echo "configure:1928: checking how to run the C preprocessor" >&5
@@ -3527,7 +3393,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext $X_LIBS $LIBS"
+LIBS="-lXext -lX11 $X_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3458 "configure"
#line 3533 "configure"
#include "confdefs.h"
@@ -3786,7 +3649,7 @@
@@ -3862,7 +3728,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3792 "configure"
#line 3868 "configure"
#include "confdefs.h"
@@ -4010,16 +3873,16 @@
@@ -4089,16 +3955,16 @@
-ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:4016: checking for gif_lib.h" >&5
-echo "configure:4095: 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:4016: checking for giflib/gif_lib.h" >&5
+echo "configure:4095: 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 4021 "configure"
#line 4100 "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:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -4234,24 +4097,6 @@
{ (eval echo configure:4105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -4317,26 +4183,6 @@
else
echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
fi
-
-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
-echo "configure:4323: checking for libpng version other than 1.0.2" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4242 "configure"
-#line 4325 "configure"
-#include "confdefs.h"
-#include <png.h>
-PNG_LIBPNG_VER_STRING
@ -205,6 +224,8 @@
- png_ok=yes
-fi
-rm -f conftest*
-
-echo "$ac_t""$png_ok" 1>&6
echo "$ac_t""$png_ok" 1>&6
if test "$png_ok" = yes; then
PNGLIBS="-lpng -lz"

36
graphics/imlib2-tmp/pkg-plist
View File

@ -11,11 +11,43 @@ include/gdk_imlib_types.h
lib/libImlib.a
lib/libImlib.la
lib/libImlib.so
lib/libImlib.so.1.9
lib/libImlib.so.2
lib/libgdk_imlib.a
lib/libgdk_imlib.la
lib/libgdk_imlib.so
lib/libgdk_imlib.so.1.9
lib/libgdk_imlib.so.2
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

15
graphics/imlib2/Makefile
View File

@ -1,18 +1,17 @@
# New ports collection makefile for: imlib
# Version required: 1.8.2
# Version required: 1.9.0
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.38 1998/12/26 19:54:26 vanilla Exp $
# $Id: Makefile,v 1.39 1999/01/04 08:43:07 vanilla Exp $
#
DISTNAME= imlib-1.8.2
DISTNAME= imlib-1.9.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
ftp://ftp.gnome.org/pub/GNOME/sources/
#MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
# ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
# ftp://ftp.labs.redhat.com/pub/imlib/TAR/
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
ftp://ftp.geo.net/pub/gnome/sources/latest/ \
ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
ftp://ftp.gnome.org/pub/GNOME/sources/latest/
MAINTAINER= vanilla@FreeBSD.ORG

2
graphics/imlib2/distinfo
View File

@ -1 +1 @@
MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d
MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9

77
graphics/imlib2/files/patch-aa
View File

@ -1,15 +1,35 @@
--- configure.orig Wed Dec 16 11:14:28 1998
+++ configure Sun Jan 3 15:06:35 1999
@@ -1711,143 +1711,6 @@
rm -f conf.gtktest
--- configure.orig Thu Jan 14 17:51:21 1999
+++ configure Thu Jan 14 17:56:31 1999
@@ -1725,8 +1725,8 @@
echo "configure:1726: 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`"
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
@@ -1763,8 +1763,8 @@
#define USE_GMODULE 1
EOF
-
-
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
+ GMODULE_LIBS="`glib11d-config --libs gmodule`"
+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`"
echo "$ac_t""yes" 1>&6
@@ -1788,140 +1788,6 @@
DYNAMIC_MODULES_WORK_TRUE='#'
DYNAMIC_MODULES_WORK_FALSE=
fi
-# Extract the first word of "djpeg", so it can be a program name with args.
-set dummy djpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1720: checking for $ac_word" >&5
-echo "configure:1795: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -40,7 +60,7 @@
-# Extract the first word of "cjpeg", so it can be a program name with args.
-set dummy cjpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1751: checking for $ac_word" >&5
-echo "configure:1826: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -72,7 +92,7 @@
-# Extract the first word of "convert", so it can be a program name with args.
-set dummy convert; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1783: checking for $ac_word" >&5
-echo "configure:1858: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -108,7 +128,7 @@
-# Extract the first word of "giftopnm", so it can be a program name with args.
-set dummy giftopnm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1819: checking for $ac_word" >&5
-echo "configure:1894: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
@ -140,58 +160,57 @@
-NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'`
-echo "NETPBM_PATH is $NETPBM_PATH"
-
-
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1853: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
@@ -3452,7 +3315,7 @@
echo "configure:1928: checking how to run the C preprocessor" >&5
@@ -3527,7 +3393,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext $X_LIBS $LIBS"
+LIBS="-lXext -lX11 $X_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3458 "configure"
#line 3533 "configure"
#include "confdefs.h"
@@ -3786,7 +3649,7 @@
@@ -3862,7 +3728,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3792 "configure"
#line 3868 "configure"
#include "confdefs.h"
@@ -4010,16 +3873,16 @@
@@ -4089,16 +3955,16 @@
-ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:4016: checking for gif_lib.h" >&5
-echo "configure:4095: 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:4016: checking for giflib/gif_lib.h" >&5
+echo "configure:4095: 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 4021 "configure"
#line 4100 "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:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -4234,24 +4097,6 @@
{ (eval echo configure:4105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -4317,26 +4183,6 @@
else
echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
fi
-
-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
-echo "configure:4323: checking for libpng version other than 1.0.2" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4242 "configure"
-#line 4325 "configure"
-#include "confdefs.h"
-#include <png.h>
-PNG_LIBPNG_VER_STRING
@ -205,6 +224,8 @@
- png_ok=yes
-fi
-rm -f conftest*
-
-echo "$ac_t""$png_ok" 1>&6
echo "$ac_t""$png_ok" 1>&6
if test "$png_ok" = yes; then
PNGLIBS="-lpng -lz"

36
graphics/imlib2/pkg-plist
View File

@ -11,11 +11,43 @@ include/gdk_imlib_types.h
lib/libImlib.a
lib/libImlib.la
lib/libImlib.so
lib/libImlib.so.1.9
lib/libImlib.so.2
lib/libgdk_imlib.a
lib/libgdk_imlib.la
lib/libgdk_imlib.so
lib/libgdk_imlib.so.1.9
lib/libgdk_imlib.so.2
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