more share/gnome -> share

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8722 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 12 insertions, 36 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 609819ebf..98079205f 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	conglomerate
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/conglomerate/files/patch-data_Makefile.in b/editors/conglomerate/files/patch-data_Makefile.in
deleted file mode 100644
index a16da12bd..000000000
--- a/editors/conglomerate/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/Makefile.in.orig	Tue May  1 11:10:15 2007
-+++ data/Makefile.in	Tue May  1 11:10:41 2007
-@@ -140,14 +140,14 @@
- desktop_in_files = conglomerate.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- 
--keysdir = $(datadir)/mime-info
-+keysdir = $(datadir)/gnome/mime-info
- keys_in_files = conglomerate.keys.in
- keys_DATA = $(keys_in_files:.keys.in=.keys) 
- 
- app_DATA = conglomerate.applications
--appdir = $(datadir)/application-registry
-+appdir = $(datadir)/gnome/application-registry
- 
--mimedir = $(datadir)/mime-info
-+mimedir = $(datadir)/gnome/mime-info
- mime_DATA = conglomerate.mime
- 
- schemadir = $(sysconfdir)/gconf/schemas/
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index fdc5695ee..4c424091d 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,6 +1,6 @@
 bin/conglomerate
 etc/gconf/schemas/conglomerate.schemas
-share/gnome/application-registry/conglomerate.applications
+share/application-registry/conglomerate.applications
 share/applications/conglomerate.desktop
 %%DATADIR%%/css/docbook.css
 %%DATADIR%%/dispspecs/cnxml.xds
@@ -251,9 +251,9 @@ share/locale/sr@Latn/LC_MESSAGES/conglomerate.mo
 share/locale/sv/LC_MESSAGES/conglomerate.mo
 share/locale/uk/LC_MESSAGES/conglomerate.mo
 share/locale/zh_CN/LC_MESSAGES/conglomerate.mo
-share/gnome/mime-info/conglomerate.keys
-share/gnome/mime-info/conglomerate.mime
-share/gnome/omf/conglomerate/conglomerate-C.omf
+share/mime-info/conglomerate.keys
+share/mime-info/conglomerate.mime
+share/omf/conglomerate/conglomerate-C.omf
 share/pixmaps/conglomerate-icon-16.png
 share/pixmaps/conglomerate/cong-address-16.png
 share/pixmaps/conglomerate/cong-answer-16.png
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 382613735..b7a0a7784 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Pav Lucistnik <pav@oook.cz>
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/textproc/meld/Makefile,v 1.4 2007/05/01 12:30:35 ahze Exp $
 
 PORTNAME=	meld
 PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
@@ -32,14 +32,10 @@ post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/INSTALL
 
-	@${REINPLACE_CMD} 's|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|g' \
-		${WRKSRC}/${MAKEFILE}
-
 	@${FIND} ${WRKSRC}/help -type f -name ${MAKEFILE} -exec \
 		${REINPLACE_CMD} \
-		's|$$(prefix)/var/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
-		s|$$(sharedir)/omf/meld|$$(sharedir)/gnome/omf/meld|g' \
-		"{}" \;
+		's|$$(prefix)/var/lib/scrollkeeper|/var/db/scrollkeeper|g' \
+				"{}" \;
 
 .include <bsd.port.pre.mk>
 .if defined (WITH_PYGNOMEDESKTOP)
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 2ae0315f5..3eb939b94 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -68,12 +68,12 @@ lib/meld/vc/tla.pyo
 lib/meld/vcview.py
 lib/meld/vcview.pyc
 lib/meld/vcview.pyo
-share/gnome/application-registry/meld.applications
+share/application-registry/meld.applications
 share/applications/meld.desktop
 share/gnome/help/meld/C/figures/dirdiff.png
 share/gnome/help/meld/C/figures/filediff.png
 share/gnome/help/meld/C/meld.xml
-share/gnome/omf/meld/meld-C.omf
+share/omf/meld/meld-C.omf
 share/pixmaps/meld.png
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/ca/LC_MESSAGES/meld.mo
@@ -156,7 +156,7 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
-@dirrm share/gnome/omf/meld
+@dirrm share/omf/meld
 @dirrm share/gnome/help/meld/C/figures
 @dirrm share/gnome/help/meld/C
 @dirrm share/gnome/help/meld