diff options
| -rw-r--r-- | graphics/imlib/Makefile | 4 | ||||
| -rw-r--r-- | graphics/imlib/distinfo | 2 | ||||
| -rw-r--r-- | graphics/imlib/files/patch-Imlib_Makefile.in | 11 | ||||
| -rw-r--r-- | graphics/imlib/files/patch-ac | 24 | ||||
| -rw-r--r-- | graphics/imlib/files/patch-configure (renamed from graphics/imlib/files/patch-aa) | 33 | ||||
| -rw-r--r-- | graphics/imlib/files/patch-gdk__imlib_Makefile.in | 13 | ||||
| -rw-r--r-- | graphics/imlib/files/patch-imlib-config.in (renamed from graphics/imlib/files/patch-ab) | 6 |
7 files changed, 52 insertions, 41 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 1ae7fe824d35..83c1c4cd1f9f 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= imlib -PORTVERSION= 1.9.8.1 +PORTVERSION= 1.9.9 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/imlib @@ -22,7 +22,7 @@ USE_X_PREFIX= yes USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index 9f05597792ac..f4c4847e6294 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599 +MD5 (imlib-1.9.9.tar.gz) = 19debabef3175e36d33bc3e357ed3f9b diff --git a/graphics/imlib/files/patch-Imlib_Makefile.in b/graphics/imlib/files/patch-Imlib_Makefile.in new file mode 100644 index 000000000000..93ecfd6dbb7e --- /dev/null +++ b/graphics/imlib/files/patch-Imlib_Makefile.in @@ -0,0 +1,11 @@ +--- Imlib/Makefile.in.orig Thu Feb 15 12:46:40 2001 ++++ Imlib/Makefile.in Thu Mar 22 14:57:27 2001 +@@ -124,7 +124,7 @@ + libImlib_la_SOURCES = cache.c colors.c load.c misc.c rend.c utils.c save.c snprintf.c + + +-libImlib_la_LDFLAGS = -version-info 10:9:9 ++libImlib_la_LDFLAGS = -version-info 5:0:0 + #libImlib_la_LDDADD = $(SUPPORT_LIBS) + libImlib_la_LIBADD = $(SUPPORT_LIBS) + diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac deleted file mode 100644 index a1e1373d82fe..000000000000 --- a/graphics/imlib/files/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ ---- Imlib/Makefile.in.orig Tue Oct 19 07:55:03 1999 -+++ Imlib/Makefile.in Thu Oct 28 19:35:24 1999 -@@ -125,7 +125,7 @@ - libImlib_la_SOURCES = cache.c colors.c load.c misc.c rend.c utils.c save.c snprintf.c - - --libImlib_la_LDFLAGS = -version-info 10:8:9 -+libImlib_la_LDFLAGS = -version-info 5:0:0 - #libImlib_la_LDDADD = $(SUPPORT_LIBS) - libImlib_la_LIBADD = $(SUPPORT_LIBS) - ---- gdk_imlib/Makefile.in.orig Tue Oct 19 07:55:01 1999 -+++ gdk_imlib/Makefile.in Mon Apr 3 08:45:38 2000 -@@ -152,8 +152,8 @@ - libgdk_imlib_la_SOURCES = cache.c colors.c globals.c load.c misc.c rend.c utils.c save.c modules.c - - --libgdk_imlib_la_LDFLAGS = -version-info 10:8:9 --libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) -+libgdk_imlib_la_LDFLAGS = -export-dynamic -version-info 5:0:0 -+libgdk_imlib_la_LIBADD = $(GTK_LIBS) $(SUPPORT_LIBS) - - include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h - diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-configure index 03f10b1107b8..3706521df0a7 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-configure @@ -1,5 +1,25 @@ ---- configure.orig Sat May 20 14:50:50 2000 -+++ configure Sun Jul 16 09:56:12 2000 +--- configure.orig Thu Feb 15 03:29:17 2001 ++++ configure Thu Mar 22 15:02:05 2001 +@@ -1456,8 +1456,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 $host \ ++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + # Reload cache, that may have been modified by ltconfig +@@ -1471,7 +1471,7 @@ + + + # 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 /usr/local/share/libtool/ltmain.sh" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -2034,8 +2034,8 @@ if test "x$GDK_IMLIB" != x; then oLIBS="$LIBS" @@ -11,15 +31,6 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else -@@ -2056,7 +2056,7 @@ - EOF - if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- dynworks=true -+ dynworks=false - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 @@ -2085,8 +2085,8 @@ #define USE_GMODULE 1 EOF diff --git a/graphics/imlib/files/patch-gdk__imlib_Makefile.in b/graphics/imlib/files/patch-gdk__imlib_Makefile.in new file mode 100644 index 000000000000..c36ef0a8b1c0 --- /dev/null +++ b/graphics/imlib/files/patch-gdk__imlib_Makefile.in @@ -0,0 +1,13 @@ +--- gdk_imlib/Makefile.in.orig Thu Feb 15 12:46:34 2001 ++++ gdk_imlib/Makefile.in Thu Mar 22 14:58:49 2001 +@@ -151,8 +151,8 @@ + libgdk_imlib_la_SOURCES = cache.c colors.c globals.c load.c misc.c rend.c utils.c save.c modules.c + + +-libgdk_imlib_la_LDFLAGS = -version-info 10:9:9 +-libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) ++libgdk_imlib_la_LDFLAGS = -export-dynamic -version-info 5:0:0 ++libgdk_imlib_la_LIBADD = $(GTK_LIBS) $(SUPPORT_LIBS) + + include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h + diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-imlib-config.in index 8f53b916c5cb..1874db0a41ce 100644 --- a/graphics/imlib/files/patch-ab +++ b/graphics/imlib/files/patch-imlib-config.in @@ -1,11 +1,11 @@ ---- imlib-config.in.org Thu Aug 26 08:09:25 1999 -+++ imlib-config.in Fri Mar 3 11:08:41 2000 +--- imlib-config.in.orig Thu Jan 14 17:43:29 1999 ++++ imlib-config.in Thu Mar 22 14:59:36 2001 @@ -3,7 +3,7 @@ # Shamelessly ripped form gtk's gtk-config.in # -gx_libs="@SUPPORT_LIBS@" -+gx_libs="-L%%LOCALBASE%%/lib @SUPPORT_LIBS@" ++gx_libs="-L/usr/local/lib @SUPPORT_LIBS@" gdk_gx_libs=" @GDK_SUPPORT_LIBS@" gdk_libs="@LIBS@" |