Date: Tue, 28 Apr 1998 10:07:30 -0700 (PDT) From: dburr@POBoxes.com To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/6442: Update port graphics/gimp-devel to version 0.99.28 Message-ID: <199804281707.KAA08872@colossus.dyn.ml.org>
next in thread | raw e-mail | index | archive | help
>Number: 6442
>Category: ports
>Synopsis: Update port graphics/gimp-devel to version 0.99.28
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 28 10:20:01 PDT 1998
>Last-Modified:
>Originator: Donald Burr
>Organization:
Computer Help
>Release: FreeBSD 2.2.6-RELEASE i386
>Environment:
Built and tested on 2.2.6-RELEASE
>Description:
The gimp-devel port is outdated -- ftp.gimp.org no longer has the version
on its ftp site. I have updated the port to track version 0.99.28, which
is the latest version.
>How-To-Repeat:
>Fix:
apply this patch:
diff -ruN gimp-devel.old/Makefile gimp-devel/Makefile
--- gimp-devel.old/Makefile Sun Apr 19 15:29:32 1998
+++ gimp-devel/Makefile Tue Apr 28 10:05:53 1998
@@ -1,5 +1,5 @@
# New ports collection makefile for: Gimp
-# Version required: 0.99.19
+# Version required: 0.99.28
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
@@ -8,7 +8,7 @@
MAJOR= 0
MINOR= 99
-MICRO= 26
+MICRO= 28
VERSION= ${MAJOR}.${MINOR}.${MICRO}
MM_VERSION= ${MAJOR}.${MINOR}
diff -ruN gimp-devel.old/files/md5 gimp-devel/files/md5
--- gimp-devel.old/files/md5 Fri Apr 17 15:26:48 1998
+++ gimp-devel/files/md5 Tue Apr 28 08:58:52 1998
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.26.tar.gz) = 5007046065c3640ca8ead70d9a5a9ea5
+MD5 (gimp-0.99.28.tar.gz) = 22912ec257b264ad0f664d214eac2371
MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff -ruN gimp-devel.old/patches/.orig/patch-ah.orig gimp-devel/patches/.orig/patch-ah.orig
--- gimp-devel.old/patches/.orig/patch-ah.orig Wed Dec 31 16:00:00 1969
+++ gimp-devel/patches/.orig/patch-ah.orig Fri Apr 17 15:26:48 1998
@@ -0,0 +1,96 @@
+--- configure.in~ Thu Apr 16 20:00:52 1998
++++ configure.in Thu Apr 16 20:02:07 1998
+@@ -115,13 +115,13 @@
+
+ dnl Test for libtiff
+ if test -z "$LIBTIFF_LIB"; then
+- AC_CHECK_LIB(tiff, TIFFReadScanline,
++ AC_CHECK_LIB(tiff34, TIFFReadScanline,
+ AC_CHECK_HEADER(tiffio.h,
+- TIFF='tiff'; LIBTIFF_LIB='-ltiff',
++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34',
+ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
+- AC_CHECK_LIB(tiff, TIFFWriteScanline,
++ AC_CHECK_LIB(tiff34, TIFFWriteScanline,
+ AC_CHECK_HEADER(tiffio.h,
+- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
+ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
+ fi
+@@ -299,7 +299,7 @@
+ LIBS="$gimp_save_LIBS"
+
+ gimpdatadir=$datadir/gimp
+-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
+
+ brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
+--- configure~ Thu Apr 16 20:00:58 1998
++++ configure Thu Apr 16 20:04:59 1998
+@@ -2282,14 +2282,14 @@
+ fi
+
+ if test -z "$LIBTIFF_LIB"; then
+- echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
+-echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
++ echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
++echo "configure:2287: checking for TIFFReadScanline in -ltiff34" >&5
++ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-ltiff -lm $LIBS"
++LIBS="-ltiff34 -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2295 "configure"
+ #include "confdefs.h"
+@@ -2345,7 +2345,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TIFF='tiff'; LIBTIFF_LIB='-ltiff'
++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34'
+ else
+ echo "$ac_t""no" 1>&6
+ echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
+@@ -2353,14 +2353,14 @@
+
+ else
+ echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
+-echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
++echo "configure:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-ltiff -lz -ljpeg -lm $LIBS"
++LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2366 "configure"
+ #include "confdefs.h"
+@@ -2416,7 +2416,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+ else
+ echo "$ac_t""no" 1>&6
+ echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
+@@ -4070,7 +4070,7 @@
+ LIBS="$gimp_save_LIBS"
+
+ gimpdatadir=$datadir/gimp
+-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
+
+ brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
diff -ruN gimp-devel.old/patches/patch-aa gimp-devel/patches/patch-aa
--- gimp-devel.old/patches/patch-aa Wed Dec 31 16:00:00 1969
+++ gimp-devel/patches/patch-aa Tue Apr 28 09:54:39 1998
@@ -0,0 +1,11 @@
+--- app/main.c.old Tue Apr 28 09:54:27 1998
++++ app/main.c Tue Apr 28 09:53:51 1998
+@@ -80,6 +80,8 @@
+ int i, j;
+ gchar *display_name, *display_env;
+
++#define ATEXIT(proc) (atexit (proc))
++
+ ATEXIT (g_mem_profile);
+
+ /* Initialize variables */
diff -ruN gimp-devel.old/patches/patch-ah gimp-devel/patches/patch-ah
--- gimp-devel.old/patches/patch-ah Fri Apr 17 15:26:48 1998
+++ gimp-devel/patches/patch-ah Tue Apr 28 09:09:55 1998
@@ -1,5 +1,5 @@
---- configure.in~ Thu Apr 16 20:00:52 1998
-+++ configure.in Thu Apr 16 20:02:07 1998
+--- configure.in.old Tue Apr 28 09:04:13 1998
++++ configure.in Tue Apr 28 09:07:13 1998
@@ -115,13 +115,13 @@
dnl Test for libtiff
@@ -13,12 +13,12 @@
- AC_CHECK_LIB(tiff, TIFFWriteScanline,
+ AC_CHECK_LIB(tiff34, TIFFWriteScanline,
AC_CHECK_HEADER(tiffio.h,
-- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
- AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
- fi
-@@ -299,7 +299,7 @@
+ AC_CHECK_LIB(tiff34, TIFFFlushData,
+ AC_CHECK_HEADER(tiffio.h,
+@@ -303,7 +303,7 @@
LIBS="$gimp_save_LIBS"
gimpdatadir=$datadir/gimp
@@ -27,17 +27,17 @@
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure~ Thu Apr 16 20:00:58 1998
-+++ configure Thu Apr 16 20:04:59 1998
-@@ -2282,14 +2282,14 @@
+--- configure.old Tue Apr 28 09:04:06 1998
++++ configure Tue Apr 28 09:09:45 1998
+@@ -2281,14 +2281,14 @@
fi
if test -z "$LIBTIFF_LIB"; then
- echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2286: checking for TIFFReadScanline in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2287: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2286: checking for TIFFReadScanline in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -46,9 +46,9 @@
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff34 -lm $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 2295 "configure"
+ #line 2294 "configure"
#include "confdefs.h"
-@@ -2345,7 +2345,7 @@
+@@ -2344,7 +2344,7 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -57,35 +57,35 @@
else
echo "$ac_t""no" 1>&6
echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -2353,14 +2353,14 @@
+@@ -2352,14 +2352,14 @@
else
echo "$ac_t""no" 1>&6
-echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2357: checking for TIFFWriteScanline in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2357: checking for TIFFWriteScanline in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lz -ljpeg -lm $LIBS"
-+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 2366 "configure"
+ #line 2365 "configure"
#include "confdefs.h"
-@@ -2416,7 +2416,7 @@
+@@ -2415,7 +2415,7 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
-- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
-+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
else
echo "$ac_t""no" 1>&6
echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -4070,7 +4070,7 @@
+@@ -4144,7 +4144,7 @@
LIBS="$gimp_save_LIBS"
gimpdatadir=$datadir/gimp
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199804281707.KAA08872>