summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2000-08-04 01:34:38 +0000
committerAde Lovett <ade@FreeBSD.org>2000-08-04 01:34:38 +0000
commit9594f3f8939f5178057c6a588135f0bab6d52511 (patch)
tree923d26a5ec2be934317cf261a38183917c93fe7a /www
parentgaspell needs textproc/aspell to build, as well as run (diff)
Extensive patchfile cleanups using sobomax's wonderful
post-extract rule
Notes
Notes: svn path=/head/; revision=31296
Diffstat (limited to 'www')
-rw-r--r--www/gtkhtml/Makefile9
-rw-r--r--www/gtkhtml/files/patch-ad14
-rw-r--r--www/gtkhtml3/Makefile9
-rw-r--r--www/gtkhtml3/files/patch-ad14
-rw-r--r--www/gtkhtml38/Makefile9
-rw-r--r--www/gtkhtml38/files/patch-ad14
-rw-r--r--www/libgtkhtml/Makefile9
-rw-r--r--www/libgtkhtml/files/patch-ad14
-rw-r--r--www/peacock/Makefile7
9 files changed, 95 insertions, 4 deletions
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
- gconf.8:${PORTSDIR}/devel/gconf
+ gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -31,4 +31,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/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/gtkhtml/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ if (gconf_is_initialized ()) {
+- gconf_client = gconf_client_new ();
++ gconf_client = gconf_client_get_default ();
+ if (!gconf_client)
+--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
++++ capplet/main.c Wed Aug 2 15:40:19 2000
+@@ -197,3 +197,3 @@
+
+- client = gconf_client_new ();
++ client = gconf_client_get_default ();
+ gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
- gconf.8:${PORTSDIR}/devel/gconf
+ gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -31,4 +31,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/www/gtkhtml3/files/patch-ad b/www/gtkhtml3/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/gtkhtml3/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ if (gconf_is_initialized ()) {
+- gconf_client = gconf_client_new ();
++ gconf_client = gconf_client_get_default ();
+ if (!gconf_client)
+--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
++++ capplet/main.c Wed Aug 2 15:40:19 2000
+@@ -197,3 +197,3 @@
+
+- client = gconf_client_new ();
++ client = gconf_client_get_default ();
+ gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
- gconf.8:${PORTSDIR}/devel/gconf
+ gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -31,4 +31,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/www/gtkhtml38/files/patch-ad b/www/gtkhtml38/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/gtkhtml38/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ if (gconf_is_initialized ()) {
+- gconf_client = gconf_client_new ();
++ gconf_client = gconf_client_get_default ();
+ if (!gconf_client)
+--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
++++ capplet/main.c Wed Aug 2 15:40:19 2000
+@@ -197,3 +197,3 @@
+
+- client = gconf_client_new ();
++ client = gconf_client_get_default ();
+ gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
- gconf.8:${PORTSDIR}/devel/gconf
+ gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -31,4 +31,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/www/libgtkhtml/files/patch-ad b/www/libgtkhtml/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/libgtkhtml/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ if (gconf_is_initialized ()) {
+- gconf_client = gconf_client_new ();
++ gconf_client = gconf_client_get_default ();
+ if (!gconf_client)
+--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
++++ capplet/main.c Wed Aug 2 15:40:19 2000
+@@ -197,3 +197,3 @@
+
+- client = gconf_client_new ();
++ client = gconf_client_get_default ();
+ gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index c7c613af7ec6..50911a02c15c 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -26,4 +26,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
GTK_CONFIG="${GTK_CONFIG}"
+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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 15:18:28 +0000