summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-15 06:34:26 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-15 06:34:26 +0800
commitc1133804edc84bec33d055d6f3aeb0dcba7098c1 (patch)
treed3fc562d49495af8c5f60963eeddc885cfef2aa5
parent3965e12acb474ff40a5205e5c4d1de90193b7889 (diff)
downloadmarcuscom-ports-c1133804edc84bec33d055d6f3aeb0dcba7098c1.tar
marcuscom-ports-c1133804edc84bec33d055d6f3aeb0dcba7098c1.tar.gz
marcuscom-ports-c1133804edc84bec33d055d6f3aeb0dcba7098c1.tar.bz2
marcuscom-ports-c1133804edc84bec33d055d6f3aeb0dcba7098c1.tar.lz
marcuscom-ports-c1133804edc84bec33d055d6f3aeb0dcba7098c1.tar.xz
marcuscom-ports-c1133804edc84bec33d055d6f3aeb0dcba7098c1.tar.zst
marcuscom-ports-c1133804edc84bec33d055d6f3aeb0dcba7098c1.zip
Fix the installation of the libglade DTD.
Reported by: Koop Mast <kwm@rainbow-runner.nl> git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1669 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/libglade2/Makefile6
-rw-r--r--devel/libglade2/files/patch-ab13
-rw-r--r--devel/libglade2/pkg-plist2
3 files changed, 19 insertions, 2 deletions
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 7a640e2ed..df5895248 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libglade2
PORTVERSION= 2.3.2
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3
@@ -16,6 +17,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME glade library
+RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+
BUILD_DEPENDS= ${PYEXPAT}
RUN_DEPENDS= ${PYEXPAT}
@@ -32,4 +35,7 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
+ CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
+
.include <bsd.port.mk>
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index ebc6a6880..a09056d33 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Nov 14 12:32:02 2003
-+++ Makefile.in Fri Nov 14 12:32:48 2003
+--- Makefile.in.orig Wed Jan 14 17:20:11 2004
++++ Makefile.in Wed Jan 14 17:23:52 2004
@@ -18,7 +18,7 @@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -18,3 +18,12 @@
INCLUDES = $(LIBGLADE_CFLAGS)
+@@ -188,7 +188,7 @@
+
+
+ # 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
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 85f4a2716..f1b4720d6 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -28,6 +28,8 @@ share/doc/libglade/libglade.devhelp
share/doc/libglade/right.png
share/doc/libglade/up.png
share/xml/libglade/glade-2.0.dtd
+@unexec %%XMLCATALOG%% --noout --del %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
+@exec %%XMLCATALOG%% --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
@dirrm share/xml/libglade
@dirrm share/doc/libglade
@dirrm include/libglade-2.0/glade