diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:34:38 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:34:38 +0000 |
| commit | 9594f3f8939f5178057c6a588135f0bab6d52511 (patch) | |
| tree | 923d26a5ec2be934317cf261a38183917c93fe7a /devel/gnomevfs2 | |
| parent | gaspell 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 'devel/gnomevfs2')
| -rw-r--r-- | devel/gnomevfs2/Makefile | 9 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-aa | 9 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-ac | 20 | ||||
| -rw-r--r-- | devel/gnomevfs2/pkg-plist | 1 |
4 files changed, 23 insertions, 16 deletions
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 96c899f3be6b..d461a53f3c15 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 743135715f12..1c45a532c432 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 7be0be993a1f..dfe39cf495c7 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 9b0008727408..4693bda125fd 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 |