From owner-svn-ports-head@FreeBSD.ORG Fri Jan 17 13:51:05 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD34D8D3; Fri, 17 Jan 2014 13:51:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AFA4F1564; Fri, 17 Jan 2014 13:51:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HDp55B099850; Fri, 17 Jan 2014 13:51:05 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HDp5nS099847; Fri, 17 Jan 2014 13:51:05 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401171351.s0HDp5nS099847@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 17 Jan 2014 13:51:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340037 - head/textproc/sdcv X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 13:51:05 -0000 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@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 - -.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 +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,@mandir@/uk,@mandir@,' \ ${WRKSRC}/doc/uk/Makefile.in -.if ${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} -e 's,@USE_NLS@,yes,g' ${WRKSRC}/po/Makefile.in.in - @${REINPLACE_CMD} -e 's, getopt.h,,g; s,@USE_NLS@,yes,g' \ - ${WRKSRC}/src/Makefile.in -.endif - -post-install: - @${CAT} ${PKGMESSAGE} -.include +.include 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