summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-11-29 20:19:51 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-11-29 20:19:51 +0000
commit4305cf30b28698feb4a151f0e09ff2ca282f78ad (patch)
treecbc70d3d82a4e631e0c030815b62eafad794a477
parent- Deal with httpsd.conf.bak files, like we did for apache2 previously in the ... (diff)
Update to 2.4.1.
-rw-r--r--devel/libglade2/Makefile8
-rw-r--r--devel/libglade2/distinfo4
-rw-r--r--devel/libglade2/files/patch-ab15
-rw-r--r--devel/libglade2/files/patch-configure13
4 files changed, 9 insertions, 31 deletions
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 1fc1aa30d438..4cb7f0db2ddf 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libglade2
-PORTVERSION= 2.4.0
-PORTREVISION= 1
+PORTVERSION= 2.4.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
@@ -26,13 +25,14 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
USE_GNOME= gnomehack libxml2 gtk20
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ XMLCATALOG="$(LOCALBASE)/share/xml/catalog.ports"
PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 15a43ced64e2..b10030f1575c 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libglade-2.4.0.tar.bz2) = c8367c58b2f2c98b76ca0667f0f13bf5
-SIZE (gnome2/libglade-2.4.0.tar.bz2) = 310334
+MD5 (gnome2/libglade-2.4.1.tar.bz2) = add87e5aef7d8a9ebb468bc0e4044440
+SIZE (gnome2/libglade-2.4.1.tar.bz2) = 317285
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index 871dc70e05ac..48724e9e9200 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon May 17 12:30:40 2004
-+++ Makefile.in Mon May 17 12:31:44 2004
+--- Makefile.in.orig Mon Nov 29 15:14:24 2004
++++ Makefile.in Mon Nov 29 15:14:24 2004
@@ -22,7 +22,7 @@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -9,7 +9,7 @@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -229,7 +229,7 @@
+@@ -250,7 +250,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -18,12 +18,3 @@
INCLUDES = $(LIBGLADE_CFLAGS)
# build documentation when doing a distcheck.
-@@ -241,7 +241,7 @@
- test_libglade_SOURCES = test-libglade.c
-
- # handling of the XML catalog
--XMLCATALOG = /etc/xml/catalog
-+XMLCATALOG = $(LOCALBASE)/share/xml/catalog.ports
- xmldir = $(datadir)/xml/libglade
- xml_DATA = glade-2.0.dtd
- EXTRA_DIST = \
diff --git a/devel/libglade2/files/patch-configure b/devel/libglade2/files/patch-configure
deleted file mode 100644
index 388dd58bf14b..000000000000
--- a/devel/libglade2/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure 2002/04/26 09:41:08 1.1
-+++ configure 2002/04/26 09:41:27
-@@ -7406,6 +7406,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'