- Add USE_X_PREFIX

- Conform to GNOME directory hierarchy
- Do not install GNU GPL doc

PR:		38705
Submitted by:	Ports Fury

4 files changed, 60 insertions, 58 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 1004403d9dc5..58e1fd5c1c4b 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -19,16 +19,22 @@ RUN_DEPENDS=	bzip:${PORTSDIR}/archivers/bzip \
 		rar:${PORTSDIR}/archivers/rar \
 		lzop:${PORTSDIR}/archivers/lzop
 
+USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-DOCS=	AUTHORS COPYING NEWS README TODO
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/apps|\$$\(datadir\)/apps|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in AUTHORS NEWS README TODO
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index b318b46344a0..d0d6660562b5 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,5 +1,10 @@
 bin/file-roller
 bin/fr-document-viewer
+%%PORTDOCS%%share/doc/fileroller/AUTHORS
+%%PORTDOCS%%share/doc/fileroller/NEWS
+%%PORTDOCS%%share/doc/fileroller/README
+%%PORTDOCS%%share/doc/fileroller/TODO
+share/gnome/apps/Utilities/file-roller.desktop
 share/gnome/application-registry/file-roller.applications
 share/gnome/file-roller/glade/file_roller.glade
 share/gnome/file-roller/glade/file_roller_prop.glade
@@ -15,33 +20,23 @@ share/gnome/file-roller/scripts/Extract_here
 share/gnome/file-roller/scripts/Extract_in_a_subfolder
 share/gnome/file-roller/scripts/Extract_to
 share/gnome/file-roller/scripts/README
-share/gnome/gnome/apps/Utilities/file-roller.desktop
-share/gnome/locale/de/LC_MESSAGES/file-roller.mo
-share/gnome/locale/es/LC_MESSAGES/file-roller.mo
-share/gnome/locale/fr_FR/LC_MESSAGES/file-roller.mo
-share/gnome/locale/it/LC_MESSAGES/file-roller.mo
-share/gnome/locale/ja/LC_MESSAGES/file-roller.mo
-share/gnome/locale/ko/LC_MESSAGES/file-roller.mo
-share/gnome/locale/nl/LC_MESSAGES/file-roller.mo
-share/gnome/locale/no/LC_MESSAGES/file-roller.mo
-share/gnome/locale/pl/LC_MESSAGES/file-roller.mo
-share/gnome/locale/pt_BR/LC_MESSAGES/file-roller.mo
-share/gnome/locale/ru/LC_MESSAGES/file-roller.mo
-share/gnome/locale/sv/LC_MESSAGES/file-roller.mo
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/pixmaps/file-roller.png
-@dirrm share/gnome/file-roller/glade
-@dirrm share/gnome/file-roller/icons
+share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/es/LC_MESSAGES/file-roller.mo
+share/locale/fr_FR/LC_MESSAGES/file-roller.mo
+share/locale/it/LC_MESSAGES/file-roller.mo
+share/locale/ja/LC_MESSAGES/file-roller.mo
+share/locale/ko/LC_MESSAGES/file-roller.mo
+share/locale/nl/LC_MESSAGES/file-roller.mo
+share/locale/no/LC_MESSAGES/file-roller.mo
+share/locale/pl/LC_MESSAGES/file-roller.mo
+share/locale/pt_BR/LC_MESSAGES/file-roller.mo
+share/locale/ru/LC_MESSAGES/file-roller.mo
+share/locale/sv/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/file-roller/scripts
+@dirrm share/gnome/file-roller/icons
+@dirrm share/gnome/file-roller/glade
 @dirrm share/gnome/file-roller
-@unexec rmdir %D/share/gnome/application-registry 2>/dev/null || true
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-%%PORTDOCS%%share/doc/fileroller/AUTHORS
-%%PORTDOCS%%share/doc/fileroller/COPYING
-%%PORTDOCS%%share/doc/fileroller/NEWS
-%%PORTDOCS%%share/doc/fileroller/README
-%%PORTDOCS%%share/doc/fileroller/TODO
 %%PORTDOCS%%@dirrm share/doc/fileroller
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 1004403d9dc5..58e1fd5c1c4b 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -19,16 +19,22 @@ RUN_DEPENDS=	bzip:${PORTSDIR}/archivers/bzip \
 		rar:${PORTSDIR}/archivers/rar \
 		lzop:${PORTSDIR}/archivers/lzop
 
+USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-DOCS=	AUTHORS COPYING NEWS README TODO
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/apps|\$$\(datadir\)/apps|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in AUTHORS NEWS README TODO
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index b318b46344a0..d0d6660562b5 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -1,5 +1,10 @@
 bin/file-roller
 bin/fr-document-viewer
+%%PORTDOCS%%share/doc/fileroller/AUTHORS
+%%PORTDOCS%%share/doc/fileroller/NEWS
+%%PORTDOCS%%share/doc/fileroller/README
+%%PORTDOCS%%share/doc/fileroller/TODO
+share/gnome/apps/Utilities/file-roller.desktop
 share/gnome/application-registry/file-roller.applications
 share/gnome/file-roller/glade/file_roller.glade
 share/gnome/file-roller/glade/file_roller_prop.glade
@@ -15,33 +20,23 @@ share/gnome/file-roller/scripts/Extract_here
 share/gnome/file-roller/scripts/Extract_in_a_subfolder
 share/gnome/file-roller/scripts/Extract_to
 share/gnome/file-roller/scripts/README
-share/gnome/gnome/apps/Utilities/file-roller.desktop
-share/gnome/locale/de/LC_MESSAGES/file-roller.mo
-share/gnome/locale/es/LC_MESSAGES/file-roller.mo
-share/gnome/locale/fr_FR/LC_MESSAGES/file-roller.mo
-share/gnome/locale/it/LC_MESSAGES/file-roller.mo
-share/gnome/locale/ja/LC_MESSAGES/file-roller.mo
-share/gnome/locale/ko/LC_MESSAGES/file-roller.mo
-share/gnome/locale/nl/LC_MESSAGES/file-roller.mo
-share/gnome/locale/no/LC_MESSAGES/file-roller.mo
-share/gnome/locale/pl/LC_MESSAGES/file-roller.mo
-share/gnome/locale/pt_BR/LC_MESSAGES/file-roller.mo
-share/gnome/locale/ru/LC_MESSAGES/file-roller.mo
-share/gnome/locale/sv/LC_MESSAGES/file-roller.mo
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/pixmaps/file-roller.png
-@dirrm share/gnome/file-roller/glade
-@dirrm share/gnome/file-roller/icons
+share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/es/LC_MESSAGES/file-roller.mo
+share/locale/fr_FR/LC_MESSAGES/file-roller.mo
+share/locale/it/LC_MESSAGES/file-roller.mo
+share/locale/ja/LC_MESSAGES/file-roller.mo
+share/locale/ko/LC_MESSAGES/file-roller.mo
+share/locale/nl/LC_MESSAGES/file-roller.mo
+share/locale/no/LC_MESSAGES/file-roller.mo
+share/locale/pl/LC_MESSAGES/file-roller.mo
+share/locale/pt_BR/LC_MESSAGES/file-roller.mo
+share/locale/ru/LC_MESSAGES/file-roller.mo
+share/locale/sv/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/file-roller/scripts
+@dirrm share/gnome/file-roller/icons
+@dirrm share/gnome/file-roller/glade
 @dirrm share/gnome/file-roller
-@unexec rmdir %D/share/gnome/application-registry 2>/dev/null || true
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-%%PORTDOCS%%share/doc/fileroller/AUTHORS
-%%PORTDOCS%%share/doc/fileroller/COPYING
-%%PORTDOCS%%share/doc/fileroller/NEWS
-%%PORTDOCS%%share/doc/fileroller/README
-%%PORTDOCS%%share/doc/fileroller/TODO
 %%PORTDOCS%%@dirrm share/doc/fileroller