diff options
author | sobomax <sobomax@FreeBSD.org> | 2000-06-27 00:06:17 +0800 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2000-06-27 00:06:17 +0800 |
commit | 69a186a28b4fab9659c545972f8b2aa025476077 (patch) | |
tree | 1cca42057821ff4f4ab9faa528fce571b2ff1b76 /graphics/gimp-app-devel/files | |
parent | 17e088dda92f138b8bbb3ca83359d3e2657e3253 (diff) | |
download | freebsd-ports-gnome-69a186a28b4fab9659c545972f8b2aa025476077.tar.gz freebsd-ports-gnome-69a186a28b4fab9659c545972f8b2aa025476077.tar.zst freebsd-ports-gnome-69a186a28b4fab9659c545972f8b2aa025476077.zip |
Update 1.1.24.
Also provide following enhancements:
- Remove PLIST.perl and merge its contents into main PLIST using Satoshi's
%%PORTDOCS:%% hack;
- the same as previous for Gnome bits;
- automatically generate and substitute shared libraries version;
- slightly reorder Makefile to be more organised;
- remove mailformed pieces from configure patch (it is appears that somebody
did diff after USE_LIBTOOL hack has been applied).
Diffstat (limited to 'graphics/gimp-app-devel/files')
-rw-r--r-- | graphics/gimp-app-devel/files/patch-ab | 22 | ||||
-rw-r--r-- | graphics/gimp-app-devel/files/patch-ah | 34 |
2 files changed, 16 insertions, 40 deletions
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab index 2e37f7c44cff..d0d7c4ef2415 100644 --- a/graphics/gimp-app-devel/files/patch-ab +++ b/graphics/gimp-app-devel/files/patch-ab @@ -1,13 +1,13 @@ ---- plug-ins/common/url.c.orig Tue Feb 1 16:09:01 2000 -+++ plug-ins/common/url.c Sat Feb 19 13:51:36 2000 -@@ -158,8 +158,8 @@ - } - else if (pid == 0) - { -- execlp ("wget", "wget", filename, "-O", tmpname, NULL); -- g_message ("url: exec failed: wget: %s\n", g_strerror(errno)); -+ execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL); -+ g_message ("url: exec failed: fetch: %s\n", g_strerror(errno)); +--- plug-ins/common/url.c.orig Wed Jun 7 21:46:43 2000 ++++ plug-ins/common/url.c Mon Jun 26 12:20:54 2000 +@@ -187,8 +187,8 @@ + dup (p[1]); + close (p[1]); + putenv ("LC_ALL=C"); /* produce deterministic output */ +- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL); +- g_message ("url: exec() failed: wget: %s", g_strerror (errno)); ++ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL); ++ g_message ("url: exec() failed: fetch: %s", g_strerror(errno)); g_free (tmpname); - _exit(127); + _exit (127); } diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah index 963f2c046f7d..02c26a51f920 100644 --- a/graphics/gimp-app-devel/files/patch-ah +++ b/graphics/gimp-app-devel/files/patch-ah @@ -1,30 +1,6 @@ ---- configure.orig Wed Mar 29 18:55:23 2000 -+++ configure Sun Apr 9 14:46:44 2000 -@@ -1494,8 +1494,8 @@ - LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ - LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ - DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ -+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ -+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - - # Reload cache, that may have been modified by ltconfig -@@ -1509,10 +1509,10 @@ - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL="/usr/local/bin/libtool" - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. -@@ -3480,7 +3480,11 @@ +--- configure.orig Thu Jun 22 23:49:05 2000 ++++ configure Mon Jun 26 16:04:16 2000 +@@ -3478,7 +3478,11 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -37,7 +13,7 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -7016,8 +7020,8 @@ +@@ -7148,8 +7152,8 @@ fi @@ -48,7 +24,7 @@ localedir='${prefix}/${DATADIRNAME}/locale' brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` -@@ -8602,11 +8606,6 @@ +@@ -8415,11 +8419,6 @@ *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; |