aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/bsd.gnome.mk5
-rw-r--r--cad/oregano/files/patch-Makefile.in20
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/drivel/pkg-plist7
-rw-r--r--deskutils/gdesklets/files/patch-data::Makefile.in12
-rw-r--r--deskutils/glabels/files/patch-data_mime_Makefile.in25
-rw-r--r--deskutils/gnochm/files/patch-data-Makefile.in20
-rw-r--r--deskutils/planner/Makefile4
-rw-r--r--net/gnome-netstatus/Makefile4
-rw-r--r--net/gnomenetstatus/Makefile4
-rw-r--r--print/gnome-cups-manager/Makefile3
-rw-r--r--science/gchempaint/Makefile4
-rw-r--r--science/gchemutils/Makefile3
-rw-r--r--www/screem-devel/Makefile4
-rw-r--r--www/screem/Makefile4
-rw-r--r--x11/gdm2/Makefile1
-rw-r--r--x11/gnome-applets/Makefile4
-rw-r--r--x11/gnomeapplets2/Makefile4
18 files changed, 15 insertions, 115 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 3f238d6bd6b9..6d35c61d7b27 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -69,8 +69,13 @@ gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLA
s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \
s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \
s|[(]datadir[)]/gnome/|(datadir)/|g ; \
+ s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
+ s|[(]datadir[)]/mime"|(prefix)/share/mime"|g ; \
+ s|[(]datadir[)]/mime;|(prefix)/share/mime;|g ; \
+ s|[(]datadir[)]/mime$$|(prefix)/share/mime|g ; \
s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
+ s|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g ; \
s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/cad/oregano/files/patch-Makefile.in b/cad/oregano/files/patch-Makefile.in
deleted file mode 100644
index 90d13a8ac214..000000000000
--- a/cad/oregano/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig Fri Nov 26 13:09:27 2004
-+++ Makefile.in Fri Nov 26 18:58:35 2004
-@@ -130,7 +130,7 @@
-
- MIMEFILES = oregano.xml.in
-
--mimedir = $(datadir)/mime/packages
-+mimedir = $(prefix)/share/mime/packages
- mime_DATA = oregano.xml
-
- CLEANFILES = $(mime_DATA)
-@@ -527,7 +527,7 @@
- @INTLTOOL_XML_RULE@
-
- install-data-hook:
--@UPDATE_MIME_TRUE@ update-mime-database $(datadir)/mime
-+@UPDATE_MIME_TRUE@ update-mime-database $(prefix)/share/mime
- @UPDATE_MIME_FALSE@ @true
-
- oregano.keys: oregano.keys.in Makefile
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 41070ae3d2b5..eeb2506db466 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drivel
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 81fc60aec9de..7c48a4473742 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -7,8 +7,6 @@ share/gnome/help/drivel/C/drivel.xml
share/gnome/help/drivel/C/legal.xml
share/gnome/mime-info/drivel.keys
share/gnome/mime-info/drivel.mime
-share/gnome/mime/application/x-drivel.xml
-share/gnome/mime/packages/drivel.xml
share/gnome/omf/drivel/drivel-C.omf
share/gnome/pixmaps/drivel/checkbutton.xpm
share/gnome/pixmaps/drivel/combobox.xpm
@@ -48,11 +46,14 @@ share/locale/sr/LC_MESSAGES/drivel.mo
share/locale/sr@Latn/LC_MESSAGES/drivel.mo
share/locale/sv/LC_MESSAGES/drivel.mo
share/locale/zh_CN/LC_MESSAGES/drivel.mo
+share/mime/application/x-drivel.xml
+share/mime/packages/drivel.xml
@dirrm share/gnome/pixmaps/drivel
-@dirrm share/gnome/mime 2>/dev/null || true
@dirrm share/gnome/omf/drivel
@dirrm share/gnome/help/drivel/C
@dirrm share/gnome/help/drivel
@dirrm share/gnome/drivel/languages
@dirrm share/gnome/drivel/glade
@dirrm share/gnome/drivel
+@exec update-mime-database %D/share/mime
+@unexec update-mime-database %D/share/mime
diff --git a/deskutils/gdesklets/files/patch-data::Makefile.in b/deskutils/gdesklets/files/patch-data::Makefile.in
index 06dc56bff218..a7af22eb6e72 100644
--- a/deskutils/gdesklets/files/patch-data::Makefile.in
+++ b/deskutils/gdesklets/files/patch-data::Makefile.in
@@ -1,12 +1,6 @@
---- data/Makefile.in.orig Mon Nov 15 01:17:16 2004
-+++ data/Makefile.in Mon Nov 15 01:18:12 2004
-@@ -165,12 +165,12 @@
- desktop_in_files = gdesklets.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
--sharedmimedir = $(datadir)/mime
-+sharedmimedir = $(prefix)/share/mime
- sharedmimepackagedir = $(sharedmimedir)/packages
+--- data/Makefile.in.orig Mon Dec 20 17:28:59 2004
++++ data/Makefile.in Mon Dec 20 17:29:43 2004
+@@ -170,7 +170,7 @@
sharedmimepackage_in_files = gdesklets.xml.in
sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
diff --git a/deskutils/glabels/files/patch-data_mime_Makefile.in b/deskutils/glabels/files/patch-data_mime_Makefile.in
deleted file mode 100644
index 3182724727cf..000000000000
--- a/deskutils/glabels/files/patch-data_mime_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/mime/Makefile.in.orig Tue Aug 10 20:59:17 2004
-+++ data/mime/Makefile.in Tue Aug 10 21:10:15 2004
-@@ -151,7 +151,7 @@
- appdir = $(datadir)/application-registry
- app_DATA = glabels.applications
-
--newmimedir = $(datadir)/mime/packages
-+newmimedir = $(prefix)/share/mime/packages
- newmime_DATA = $(xml_files)
-
- EXTRA_DIST = \
-@@ -331,11 +331,11 @@
- @INTLTOOL_XML_RULE@
-
- install-data-hook:
--@HAVE_NEW_MIME_TRUE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-+@HAVE_NEW_MIME_TRUE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(prefix)/share/mime"
- @HAVE_NEWER_MIME_TRUE@ $(UPDATE_DESKTOP_DATABASE)
-
- uninstall-hook:
--@HAVE_NEW_MIME_TRUE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-+@HAVE_NEW_MIME_TRUE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(prefix)/share/mime"
- @HAVE_NEWER_MIME_TRUE@ $(UPDATE_DESKTOP_DATABASE)
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/deskutils/gnochm/files/patch-data-Makefile.in b/deskutils/gnochm/files/patch-data-Makefile.in
deleted file mode 100644
index 8b2ae596d812..000000000000
--- a/deskutils/gnochm/files/patch-data-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/Makefile.in.orig Thu Dec 2 01:00:48 2004
-+++ data/Makefile.in Thu Dec 2 01:02:50 2004
-@@ -199,7 +199,7 @@
- mime_DATA = gnochm.mime
-
- # Should I use XDG_DATA_DIRS/mime/packages ????
--sharedmimedir = $(datadir)/mime/packages
-+sharedmimedir = $(prefix)/share/mime/packages
- sharedmime_in_files = gnochm.xml.in
- sharedmime_DATA = $(sharedmime_in_files:.xml.in=.xml)
- man_MANS = gnochm.1
-@@ -543,7 +543,7 @@
-
- install-data-hook:
- if test "$(SHAREDMIME_TOOL)" != "no"; then \
-- $(SHAREDMIME_TOOL) $(datadir)/mime; \
-+ $(SHAREDMIME_TOOL) $(prefix)/share/mime; \
- fi
- # 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/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 1babdd8eb64f..0d972f9e98dd 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -43,8 +43,6 @@ PLIST_SUB+= GDA="@comment "
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]datadir[)]/doc|(prefix)/share/doc|g ; \
- s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
- s|[(]datadir[)]/mime"|(prefix)/share/mime"|g'
+ 's|[(]datadir[)]/doc|(prefix)/share/doc|g'
.include <bsd.port.post.mk>
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index ac9d3bf93f5d..ee735aa98d5d 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -29,8 +29,4 @@ CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= netstatus.schemas
-post-patch:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g'
-
.include <bsd.port.mk>
diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile
index ac9d3bf93f5d..ee735aa98d5d 100644
--- a/net/gnomenetstatus/Makefile
+++ b/net/gnomenetstatus/Makefile
@@ -29,8 +29,4 @@ CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= netstatus.schemas
-post-patch:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g'
-
.include <bsd.port.mk>
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index c2ca2632daff..ab36ec6a9f01 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -35,8 +35,7 @@ post-patch:
< ${FILESDIR}/gnome-cups-manager.desktop \
> ${WRKSRC}/gnome-cups-manager.desktop
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-D.*_DISABLE_DEPRECATED||g ; \
- s|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g'
+ 's|-D.*_DISABLE_DEPRECATED||g'
post-install:
${MKDIR} ${PREFIX}/share/gnome/applications
diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index c1daaaeba143..aaa14b8396b2 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -24,8 +24,4 @@ USE_LIBTOOL_VER=15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/|' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|$$(datadir)/mime$$|${PREFIX}/share/mime|' ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index f21a7c750dee..5d838ba56f03 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -27,7 +27,4 @@ USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-post-patch:
- @${REINPLACE_CMD} -e 's|(datadir)/mime$$|(prefix)/share/mime| ; s|(datadir)/mime/|(prefix)/share/mime/|g' ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 691f235d3780..8205daf78946 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -43,10 +43,6 @@ CONFIGURE_ARGS+= --without-included-neon
post-patch:
@${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/| ; \
- s|$$(datadir)/mime$$|${PREFIX}/share/mime|' \
- ${WRKSRC}/data/mime/Makefile.in \
- ${WRKSRC}/data/tagtrees/Makefile.in
post-configure:
@${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 691f235d3780..8205daf78946 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -43,10 +43,6 @@ CONFIGURE_ARGS+= --without-included-neon
post-patch:
@${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/| ; \
- s|$$(datadir)/mime$$|${PREFIX}/share/mime|' \
- ${WRKSRC}/data/mime/Makefile.in \
- ${WRKSRC}/data/tagtrees/Makefile.in
post-configure:
@${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 3ffa2c57889a..1c6cc36e2087 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -55,7 +55,6 @@ post-extract:
${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample
post-patch:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g'
.if ${OSVERSION} < 600006
.for po in zh_CN.po
@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 020bc8a7dc43..c7e81827212d 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -61,8 +61,4 @@ pre-everything::
@${ECHO_MSG} ""
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g' \
- ${WRKSRC}/gswitchit/Makefile.in
-
.include <bsd.port.post.mk>
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 020bc8a7dc43..c7e81827212d 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -61,8 +61,4 @@ pre-everything::
@${ECHO_MSG} ""
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g' \
- ${WRKSRC}/gswitchit/Makefile.in
-
.include <bsd.port.post.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-09 22:17:51 +0000