From b8d7821bb385de3fb2ef70ef7651a3e724f74a6b Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Thu, 21 Jan 1999 20:00:49 +0000 Subject: Upgrade to 1.9.2. Submitted by: Jeremy Lea --- graphics/imlib/Makefile | 18 +++++++----------- graphics/imlib/distinfo | 2 +- graphics/imlib/files/patch-aa | 31 ++----------------------------- graphics/imlib/files/patch-ac | 21 +++++++++++---------- graphics/imlib2-tmp/Makefile | 18 +++++++----------- graphics/imlib2-tmp/distinfo | 2 +- graphics/imlib2-tmp/files/patch-aa | 31 ++----------------------------- graphics/imlib2/Makefile | 18 +++++++----------- graphics/imlib2/distinfo | 2 +- graphics/imlib2/files/patch-aa | 31 ++----------------------------- 10 files changed, 41 insertions(+), 133 deletions(-) diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 98b8b4cb62f4..66a3e257d5e6 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,17 +1,15 @@ # New ports collection makefile for: imlib -# Version required: 1.9.1 +# Version required: 1.9.2 # Date created: 10 June 1997 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.40 1999/01/14 16:53:36 vanilla Exp $ +# $Id: Makefile,v 1.41 1999/01/20 22:49:40 vanilla Exp $ # -DISTNAME= imlib-1.9.1 +DISTNAME= imlib-1.9.2 CATEGORIES= graphics -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/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= imlib MAINTAINER= vanilla@FreeBSD.ORG @@ -24,11 +22,9 @@ LIB_DEPENDS= png.2:${PORTSDIR}/graphics/png \ USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - INSTALL="$${INSTALL} -c" + LIBS="-L${LOCALBASE}/lib" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index a5924a68563f..7c2aaab929ea 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.1.tar.gz) = 98115bf7568a19ee80a7be87a48d16c3 +MD5 (imlib-1.9.2.tar.gz) = 77deba4154a9b526a3e0c42bd20a9cd3 diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index 34ec3b55d5a2..580690478c03 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Sat Jan 16 01:23:28 1999 -+++ configure Thu Jan 21 06:12:39 1999 +--- configure.orig Thu Jan 21 00:10:05 1999 ++++ configure Fri Jan 22 03:38:47 1999 @@ -2173,8 +2173,8 @@ echo "configure:2174: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" @@ -202,30 +202,3 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4777,26 +4643,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:4783: checking for libpng version other than 1.0.2" >&5 --cat > conftest.$ac_ext < --PNG_LIBPNG_VER_STRING --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep ""1.0.2"" >/dev/null 2>&1; then -- rm -rf conftest* -- echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit --else -- rm -rf conftest* -- png_ok=yes --fi --rm -f conftest* -- --echo "$ac_t""$png_ok" 1>&6 - - if test "$png_ok" = yes; then - PNGLIBS="-lpng -lz" diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac index fecd0d89ba21..981f8d978623 100644 --- a/graphics/imlib/files/patch-ac +++ b/graphics/imlib/files/patch-ac @@ -1,5 +1,5 @@ ---- config/Makefile.in.orig Sat Jan 16 02:07:15 1999 -+++ config/Makefile.in Thu Jan 21 06:13:27 1999 +--- config/Makefile.in.orig Thu Jan 21 00:26:15 1999 ++++ config/Makefile.in Fri Jan 22 03:36:42 1999 @@ -23,7 +23,7 @@ sbindir = @sbindir@ libexecdir = @libexecdir@ @@ -9,15 +9,16 @@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ ---- Imlib/Makefile.in.orig Sat Jan 16 02:07:15 1999 -+++ Imlib/Makefile.in Thu Jan 21 06:14:23 1999 -@@ -130,12 +130,12 @@ +--- Imlib/Makefile.in.orig Thu Jan 21 00:26:14 1999 ++++ Imlib/Makefile.in Fri Jan 22 03:39:37 1999 +@@ -130,13 +130,13 @@ save.c \ snprintf.c --libImlib_la_LDFLAGS = -version-info 10:1:9 +-libImlib_la_LDFLAGS = -version-info 10:2:9 +libImlib_la_LDFLAGS = -version-info 2:1:0 - libImlib_la_LDDADD = $(SUPPORT_LIBS) + #libImlib_la_LDDADD = $(SUPPORT_LIBS) + libImlib_la_LIBADD = $(SUPPORT_LIBS) DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \ -DCONVERT_PATH=\"@CONVERT_PATH@\" \ @@ -26,13 +27,13 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gdk_imlib/Makefile.in.orig Sat Jan 16 02:07:10 1999 -+++ gdk_imlib/Makefile.in Thu Jan 21 06:14:48 1999 +--- gdk_imlib/Makefile.in.orig Thu Jan 21 00:26:11 1999 ++++ gdk_imlib/Makefile.in Fri Jan 22 03:39:58 1999 @@ -167,14 +167,14 @@ save.c \ modules.c --libgdk_imlib_la_LDFLAGS = -version-info 10:1:9 +-libgdk_imlib_la_LDFLAGS = -version-info 10:2:9 +libgdk_imlib_la_LDFLAGS = -version-info 2:1:0 libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index 98b8b4cb62f4..66a3e257d5e6 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -1,17 +1,15 @@ # New ports collection makefile for: imlib -# Version required: 1.9.1 +# Version required: 1.9.2 # Date created: 10 June 1997 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.40 1999/01/14 16:53:36 vanilla Exp $ +# $Id: Makefile,v 1.41 1999/01/20 22:49:40 vanilla Exp $ # -DISTNAME= imlib-1.9.1 +DISTNAME= imlib-1.9.2 CATEGORIES= graphics -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/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= imlib MAINTAINER= vanilla@FreeBSD.ORG @@ -24,11 +22,9 @@ LIB_DEPENDS= png.2:${PORTSDIR}/graphics/png \ USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - INSTALL="$${INSTALL} -c" + LIBS="-L${LOCALBASE}/lib" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo index a5924a68563f..7c2aaab929ea 100644 --- a/graphics/imlib2-tmp/distinfo +++ b/graphics/imlib2-tmp/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.1.tar.gz) = 98115bf7568a19ee80a7be87a48d16c3 +MD5 (imlib-1.9.2.tar.gz) = 77deba4154a9b526a3e0c42bd20a9cd3 diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa index 34ec3b55d5a2..580690478c03 100644 --- a/graphics/imlib2-tmp/files/patch-aa +++ b/graphics/imlib2-tmp/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Sat Jan 16 01:23:28 1999 -+++ configure Thu Jan 21 06:12:39 1999 +--- configure.orig Thu Jan 21 00:10:05 1999 ++++ configure Fri Jan 22 03:38:47 1999 @@ -2173,8 +2173,8 @@ echo "configure:2174: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" @@ -202,30 +202,3 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4777,26 +4643,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:4783: checking for libpng version other than 1.0.2" >&5 --cat > conftest.$ac_ext < --PNG_LIBPNG_VER_STRING --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep ""1.0.2"" >/dev/null 2>&1; then -- rm -rf conftest* -- echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit --else -- rm -rf conftest* -- png_ok=yes --fi --rm -f conftest* -- --echo "$ac_t""$png_ok" 1>&6 - - if test "$png_ok" = yes; then - PNGLIBS="-lpng -lz" diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 98b8b4cb62f4..66a3e257d5e6 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,17 +1,15 @@ # New ports collection makefile for: imlib -# Version required: 1.9.1 +# Version required: 1.9.2 # Date created: 10 June 1997 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.40 1999/01/14 16:53:36 vanilla Exp $ +# $Id: Makefile,v 1.41 1999/01/20 22:49:40 vanilla Exp $ # -DISTNAME= imlib-1.9.1 +DISTNAME= imlib-1.9.2 CATEGORIES= graphics -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/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= imlib MAINTAINER= vanilla@FreeBSD.ORG @@ -24,11 +22,9 @@ LIB_DEPENDS= png.2:${PORTSDIR}/graphics/png \ USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - INSTALL="$${INSTALL} -c" + LIBS="-L${LOCALBASE}/lib" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index a5924a68563f..7c2aaab929ea 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.1.tar.gz) = 98115bf7568a19ee80a7be87a48d16c3 +MD5 (imlib-1.9.2.tar.gz) = 77deba4154a9b526a3e0c42bd20a9cd3 diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa index 34ec3b55d5a2..580690478c03 100644 --- a/graphics/imlib2/files/patch-aa +++ b/graphics/imlib2/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Sat Jan 16 01:23:28 1999 -+++ configure Thu Jan 21 06:12:39 1999 +--- configure.orig Thu Jan 21 00:10:05 1999 ++++ configure Fri Jan 22 03:38:47 1999 @@ -2173,8 +2173,8 @@ echo "configure:2174: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" @@ -202,30 +202,3 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4777,26 +4643,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:4783: checking for libpng version other than 1.0.2" >&5 --cat > conftest.$ac_ext < --PNG_LIBPNG_VER_STRING --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep ""1.0.2"" >/dev/null 2>&1; then -- rm -rf conftest* -- echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit --else -- rm -rf conftest* -- png_ok=yes --fi --rm -f conftest* -- --echo "$ac_t""$png_ok" 1>&6 - - if test "$png_ok" = yes; then - PNGLIBS="-lpng -lz" -- cgit v1.2.3