summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/gnome-vfs/Makefile6
-rw-r--r--devel/gnome-vfs/files/patch-aa20
-rw-r--r--devel/gnome-vfs/files/patch-ab12
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in15
-rw-r--r--devel/gnome-vfs/pkg-plist1
-rw-r--r--devel/gnomevfs2/Makefile6
-rw-r--r--devel/gnomevfs2/files/patch-aa20
-rw-r--r--devel/gnomevfs2/files/patch-ab12
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in15
-rw-r--r--devel/gnomevfs2/pkg-plist1
10 files changed, 90 insertions, 18 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 12d32165e..e11265bde 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.1.3
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.1
@@ -15,6 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
@@ -34,7 +36,9 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
+ @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
's|\@datadir\@/gnome|\@datadir\@|g'
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/libgnomevfs/Makefile.in
.include <bsd.port.mk>
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 581eef353..8cb4f90e3 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,5 +1,23 @@
--- configure.orig Sat Nov 2 03:18:30 2002
-+++ configure Sat Nov 9 03:35:18 2002
++++ configure Wed Nov 13 13:33:48 2002
+@@ -261,7 +261,7 @@
+ : ${ac_max_here_lines=38}
+
+ ac_unique_file="libgnomevfs/gnome-vfs.h"
+-ac_subdirs_all="$ac_subdirs_all gob"
++ac_subdirs_all="$ac_subdirs_all"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -1666,7 +1666,7 @@
+
+ touch NOINST_GOB
+
+-subdirs="$subdirs gob"
++subdirs="$subdirs"
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
@@ -7268,6 +7268,7 @@
# This can be used to rebuild libtool when needed
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index 5b0347024..dbbed495f 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,6 +1,12 @@
---- Makefile.in.orig Fri Sep 6 02:29:04 2002
-+++ Makefile.in Fri Sep 6 02:29:27 2002
-@@ -183,7 +183,6 @@
+--- Makefile.in.orig Wed Nov 13 13:29:42 2002
++++ Makefile.in Wed Nov 13 13:33:11 2002
+@@ -171,13 +171,11 @@
+ SUBDIRS_GNOME = monikers doc schemas
+
+ SUBDIRS = \
+- gob \
+ libgnomevfs \
+ modules \
schemas \
devel-docs \
doc \
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index b27e7e217..a013d0a77 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,6 +1,6 @@
---- libgnomevfs/Makefile.in.orig Fri Sep 6 02:29:53 2002
-+++ libgnomevfs/Makefile.in Fri Sep 6 02:30:42 2002
-@@ -329,7 +329,7 @@
+--- libgnomevfs/Makefile.in.orig Wed Nov 13 13:29:42 2002
++++ libgnomevfs/Makefile.in Wed Nov 13 13:32:39 2002
+@@ -335,7 +335,7 @@
# Platform specific includes
@@ -9,3 +9,12 @@
libgnomevfsplatforminclude_HEADERS = \
gnome-vfs-file-size.h
+@@ -935,7 +935,7 @@
+
+
+ %.c %.h: %.gob
+- $(top_srcdir)/gob/src/gob2 $<
++ %%LOCALBASE%%/bin/gob2 $<
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 6ccb8380b..f7e06f449 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -86,7 +86,6 @@ lib/vfs/2.0/extfs/zoo
libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
libdata/pkgconfig/gnome-vfs-2.0.pc
libdata/pkgconfig/gnome-vfs-module-2.0.pc
-share/aclocal/gob2.m4
share/doc/gnome-vfs-2.0/advanced-operations.html
share/doc/gnome-vfs-2.0/c9746.html
share/doc/gnome-vfs-2.0/data-types.html
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 12d32165e..e11265bde 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.1.3
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.1
@@ -15,6 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
@@ -34,7 +36,9 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
+ @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
's|\@datadir\@/gnome|\@datadir\@|g'
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/libgnomevfs/Makefile.in
.include <bsd.port.mk>
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 581eef353..8cb4f90e3 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,5 +1,23 @@
--- configure.orig Sat Nov 2 03:18:30 2002
-+++ configure Sat Nov 9 03:35:18 2002
++++ configure Wed Nov 13 13:33:48 2002
+@@ -261,7 +261,7 @@
+ : ${ac_max_here_lines=38}
+
+ ac_unique_file="libgnomevfs/gnome-vfs.h"
+-ac_subdirs_all="$ac_subdirs_all gob"
++ac_subdirs_all="$ac_subdirs_all"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -1666,7 +1666,7 @@
+
+ touch NOINST_GOB
+
+-subdirs="$subdirs gob"
++subdirs="$subdirs"
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
@@ -7268,6 +7268,7 @@
# This can be used to rebuild libtool when needed
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index 5b0347024..dbbed495f 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,6 +1,12 @@
---- Makefile.in.orig Fri Sep 6 02:29:04 2002
-+++ Makefile.in Fri Sep 6 02:29:27 2002
-@@ -183,7 +183,6 @@
+--- Makefile.in.orig Wed Nov 13 13:29:42 2002
++++ Makefile.in Wed Nov 13 13:33:11 2002
+@@ -171,13 +171,11 @@
+ SUBDIRS_GNOME = monikers doc schemas
+
+ SUBDIRS = \
+- gob \
+ libgnomevfs \
+ modules \
schemas \
devel-docs \
doc \
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index b27e7e217..a013d0a77 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,6 +1,6 @@
---- libgnomevfs/Makefile.in.orig Fri Sep 6 02:29:53 2002
-+++ libgnomevfs/Makefile.in Fri Sep 6 02:30:42 2002
-@@ -329,7 +329,7 @@
+--- libgnomevfs/Makefile.in.orig Wed Nov 13 13:29:42 2002
++++ libgnomevfs/Makefile.in Wed Nov 13 13:32:39 2002
+@@ -335,7 +335,7 @@
# Platform specific includes
@@ -9,3 +9,12 @@
libgnomevfsplatforminclude_HEADERS = \
gnome-vfs-file-size.h
+@@ -935,7 +935,7 @@
+
+
+ %.c %.h: %.gob
+- $(top_srcdir)/gob/src/gob2 $<
++ %%LOCALBASE%%/bin/gob2 $<
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 6ccb8380b..f7e06f449 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -86,7 +86,6 @@ lib/vfs/2.0/extfs/zoo
libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
libdata/pkgconfig/gnome-vfs-2.0.pc
libdata/pkgconfig/gnome-vfs-module-2.0.pc
-share/aclocal/gob2.m4
share/doc/gnome-vfs-2.0/advanced-operations.html
share/doc/gnome-vfs-2.0/c9746.html
share/doc/gnome-vfs-2.0/data-types.html
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 12:03:15 +0800