Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Sep 2013 16:16:07 +0000 (UTC)
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328828 - in head/games/gtypist: . files
Message-ID:  <201309301616.r8UGG722072157@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: naddy
Date: Mon Sep 30 16:16:06 2013
New Revision: 328828
URL: http://svnweb.freebsd.org/changeset/ports/328828

Log:
  Support staging.
  Use option helpers.
  Fix build with NLS option off.

Added:
  head/games/gtypist/files/
  head/games/gtypist/files/patch-src_Makefile.in   (contents, props changed)
Modified:
  head/games/gtypist/Makefile
  head/games/gtypist/pkg-plist   (contents, props changed)

Modified: head/games/gtypist/Makefile
==============================================================================
--- head/games/gtypist/Makefile	Mon Sep 30 16:06:23 2013	(r328827)
+++ head/games/gtypist/Makefile	Mon Sep 30 16:16:06 2013	(r328828)
@@ -15,18 +15,12 @@ CONFIGURE_ENV=	EMACS=no
 CPPFLAGS=	-I${WRKDIR}/include
 
 INFO=		gtypist gtypist.cs gtypist.es
-MAN1=		gtypist.1 typefortune.1
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 # wide curses header expected at <ncursesw/ncurses.h>
 pre-configure:

Added: head/games/gtypist/files/patch-src_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/gtypist/files/patch-src_Makefile.in	Mon Sep 30 16:16:06 2013	(r328828)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2013-06-05 20:50:08.000000000 +0200
++++ src/Makefile.in	2013-09-30 18:05:37.000000000 +0200
+@@ -358,7 +358,7 @@ top_srcdir = @top_srcdir@
+ gtypist_SOURCES = gtypist.c cursmenu.c script.c error.c getopt.c getopt1.c \
+ 		cursmenu.h error.h getopt.h gettext.h gtypist.h script.h utf8.c utf8.h
+ 
+-gtypist_LDADD = @LIBINTL@
++gtypist_LDADD = @LIBINTL@ @LIBICONV@
+ AM_CPPFLAGS = -I../intl \
+   -DDATADIR=\"$(pkgdatadir)\" \
+   -DLOCALEDIR=\"$(datadir)/locale\"

Modified: head/games/gtypist/pkg-plist
==============================================================================
--- head/games/gtypist/pkg-plist	Mon Sep 30 16:06:23 2013	(r328827)
+++ head/games/gtypist/pkg-plist	Mon Sep 30 16:16:06 2013	(r328828)
@@ -1,6 +1,8 @@
 @comment $FreeBSD$
 bin/gtypist
 bin/typefortune
+man/man1/gtypist.1.gz
+man/man1/typefortune.1.gz
 share/gtypist/c.typ
 share/gtypist/cs.typ
 share/gtypist/d.typ



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309301616.r8UGG722072157>