- Change Makefile header

- Change maintainer email to @FreeBSD.org
- USES shared-mime-info instead of misc/shared-mime-info
- Add DOCS Option
- Support STAGEDIR and add OPTIONS_SUB
- Use REINPLACE_CMD instead of simple patches
- Change pkg-plist, remove mtree

Approved by:	pawel / wg (mentors, implicit)

3 files changed, 23 insertions, 57 deletions

diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile
index 8e50f65d79e3..602d859ac824 100644
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@@ -1,4 +1,4 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	viewnior
@@ -7,43 +7,33 @@ PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cloud.github.com/downloads/xsisqox/Viewnior/
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Fast and simple image viewer
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
-
-GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig shared-mime-info
 USE_AUTOTOOLS=	autoconf
+GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20
 INSTALLS_ICONS=	yes
 
-MAN1=		viewnior.1
-
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(prefix)/$$(DATADIRNAME)/locale|$$(datarootdir)/locale|' \
+		${WRKSRC}/po/Makefile.in.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/viewnior/files/patch-po_Makefile.in.in b/graphics/viewnior/files/patch-po_Makefile.in.in
deleted file mode 100644
index 732970dd30b0..000000000000
--- a/graphics/viewnior/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	2012-04-27 11:51:14.851154779 +0200
-+++ po/Makefile.in.in	2012-04-27 11:51:28.306154800 +0200
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(datarootdir)/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
diff --git a/graphics/viewnior/pkg-plist b/graphics/viewnior/pkg-plist
index a509d0bfad12..41d37553354a 100644
--- a/graphics/viewnior/pkg-plist
+++ b/graphics/viewnior/pkg-plist
@@ -1,4 +1,12 @@
 bin/viewnior
+man/man1/viewnior.1.gz
+share/applications/viewnior.desktop
+share/icons/hicolor/16x16/apps/viewnior.png
+share/icons/hicolor/22x22/apps/viewnior.png
+share/icons/hicolor/24x24/apps/viewnior.png
+share/icons/hicolor/32x32/apps/viewnior.png
+share/icons/hicolor/48x48/apps/viewnior.png
+share/icons/hicolor/scalable/apps/viewnior.svg
 %%NLS%%share/locale/bg/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/da/LC_MESSAGES/viewnior.mo
@@ -25,13 +33,6 @@ bin/viewnior
 %%NLS%%share/locale/tr/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/viewnior.mo
-share/applications/viewnior.desktop
-share/icons/hicolor/16x16/apps/viewnior.png
-share/icons/hicolor/22x22/apps/viewnior.png
-share/icons/hicolor/24x24/apps/viewnior.png
-share/icons/hicolor/32x32/apps/viewnior.png
-share/icons/hicolor/48x48/apps/viewnior.png
-share/icons/hicolor/scalable/apps/viewnior.svg
 %%DATADIR%%/pixmaps/object-flip-horizontal.png
 %%DATADIR%%/pixmaps/object-flip-vertical.png
 %%DATADIR%%/pixmaps/object-rotate-left.png
@@ -40,19 +41,5 @@ share/icons/hicolor/scalable/apps/viewnior.svg
 %%DATADIR%%/vnr-preferences-dialog.ui
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 %%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/oc