- Update from 2.2.0b3 to 2.3.0a4

- Use options helpers
- Add stage support

PR:		ports/182887
Submitted by:	Martin Dieringer <martin.dieringer@gmx.de> (maintainer)

3 files changed, 19 insertions, 28 deletions

diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index 00be718042bf..c6a5f25ae266 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	repsnapper
-PORTVERSION=	2.2.0b3
-PORTREVISION=	1
+PORTVERSION=	2.3.0a4
 CATEGORIES=	cad
 MASTER_SITES=	https://codeload.github.com/timschmidt/repsnapper/tar.gz/
 DISTNAME=	${PORTVERSION}
@@ -41,17 +40,12 @@ USE_GL=		gl
 USE_AUTOTOOLS=	automake libtool
 USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
+INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALL_TARGET=	install-strip
@@ -67,12 +61,9 @@ post-configure:
 		${WRKSRC}/po/Makefile
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/xdg/repsnapper
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/repsnapper
 	${INSTALL_DATA} ${WRKSRC}/src/repsnapper.conf \
-		${PREFIX}/etc/xdg/repsnapper/repsnapper.conf.sample
-	@if [ ! -f ${PREFIX}/etc/xdg/repsnapper/repsnapper.conf ]; then \
-		${CP} -p ${PREFIX}/etc/xdg/repsnapper/repsnapper.conf.sample \
-			${PREFIX}/etc/xdg/repsnapper/repsnapper.conf ; \
-	fi
+		${STAGEDIR}${PREFIX}/etc/xdg/repsnapper/repsnapper.conf.sample
+
 
 .include <bsd.port.mk>
diff --git a/cad/repsnapper/distinfo b/cad/repsnapper/distinfo
index f9bfa477cc39..593732bd2729 100644
--- a/cad/repsnapper/distinfo
+++ b/cad/repsnapper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repsnapper/2.2.0b3) = 2f55ce6bc19bba84bb6dbcda12f6546fa306fa163527d009ea8d730b85d80513
-SIZE (repsnapper/2.2.0b3) = 1314244
+SHA256 (repsnapper/2.3.0a4) = 5ec82eb6ea7db06d4d8acc82f3e3b01fdee5bf9006880ec34fe244dc96420d53
+SIZE (repsnapper/2.3.0a4) = 1310808
diff --git a/cad/repsnapper/pkg-plist b/cad/repsnapper/pkg-plist
index 1682245f41d7..ddf52c44c3a6 100644
--- a/cad/repsnapper/pkg-plist
+++ b/cad/repsnapper/pkg-plist
@@ -1,14 +1,14 @@
 bin/repsnapper
 @unexec if cmp -s %D/etc/xdg/repsnapper/repsnapper.conf.sample %D/etc/xdg/repsnapper/repsnapper.conf; then rm -f %D/etc/xdg/repsnapper/repsnapper.conf; fi
 etc/xdg/repsnapper/repsnapper.conf.sample
-@exec if [ ! -f %D/etc/xdg/repsnapper/repsnapper.conf ] ; then cp -p %D/%F %B/xdg/repsnapper/repsnapper.conf; fi
+@exec if [ ! -f %D/etc/xdg/repsnapper/repsnapper.conf ] ; then cp -p %D/%F %B/repsnapper.conf; fi
 share/applications/repsnapper.desktop
-share/locale/en_GB/LC_MESSAGES/repsnapper.mo
-share/locale/de_DE/LC_MESSAGES/repsnapper.mo
-share/repsnapper/repsnapper.ui
-share/repsnapper/repsnapper.svg
+%%NLS%%share/locale/en_GB/LC_MESSAGES/repsnapper.mo
+%%NLS%%share/locale/de_DE/LC_MESSAGES/repsnapper.mo
+%%DATADIR%%/repsnapper.ui
+%%DATADIR%%/repsnapper.svg
 share/icons/hicolor/scalable/apps/repsnapper.svg
 @dirrmtry etc/xdg/repsnapper
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrm share/repsnapper
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE
+@dirrm %%DATADIR%%