summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059>2004-02-25 13:56:08 +0800
committeradamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059>2004-02-25 13:56:08 +0800
commit916526624cc3fc108ac9d88388143edf9201c454 (patch)
treef7ba1b5c77308546196bc2cd7c3fbae3e4a596a9
parent96692b97218b5894a9a3e1f7fbb23399385a3d35 (diff)
downloadmarcuscom-ports-916526624cc3fc108ac9d88388143edf9201c454.tar
marcuscom-ports-916526624cc3fc108ac9d88388143edf9201c454.tar.gz
marcuscom-ports-916526624cc3fc108ac9d88388143edf9201c454.tar.bz2
marcuscom-ports-916526624cc3fc108ac9d88388143edf9201c454.tar.lz
marcuscom-ports-916526624cc3fc108ac9d88388143edf9201c454.tar.xz
marcuscom-ports-916526624cc3fc108ac9d88388143edf9201c454.tar.zst
marcuscom-ports-916526624cc3fc108ac9d88388143edf9201c454.zip
Update to 2.5.6.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1893 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/yelp/Makefile4
-rw-r--r--x11/yelp/distinfo4
-rw-r--r--x11/yelp/files/patch-configure37
3 files changed, 20 insertions, 25 deletions
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 94cb4b893..8ac3c7771 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= yelp
-PORTVERSION= 2.5.5
+PORTVERSION= 2.5.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.5
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgtkhtml
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgtkhtml lthack
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 4e1e10e13..be0a85bef 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/yelp-2.5.5.tar.bz2) = 25cf9417ef55cf4b72159efe13422e79
-SIZE (gnome2/yelp-2.5.5.tar.bz2) = 550024
+MD5 (gnome2/yelp-2.5.6.tar.bz2) = 296bef657f61aca231412b75b9236f87
+SIZE (gnome2/yelp-2.5.6.tar.bz2) = 484218
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
index 20702046e..73cda6a70 100644
--- a/x11/yelp/files/patch-configure
+++ b/x11/yelp/files/patch-configure
@@ -1,25 +1,20 @@
---- configure.orig Tue Aug 12 03:36:10 2003
-+++ configure Tue Aug 12 10:30:37 2003
-@@ -18129,6 +18129,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -20408,12 +20409,12 @@
+--- configure.orig Wed Feb 25 00:54:31 2004
++++ configure Wed Feb 25 00:55:33 2004
+@@ -9879,7 +9879,7 @@
YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
--YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
-+YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
-
-
+-idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
++idl_dirs="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
+ for ac_prog in gsed sed
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -9924,7 +9924,7 @@
+ test -n "$SED" && break
+ done
- case $host in
-- *-linux-gnu | *-irix6*)
-+ *-linux-gnu | *-irix6* | *-freebsd*)
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_MAN_WHEREIS 1
- _ACEOF
+-if ${SED} --version 2>/dev/null | grep GNU >/dev/null 2>&1; then
++if -1; then
+ YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+ else
+ YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -E -e 's/^/ /' -e 's/ +$//' -e 's/ +/ -I /g' -e 's/^ +//'`"