Fix file-roller3:

        - Sort USE_GNOME
        - Make the port stage compliant
        - Fix the pkg-plist

Reviewed by:    kwm


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

2 files changed, 23 insertions, 7 deletions

diff --git a/archivers/file-roller3/Makefile b/archivers/file-roller3/Makefile
index 472f114b8..8d2d6ad51 100644
--- a/archivers/file-roller3/Makefile
+++ b/archivers/file-roller3/Makefile
@@ -22,7 +22,8 @@ USE_LDCONFIG=	yes
 USE_XZ=		yes
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix intlhack gtk30 gconf2
+USE_GNOME=	gconf2 gnomeprefix gtk30 intlhack \
+		introspection:build
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -53,9 +54,9 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
 .endif
 
diff --git a/archivers/file-roller3/pkg-plist b/archivers/file-roller3/pkg-plist
index ce696bb05..bf5f36e88 100644
--- a/archivers/file-roller3/pkg-plist
+++ b/archivers/file-roller3/pkg-plist
@@ -618,7 +618,7 @@ share/locale/zu/LC_MESSAGES/file-roller.mo
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrmtry share/locale/an/LC_MESSAGES
-@dirrm share/locale/an
+@dirrmtry share/locale/an
 @dirrm share/help/zh_TW/file-roller/figures
 @dirrm share/help/zh_TW/file-roller
 @dirrmtry share/help/zh_TW
@@ -627,22 +627,28 @@ share/locale/zu/LC_MESSAGES/file-roller.mo
 @dirrmtry share/help/zh_HK
 @dirrm share/help/zh_CN/file-roller/figures
 @dirrm share/help/zh_CN/file-roller
+@dirrmtry share/help/zh_CN
 @dirrm share/help/vi/file-roller/figures
 @dirrm share/help/vi/file-roller
+@dirrmtry share/help/vi
 @dirrm share/help/uk/file-roller/figures
 @dirrm share/help/uk/file-roller
+@dirrmtry share/help/uk
 @dirrm share/help/te/file-roller/figures
 @dirrm share/help/te/file-roller
 @dirrmtry share/help/te
 @dirrm share/help/sv/file-roller/figures
 @dirrm share/help/sv/file-roller
+@dirrmtry share/help/sv
 @dirrm share/help/sl/file-roller/figures
 @dirrm share/help/sl/file-roller
+@dirrmtry share/help/sl
 @dirrm share/help/ru/file-roller/figures
 @dirrm share/help/ru/file-roller
 @dirrmtry share/help/ru
 @dirrm share/help/oc/file-roller/figures
 @dirrm share/help/oc/file-roller
+@dirrmtry share/help/oc
 @dirrm share/help/nl/file-roller/figures
 @dirrm share/help/nl/file-roller
 @dirrmtry share/help/nl
@@ -654,37 +660,46 @@ share/locale/zu/LC_MESSAGES/file-roller.mo
 @dirrmtry share/help/it
 @dirrm share/help/hu/file-roller/figures
 @dirrm share/help/hu/file-roller
+@dirrmtry share/help/hu
 @dirrm share/help/gl/file-roller/figures
 @dirrm share/help/gl/file-roller
+@dirrmtry share/help/gl
 @dirrm share/help/fr/file-roller/figures
 @dirrm share/help/fr/file-roller
+@dirrmtry share/help/fr
 @dirrm share/help/fi/file-roller/figures
 @dirrm share/help/fi/file-roller
+@dirrmtry share/help/fi
 @dirrm share/help/eu/file-roller/figures
 @dirrm share/help/eu/file-roller
+@dirrmtry share/help/eu
 @dirrm share/help/es/file-roller/figures
 @dirrm share/help/es/file-roller
+@dirrmtry share/help/es
 @dirrm share/help/en_GB/file-roller/figures
 @dirrm share/help/en_GB/file-roller
 @dirrmtry share/help/en_GB
 @dirrm share/help/el/file-roller/figures
 @dirrm share/help/el/file-roller
+@dirrmtry share/help/el
 @dirrm share/help/de/file-roller/figures
 @dirrm share/help/de/file-roller
+@dirrmtry share/help/de
 @dirrm share/help/da/file-roller/figures
 @dirrm share/help/da/file-roller
-@dirrmtry share/help/da
+@dirrm share/help/da
 @dirrm share/help/cs/file-roller/figures
 @dirrm share/help/cs/file-roller
+@dirrmtry share/help/cs
 @dirrm share/help/ca/file-roller/figures
 @dirrm share/help/ca/file-roller
+@dirrmtry share/help/ca
 @dirrm share/help/bg/file-roller/figures
 @dirrm share/help/bg/file-roller
-@dirrmtry share/help/bg
+@dirrm share/help/bg
 @dirrm share/help/C/file-roller/figures
 @dirrm share/help/C/file-roller
 @dirrmtry share/help/C
-@dirrmtry share/help
 @dirrm %%DATADIR%%/icons/hicolor/24x24/actions
 @dirrm %%DATADIR%%/icons/hicolor/24x24
 @dirrm %%DATADIR%%/icons/hicolor/16x16/actions