summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/dryad/Makefile7
-rw-r--r--devel/gide/Makefile9
-rw-r--r--devel/gide/files/patch-bc65
-rw-r--r--devel/gide/files/patch-bd9
-rw-r--r--devel/gnome-vfs/Makefile9
-rw-r--r--devel/gnome-vfs/files/patch-aa9
-rw-r--r--devel/gnome-vfs/files/patch-ac20
-rw-r--r--devel/gnome-vfs/pkg-plist1
-rw-r--r--devel/gnome-vfs1/Makefile9
-rw-r--r--devel/gnome-vfs1/files/patch-aa9
-rw-r--r--devel/gnome-vfs1/files/patch-ac20
-rw-r--r--devel/gnome-vfs1/pkg-plist1
-rw-r--r--devel/gnomedebug/Makefile7
-rw-r--r--devel/gnomevfs/Makefile9
-rw-r--r--devel/gnomevfs/files/patch-aa9
-rw-r--r--devel/gnomevfs/files/patch-ac20
-rw-r--r--devel/gnomevfs/pkg-plist1
-rw-r--r--devel/gnomevfs2/Makefile9
-rw-r--r--devel/gnomevfs2/files/patch-aa9
-rw-r--r--devel/gnomevfs2/files/patch-ac20
-rw-r--r--devel/gnomevfs2/pkg-plist1
21 files changed, 114 insertions, 139 deletions
diff --git a/devel/dryad/Makefile b/devel/dryad/Makefile
index 9c901b6..efa3437 100644
--- a/devel/dryad/Makefile
+++ b/devel/dryad/Makefile
@@ -30,4 +30,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
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/gide/Makefile b/devel/gide/Makefile
index 5ea2dc2..698ce4c 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
glade.4:${PORTSDIR}/devel/libglade \
- guile.6:${PORTSDIR}/lang/guile
+ guile.9:${PORTSDIR}/lang/guile
RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -33,6 +33,13 @@ MAN1= gide.1 gdbio.1
PLIST_SUB= VERSION=${PORTVERSION}
+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'
+
post-patch:
@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c
diff --git a/devel/gide/files/patch-bc b/devel/gide/files/patch-bc
index ac3c8f6..f57ce5a 100644
--- a/devel/gide/files/patch-bc
+++ b/devel/gide/files/patch-bc
@@ -1,14 +1,5 @@
--- plugins/asciitable/Makefile.in.orig Sun May 14 10:11:31 2000
+++ plugins/asciitable/Makefile.in Tue Jun 13 17:35:48 2000
-@@ -147,7 +147,7 @@
-
- libgide_asciitable_la_SOURCES = plugin_asciitable.c
-
--INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
@@ -157,7 +157,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -20,15 +11,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/browser/Makefile.in.orig Sun May 14 10:11:35 2000
+++ plugins/browser/Makefile.in Tue Jun 13 17:35:54 2000
-@@ -150,7 +150,7 @@
-
- libgide_browser_la_SOURCES = plugin_browser.c
-
--INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- libgide_browser_la_LIBADD = GtkSCB/libGtkSCB.la
@@ -163,7 +163,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -40,15 +22,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/calculator/Makefile.in.orig Sun May 14 10:11:33 2000
+++ plugins/calculator/Makefile.in Tue Jun 13 17:36:01 2000
-@@ -147,7 +147,7 @@
-
- libgide_calculator_la_SOURCES = plugin_calculator.c
-
--INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
@@ -157,7 +157,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -60,15 +33,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/docstat/Makefile.in.orig Sun May 14 10:11:34 2000
+++ plugins/docstat/Makefile.in Tue Jun 13 17:36:08 2000
-@@ -147,7 +147,7 @@
-
- libgide_docstat_la_SOURCES = plugin_docstat.c
-
--INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
@@ -157,7 +157,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -80,15 +44,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/sample/Makefile.in.orig Sun May 14 10:11:29 2000
+++ plugins/sample/Makefile.in Tue Jun 13 17:36:15 2000
-@@ -153,7 +153,7 @@
-
- libgide_sample_la_SOURCES = plugin-sample.c
-
--INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
@@ -163,7 +163,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -100,15 +55,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/text/Makefile.in.orig Sun May 14 10:11:32 2000
+++ plugins/text/Makefile.in Tue Jun 13 17:36:23 2000
-@@ -148,7 +148,7 @@
- libgide_text_la_SOURCES = plugin_text.c plugin_text_insert.c plugin_text_delete.c plugin_text_replace.c plugin_text_insert.h plugin_text_delete.h plugin_text_replace.h
-
-
--INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
@@ -158,7 +158,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -118,14 +64,3 @@
libgide_text_la_LIBADD =
libgide_text_la_OBJECTS = plugin_text.lo plugin_text_insert.lo \
plugin_text_delete.lo plugin_text_replace.lo
---- src/dialogs/Makefile.in.orig Sun May 14 10:11:43 2000
-+++ src/dialogs/Makefile.in Tue Jun 13 17:35:25 2000
-@@ -131,7 +131,7 @@
-
- @GTKEDITOR_COMPILE_TRUE@EDITOR_INCLUDES = -I$(srcdir)/../GtkSCText/ -I$(srcdir)/../GtkEditor/
-
--INCLUDES = $(GNOME_INCLUDEDIR) $(EDITOR_INCLUDES) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGIDE_GLADEDIR=\""$(gladedir)"\" -I$(srcdir)/.. -I$(includedir)
-+INCLUDES = $(GNOME_INCLUDEDIR) $(EDITOR_INCLUDES) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGIDE_GLADEDIR=\""$(gladedir)"\" -I$(srcdir)/.. -I$(includedir)
-
-
- noinst_LIBRARIES = libdialogs.a
diff --git a/devel/gide/files/patch-bd b/devel/gide/files/patch-bd
index 4c22424..a9b15c4 100644
--- a/devel/gide/files/patch-bd
+++ b/devel/gide/files/patch-bd
@@ -1,14 +1,5 @@
--- src/Makefile.in.orig Sun May 14 10:11:41 2000
+++ src/Makefile.in Tue Jun 13 17:33:29 2000
-@@ -137,7 +137,7 @@
- # binaries
- bin_PROGRAMS = gide gdbio
-
--CFLAGS = @CFLAGS@ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGIDE_CFGDIR=\"$(pkgdatadir)\" -DGIDE_PLUGINDIR=\"$(libdir)/gide/plugins/$(VERSION)/\"
-+CFLAGS = @CFLAGS@ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGIDE_CFGDIR=\"$(pkgdatadir)\" -DGIDE_PLUGINDIR=\"$(libdir)/gide/plugins/$(VERSION)/\"
-
-
- INCLUDES = $(GNOME_INCLUDEDIR) $(GUILE_INCS) $(EDITOR_INCLUDES) -I$(srcdir)/dialogs
@@ -161,7 +161,7 @@
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 96c899f..d461a53 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- gconf.8:${PORTSDIR}/devel/gconf \
+ gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
+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/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 7431357..1c45a53 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
index 7be0be9..dfe39cf 100644
--- a/devel/gnome-vfs/files/patch-ac
+++ b/devel/gnome-vfs/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
++++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
- libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
+ libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
- libftp_la_OBJECTS = ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
+ libvfs_pipe_la_OBJECTS = pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES =
+ libvfs_translate_la_OBJECTS = translate-method.lo
+-libvefs_la_LDFLAGS =
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 9b00087..4693bda 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 96c899f..d461a53 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- gconf.8:${PORTSDIR}/devel/gconf \
+ gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
+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/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa
index 7431357..1c45a53 100644
--- a/devel/gnome-vfs1/files/patch-aa
+++ b/devel/gnome-vfs1/files/patch-aa
@@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnome-vfs1/files/patch-ac b/devel/gnome-vfs1/files/patch-ac
index 7be0be9..dfe39cf 100644
--- a/devel/gnome-vfs1/files/patch-ac
+++ b/devel/gnome-vfs1/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
++++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
- libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
+ libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
- libftp_la_OBJECTS = ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
+ libvfs_pipe_la_OBJECTS = pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES =
+ libvfs_translate_la_OBJECTS = translate-method.lo
+-libvefs_la_LDFLAGS =
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnome-vfs1/pkg-plist b/devel/gnome-vfs1/pkg-plist
index 9b00087..4693bda 100644
--- a/devel/gnome-vfs1/pkg-plist
+++ b/devel/gnome-vfs1/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop
diff --git a/devel/gnomedebug/Makefile b/devel/gnomedebug/Makefile
index b47bf1b..e8ce9fc 100644
--- a/devel/gnomedebug/Makefile
+++ b/devel/gnomedebug/Makefile
@@ -29,4 +29,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
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/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 96c899f..d461a53 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- gconf.8:${PORTSDIR}/devel/gconf \
+ gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
+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/gnomevfs/files/patch-aa b/devel/gnomevfs/files/patch-aa
index 7431357..1c45a53 100644
--- a/devel/gnomevfs/files/patch-aa
+++ b/devel/gnomevfs/files/patch-aa
@@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnomevfs/files/patch-ac b/devel/gnomevfs/files/patch-ac
index 7be0be9..dfe39cf 100644
--- a/devel/gnomevfs/files/patch-ac
+++ b/devel/gnomevfs/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
++++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
- libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
+ libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
- libftp_la_OBJECTS = ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
+ libvfs_pipe_la_OBJECTS = pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES =
+ libvfs_translate_la_OBJECTS = translate-method.lo
+-libvefs_la_LDFLAGS =
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnomevfs/pkg-plist b/devel/gnomevfs/pkg-plist
index 9b00087..4693bda 100644
--- a/devel/gnomevfs/pkg-plist
+++ b/devel/gnomevfs/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 96c899f..d461a53 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- gconf.8:${PORTSDIR}/devel/gconf \
+ gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
+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/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 7431357..1c45a53 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
index 7be0be9..dfe39cf 100644
--- a/devel/gnomevfs2/files/patch-ac
+++ b/devel/gnomevfs2/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
++++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
- libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
+ libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
- libftp_la_OBJECTS = ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
+ libvfs_pipe_la_OBJECTS = pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES =
+ libvfs_translate_la_OBJECTS = translate-method.lo
+-libvefs_la_LDFLAGS =
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 9b00087..4693bda 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop
OpenPOWER on IntegriCloud