aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2000-08-04 09:28:54 +0800
committerade <ade@FreeBSD.org>2000-08-04 09:28:54 +0800
commit00338ae52ccab442ae0ddb57fc0eb55f04348ddb (patch)
treea06a062183ad88b1008d4d6b1c741126001c1d71
parentc05ee0797cfb83fa7e411ab6ea22e72e0d94ed6d (diff)
downloadfreebsd-ports-graphics-00338ae52ccab442ae0ddb57fc0eb55f04348ddb.tar.gz
freebsd-ports-graphics-00338ae52ccab442ae0ddb57fc0eb55f04348ddb.tar.zst
freebsd-ports-graphics-00338ae52ccab442ae0ddb57fc0eb55f04348ddb.zip
Update to 0.7
-rw-r--r--devel/gconf/Makefile11
-rw-r--r--devel/gconf/distinfo2
-rw-r--r--devel/gconf/files/patch-ab22
-rw-r--r--devel/gconf/pkg-plist56
-rw-r--r--devel/gconf2/Makefile11
-rw-r--r--devel/gconf2/distinfo2
-rw-r--r--devel/gconf2/files/patch-ab22
-rw-r--r--devel/gconf2/pkg-plist56
8 files changed, 114 insertions, 68 deletions
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 9234b54663f..d80a3fac77b 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gconf
-PORTVERSION= 0.5
+PORTVERSION= 0.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/GConf
@@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
xml.5:${PORTSDIR}/textproc/libxml \
popt.0:${PORTSDIR}/devel/popt \
- guile.6:${PORTSDIR}/lang/guile \
+ guile.9:${PORTSDIR}/lang/guile \
oaf.0:${PORTSDIR}/devel/oaf
RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
@@ -35,4 +35,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
+post-extract:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
.include <bsd.port.mk>
diff --git a/devel/gconf/distinfo b/devel/gconf/distinfo
index 8e6c4205b09..61240186ba1 100644
--- a/devel/gconf/distinfo
+++ b/devel/gconf/distinfo
@@ -1 +1 @@
-MD5 (GConf-0.5.tar.gz) = 9dc7c3c9626fa7ccefbac4cb9954d504
+MD5 (GConf-0.7.tar.gz) = d1b2dfb286dffa3a157ebb551f3be6a3
diff --git a/devel/gconf/files/patch-ab b/devel/gconf/files/patch-ab
index 80701815e47..c255f32cf50 100644
--- a/devel/gconf/files/patch-ab
+++ b/devel/gconf/files/patch-ab
@@ -1,11 +1,13 @@
---- Makefile.in.orig Thu Mar 9 14:41:56 2000
-+++ Makefile.in Wed Jul 5 14:45:58 2000
-@@ -131,7 +131,7 @@
+--- Makefile.in.orig Wed Aug 2 13:25:19 2000
++++ Makefile.in Wed Aug 2 13:26:26 2000
+@@ -435,8 +435,8 @@
+ echo "**************"
- bin_SCRIPTS = gconf-config
-
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
- m4data_DATA = gconf.m4
-
- EXTRA_DIST = gconf-config.in gconf.m4
+ install-data-local:
+- -mkdir -p $(datadir)/aclocal
+- $(INSTALL_DATA) gconf.m4 $(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
++ -mkdir -p $(prefix)/share/aclocal
++ $(INSTALL_DATA) gconf.m4 $(prefix)/share/aclocal/gconf-$(MAJOR_VERSION).m4
+ echo "**** NOTE ****" && \
+ echo $(WARNING_MESSAGE) && \
+ echo "**************"
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index 57efbd4f5f5..cd5ad401d33 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -1,44 +1,58 @@
bin/gconf-config
-bin/gconfd
+bin/gconf-config-1
+bin/gconfd-1
bin/gconftool
+bin/gconftool-1
+etc/gconf/1/path.example
etc/gconf/gconf.xml.defaults/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/standard/%gconf.xml
-etc/gconf/path.example
etc/gconf/schemas/desktop.schemas
-include/gconf/gconf-backend.h
-include/gconf/gconf-changeset.h
-include/gconf/gconf-client.h
-include/gconf/gconf-engine.h
-include/gconf/gconf-error.h
-include/gconf/gconf-listeners.h
-include/gconf/gconf-schema.h
-include/gconf/gconf-value.h
-include/gconf/gconf.h
-lib/gconf/libgconfbackend-xml.so
-lib/libgconf-gtk.a
-lib/libgconf-gtk.so
-lib/libgconf-gtk.so.1
-lib/libgconf.a
-lib/libgconf.so
-lib/libgconf.so.8
-share/aclocal/gconf.m4
-share/gnome/oaf/gconfd.oafinfo
+include/gconf/1/gconf/gconf-backend.h
+include/gconf/1/gconf/gconf-changeset.h
+include/gconf/1/gconf/gconf-client.h
+include/gconf/1/gconf/gconf-engine.h
+include/gconf/1/gconf/gconf-error.h
+include/gconf/1/gconf/gconf-listeners.h
+include/gconf/1/gconf/gconf-schema.h
+include/gconf/1/gconf/gconf-value.h
+include/gconf/1/gconf/gconf.h
+lib/GConf/1/libgconfbackend-xml.so
+lib/libgconf-1.a
+lib/libgconf-1.so
+lib/libgconf-1.so.0
+lib/libgconf-gtk-1.a
+lib/libgconf-gtk-1.so
+lib/libgconf-gtk-1.so.0
+share/aclocal/gconf-1.m4
+share/gnome/oaf/gconfd-1.oafinfo
+share/locale/ca/LC_MESSAGES/GConf.mo
share/locale/cs/LC_MESSAGES/GConf.mo
share/locale/da/LC_MESSAGES/GConf.mo
+share/locale/de/LC_MESSAGES/GConf.mo
share/locale/el/LC_MESSAGES/GConf.mo
+share/locale/fi/LC_MESSAGES/GConf.mo
share/locale/fr/LC_MESSAGES/GConf.mo
+share/locale/ga/LC_MESSAGES/GConf.mo
+share/locale/ja/LC_MESSAGES/GConf.mo
share/locale/no/LC_MESSAGES/GConf.mo
share/locale/pt_BR/LC_MESSAGES/GConf.mo
+share/locale/ru/LC_MESSAGES/GConf.mo
share/locale/sv/LC_MESSAGES/GConf.mo
+share/locale/tr/LC_MESSAGES/GConf.mo
share/locale/uk/LC_MESSAGES/GConf.mo
+@dirrm share/gnome/gconf/1
@dirrm share/gnome/gconf
-@dirrm lib/gconf
+@dirrm lib/GConf/1
+@dirrm lib/GConf
+@dirrm include/gconf/1/gconf
+@dirrm include/gconf/1
@dirrm include/gconf
@dirrm etc/gconf/schemas
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/standard
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
@dirrm etc/gconf/gconf.xml.defaults/schemas
@dirrm etc/gconf/gconf.xml.defaults
+@dirrm etc/gconf/1
@dirrm etc/gconf
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 9234b54663f..d80a3fac77b 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gconf
-PORTVERSION= 0.5
+PORTVERSION= 0.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/GConf
@@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
xml.5:${PORTSDIR}/textproc/libxml \
popt.0:${PORTSDIR}/devel/popt \
- guile.6:${PORTSDIR}/lang/guile \
+ guile.9:${PORTSDIR}/lang/guile \
oaf.0:${PORTSDIR}/devel/oaf
RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
@@ -35,4 +35,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
+post-extract:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
.include <bsd.port.mk>
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 8e6c4205b09..61240186ba1 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (GConf-0.5.tar.gz) = 9dc7c3c9626fa7ccefbac4cb9954d504
+MD5 (GConf-0.7.tar.gz) = d1b2dfb286dffa3a157ebb551f3be6a3
diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab
index 80701815e47..c255f32cf50 100644
--- a/devel/gconf2/files/patch-ab
+++ b/devel/gconf2/files/patch-ab
@@ -1,11 +1,13 @@
---- Makefile.in.orig Thu Mar 9 14:41:56 2000
-+++ Makefile.in Wed Jul 5 14:45:58 2000
-@@ -131,7 +131,7 @@
+--- Makefile.in.orig Wed Aug 2 13:25:19 2000
++++ Makefile.in Wed Aug 2 13:26:26 2000
+@@ -435,8 +435,8 @@
+ echo "**************"
- bin_SCRIPTS = gconf-config
-
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
- m4data_DATA = gconf.m4
-
- EXTRA_DIST = gconf-config.in gconf.m4
+ install-data-local:
+- -mkdir -p $(datadir)/aclocal
+- $(INSTALL_DATA) gconf.m4 $(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
++ -mkdir -p $(prefix)/share/aclocal
++ $(INSTALL_DATA) gconf.m4 $(prefix)/share/aclocal/gconf-$(MAJOR_VERSION).m4
+ echo "**** NOTE ****" && \
+ echo $(WARNING_MESSAGE) && \
+ echo "**************"
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 57efbd4f5f5..cd5ad401d33 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -1,44 +1,58 @@
bin/gconf-config
-bin/gconfd
+bin/gconf-config-1
+bin/gconfd-1
bin/gconftool
+bin/gconftool-1
+etc/gconf/1/path.example
etc/gconf/gconf.xml.defaults/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/standard/%gconf.xml
-etc/gconf/path.example
etc/gconf/schemas/desktop.schemas
-include/gconf/gconf-backend.h
-include/gconf/gconf-changeset.h
-include/gconf/gconf-client.h
-include/gconf/gconf-engine.h
-include/gconf/gconf-error.h
-include/gconf/gconf-listeners.h
-include/gconf/gconf-schema.h
-include/gconf/gconf-value.h
-include/gconf/gconf.h
-lib/gconf/libgconfbackend-xml.so
-lib/libgconf-gtk.a
-lib/libgconf-gtk.so
-lib/libgconf-gtk.so.1
-lib/libgconf.a
-lib/libgconf.so
-lib/libgconf.so.8
-share/aclocal/gconf.m4
-share/gnome/oaf/gconfd.oafinfo
+include/gconf/1/gconf/gconf-backend.h
+include/gconf/1/gconf/gconf-changeset.h
+include/gconf/1/gconf/gconf-client.h
+include/gconf/1/gconf/gconf-engine.h
+include/gconf/1/gconf/gconf-error.h
+include/gconf/1/gconf/gconf-listeners.h
+include/gconf/1/gconf/gconf-schema.h
+include/gconf/1/gconf/gconf-value.h
+include/gconf/1/gconf/gconf.h
+lib/GConf/1/libgconfbackend-xml.so
+lib/libgconf-1.a
+lib/libgconf-1.so
+lib/libgconf-1.so.0
+lib/libgconf-gtk-1.a
+lib/libgconf-gtk-1.so
+lib/libgconf-gtk-1.so.0
+share/aclocal/gconf-1.m4
+share/gnome/oaf/gconfd-1.oafinfo
+share/locale/ca/LC_MESSAGES/GConf.mo
share/locale/cs/LC_MESSAGES/GConf.mo
share/locale/da/LC_MESSAGES/GConf.mo
+share/locale/de/LC_MESSAGES/GConf.mo
share/locale/el/LC_MESSAGES/GConf.mo
+share/locale/fi/LC_MESSAGES/GConf.mo
share/locale/fr/LC_MESSAGES/GConf.mo
+share/locale/ga/LC_MESSAGES/GConf.mo
+share/locale/ja/LC_MESSAGES/GConf.mo
share/locale/no/LC_MESSAGES/GConf.mo
share/locale/pt_BR/LC_MESSAGES/GConf.mo
+share/locale/ru/LC_MESSAGES/GConf.mo
share/locale/sv/LC_MESSAGES/GConf.mo
+share/locale/tr/LC_MESSAGES/GConf.mo
share/locale/uk/LC_MESSAGES/GConf.mo
+@dirrm share/gnome/gconf/1
@dirrm share/gnome/gconf
-@dirrm lib/gconf
+@dirrm lib/GConf/1
+@dirrm lib/GConf
+@dirrm include/gconf/1/gconf
+@dirrm include/gconf/1
@dirrm include/gconf
@dirrm etc/gconf/schemas
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/standard
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
@dirrm etc/gconf/gconf.xml.defaults/schemas
@dirrm etc/gconf/gconf.xml.defaults
+@dirrm etc/gconf/1
@dirrm etc/gconf