diff options
Diffstat (limited to 'graphics/gimp')
-rw-r--r-- | graphics/gimp/Makefile | 6 | ||||
-rw-r--r-- | graphics/gimp/files/patch-ab | 11 | ||||
-rw-r--r-- | graphics/gimp/files/patch-ah | 74 |
3 files changed, 84 insertions, 7 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 9208bd85d089..bc8d5fb5d069 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.13 1997/12/01 08:05:34 tg Exp $ +# $Id: Makefile,v 1.15 1997/12/16 23:25:34 erich Exp $ # MAJOR= 0 @@ -36,8 +36,8 @@ USE_X11= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \ - -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \ - LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' + -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \ + LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' CONFIGURE_ARGS= --with-tcl=tcl80 --with-tk=tk80 DATASTUFF= brushes palettes gradients patterns diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab index 3c90bafc4593..e8b6e0cc0bad 100644 --- a/graphics/gimp/files/patch-ab +++ b/graphics/gimp/files/patch-ab @@ -18,3 +18,14 @@ else +--- plug-ins/mail/mail.c.orig Tue Nov 25 06:04:27 1997 ++++ plug-ins/mail/mail.c Thu Dec 18 00:40:23 1997 +@@ -89,7 +89,7 @@ + * + */ + #ifndef MAILER +-#define MAILER "/usr/lib/sendmail" ++#define MAILER "/usr/sbin/sendmail" + #endif + + #ifndef UUENCODE diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah index 8acc0093b135..08a2094a4159 100644 --- a/graphics/gimp/files/patch-ah +++ b/graphics/gimp/files/patch-ah @@ -9,8 +9,23 @@ AC_SUBST(INSTALL_SCRIPT)dnl ]) ---- configure.in.orig Sun Dec 14 21:44:48 1997 -+++ configure.in Mon Dec 15 11:14:59 1997 +--- configure.in.orig Mon Dec 15 11:44:48 1997 ++++ configure.in Thu Dec 18 00:36:24 1997 +@@ -120,10 +120,10 @@ + + dnl Test for libtiff + if test -z "$LIBTIFF_LIB"; then +- AC_CHECK_LIB(tiff, TIFFReadScanline, +- TIFF='tiff'; LIBTIFF_LIB='-ltiff', +- AC_CHECK_LIB(tiff, TIFFWriteScanline, +- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg', ++ AC_CHECK_LIB(tiff34, TIFFReadScanline, ++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34', ++ AC_CHECK_LIB(tiff34, TIFFWriteScanline, ++ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg', + AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm) + fi + @@ -240,7 +240,7 @@ AC_C_INLINE @@ -20,8 +35,59 @@ dnl This is for generating PDB docuemntation. AC_PATH_PROG(EMACS, emacs, :) ---- configure.orig Mon Dec 15 11:13:24 1997 -+++ configure Mon Dec 15 11:13:41 1997 +--- configure.orig Mon Dec 15 12:39:24 1997 ++++ configure Thu Dec 18 00:38:43 1997 +@@ -2722,14 +2722,14 @@ + fi + + if test -z "$LIBTIFF_LIB"; then +- echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6 +-echo "configure:2727: 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:2727: 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 2735 "configure" + #include "confdefs.h" +@@ -2757,17 +2757,17 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = 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 $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6 +-echo "configure:2765: 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:2765: 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 2773 "configure" + #include "confdefs.h" +@@ -2795,7 +2795,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = 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 ***" 1>&2 @@ -3933,7 +3933,7 @@ |