svn commit: r340037 - head/textproc/sdcv

[Baptiste Daroussin]

Author: bapt
Date: Fri Jan 17 13:51:04 2014
New Revision: 340037
URL: http://svnweb.freebsd.org/changeset/ports/340037
QAT: https://qat.redports.org/buildarchive/r340037/

Log:
  Support stage
  Use options helpers
  Avoid useless conditional patches

Modified:
  head/textproc/sdcv/Makefile
  head/textproc/sdcv/pkg-plist

Modified: head/textproc/sdcv/Makefile
==============================================================================
--- head/textproc/sdcv/Makefile	Fri Jan 17 13:45:08 2014	(r340036)
+++ head/textproc/sdcv/Makefile	Fri Jan 17 13:51:04 2014	(r340037)
@@ -8,7 +8,9 @@ CATEGORIES=	textproc
 MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A text-based utility for work with dictionaries in StarDict's format
+COMMENT=	Text-based utility for work with dictionaries in StarDict's format
+
+OPTIONS_DEFINE=	NLS
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -17,22 +19,10 @@ USE_GNOME=	glib20
 USES=		pkgconfig iconv
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-MAN1=		sdcv.1
-
-.include <bsd.port.pre.mk>
+NLS_USES=	gettext
+NLS_CPPFLAGS=	-I${LOCALBASE}/include
+NLS_LDFLAGS=	-L${LOCALBASE}/lib
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
@@ -42,21 +32,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's, getopt.h,,g' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e '146 s|()|(int, char * const [], const char *)|g' \
 		${WRKSRC}/src/getopt.h
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
 	@${REINPLACE_CMD} -e '516 s|sizeof|(guint32)sizeof|g' \
 		${WRKSRC}/src/lib/lib.cpp
-.endif
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 		${WRKSRC}/src/sdcv.cpp
 	@${REINPLACE_CMD} -e 's, at mandir@/uk, at mandir@,' \
 		${WRKSRC}/doc/uk/Makefile.in
-.if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's, at USE_NLS@,yes,g' ${WRKSRC}/po/Makefile.in.in
-	@${REINPLACE_CMD} -e 's, getopt.h,,g; s, at USE_NLS@,yes,g' \
-		${WRKSRC}/src/Makefile.in
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/sdcv/pkg-plist
==============================================================================
--- head/textproc/sdcv/pkg-plist	Fri Jan 17 13:45:08 2014	(r340036)
+++ head/textproc/sdcv/pkg-plist	Fri Jan 17 13:51:04 2014	(r340037)
@@ -1,4 +1,5 @@
 bin/sdcv
+man/man1/sdcv.1.gz
 %%NLS%%share/locale/ru/LC_MESSAGES/sdcv.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/sdcv.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/sdcv.mo