aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/gnome-vfs/Makefile6
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c11
-rw-r--r--devel/gnomevfs2/Makefile6
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c11
-rw-r--r--misc/shared-mime-info/Makefile5
-rw-r--r--misc/shared-mime-info/files/patch-update-mime-database.c13
-rw-r--r--misc/shared-mime-info/pkg-plist11
-rw-r--r--x11-toolkits/gtk20/Makefile4
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c11
-rw-r--r--x11-toolkits/gtk30/Makefile4
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c11
11 files changed, 83 insertions, 10 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 5b79b7171707..55a2134cf8b1 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.6.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6
@@ -83,8 +83,10 @@ post-patch:
's|\@datadir\@/gnome|\@datadir\@|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/libgnomevfs/Makefile.in \
- ${WRKSRC}/libgnomevfs/xdgmime.c \
${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+ s|%%X11BASE%%|${X11BASE}|g' \
+ ${WRKSRC}/libgnomevfs/xdgmime.c
.if !defined(WITHOUT_KDE_MENUS)
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
new file mode 100644
index 000000000000..213ed03ece45
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004
++++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004
+@@ -97,7 +97,7 @@
+
+ xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+ if (xdg_data_dirs == NULL)
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
+
+ ptr = xdg_data_dirs;
+
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 5b79b7171707..55a2134cf8b1 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.6.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6
@@ -83,8 +83,10 @@ post-patch:
's|\@datadir\@/gnome|\@datadir\@|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/libgnomevfs/Makefile.in \
- ${WRKSRC}/libgnomevfs/xdgmime.c \
${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+ s|%%X11BASE%%|${X11BASE}|g' \
+ ${WRKSRC}/libgnomevfs/xdgmime.c
.if !defined(WITHOUT_KDE_MENUS)
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
new file mode 100644
index 000000000000..213ed03ece45
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004
++++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004
+@@ -97,7 +97,7 @@
+
+ xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+ if (xdg_data_dirs == NULL)
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
+
+ ptr = xdg_data_dirs;
+
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 8048738638bf..bfed1195e114 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -6,7 +6,7 @@
PORTNAME= shared-mime-info
PORTVERSION= 0.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc gnome
MASTER_SITES= http://www.freedesktop.org/software/shared-mime-info/
DISTNAME= shared-mime-info-${PORTVERSION}
@@ -21,7 +21,8 @@ USE_GNOME= glib20 libxml2 intltool gnomehack
MAN1= update-mime-database.1
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+ s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/update-mime-database.c
.include <bsd.port.mk>
diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c
index 31465c2972e8..b7f0459abec4 100644
--- a/misc/shared-mime-info/files/patch-update-mime-database.c
+++ b/misc/shared-mime-info/files/patch-update-mime-database.c
@@ -1,5 +1,5 @@
---- update-mime-database.c.orig Mon Oct 13 11:43:38 2003
-+++ update-mime-database.c Mon Apr 12 22:45:01 2004
+--- update-mime-database.c.orig Mon Oct 13 05:43:38 2003
++++ update-mime-database.c Wed Jun 23 20:13:10 2004
@@ -377,7 +377,8 @@
}
}
@@ -10,3 +10,12 @@
}
/* 'node' is a <mime-type> node from a source file, whose type is 'type'.
+@@ -1330,7 +1331,7 @@
+
+ env = getenv("XDG_DATA_DIRS");
+ if (!env)
+- env = "/usr/local/share/:/usr/share/";
++ env = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
+ dirs = g_strsplit(env, ":", 0);
+ g_return_if_fail(dirs != NULL);
+ for (n = 0; dirs[n]; n++)
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index e14b41d062fe..0307200c3ae6 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -397,3 +397,14 @@ share/mime/video/x-sgi-movie.xml
@unexec rmdir %D/share/mime/audio 2>/dev/null || true
@unexec rmdir %D/share/mime/application 2>/dev/null || true
@unexec rmdir %D/share/mime 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/video 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/text 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/packages 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/multipart 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/model 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/message 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/inode 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/image 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/audio 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime/application 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/mime 2>/dev/null || true
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 9acc0c1e6219..e14465dcd511 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk
PORTVERSION= 2.4.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \
ftp://ftp.gtk.org/pub/gtk/v2.3/ \
@@ -66,7 +67,8 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+ s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/gtk/xdgmime/xdgmime.c
pre-build:
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
new file mode 100644
index 000000000000..14804bd2e143
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
@@ -0,0 +1,11 @@
+--- gtk/xdgmime/xdgmime.c.orig Wed Jun 23 20:19:43 2004
++++ gtk/xdgmime/xdgmime.c Wed Jun 23 20:19:56 2004
+@@ -98,7 +98,7 @@
+
+ xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+ if (xdg_data_dirs == NULL)
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
+
+ ptr = xdg_data_dirs;
+
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 9acc0c1e6219..e14465dcd511 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk
PORTVERSION= 2.4.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \
ftp://ftp.gtk.org/pub/gtk/v2.3/ \
@@ -66,7 +67,8 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+ s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/gtk/xdgmime/xdgmime.c
pre-build:
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
new file mode 100644
index 000000000000..14804bd2e143
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
@@ -0,0 +1,11 @@
+--- gtk/xdgmime/xdgmime.c.orig Wed Jun 23 20:19:43 2004
++++ gtk/xdgmime/xdgmime.c Wed Jun 23 20:19:56 2004
+@@ -98,7 +98,7 @@
+
+ xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+ if (xdg_data_dirs == NULL)
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
+
+ ptr = xdg_data_dirs;
+
generated by cgit (git 2.34.1) at 2024-11-23 05:58:18 +0800