From owner-svn-ports-all@FreeBSD.ORG  Mon Nov 18 13:51:52 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 6530BD35;
 Mon, 18 Nov 2013 13:51:52 +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 3B28C2C28;
 Mon, 18 Nov 2013 13:51:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIDpq10014154;
 Mon, 18 Nov 2013 13:51:52 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIDpppP014150;
 Mon, 18 Nov 2013 13:51:51 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201311181351.rAIDpppP014150@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 18 Nov 2013 13:51:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334195 - head/lang/nickle
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Nov 2013 13:51:52 -0000

Author: danfe
Date: Mon Nov 18 13:51:51 2013
New Revision: 334195
URL: http://svnweb.freebsd.org/changeset/ports/334195

Log:
  - Drop the article from COMMENT line, sort the knobs
  - Convert USE_GMAKE to USES, expand ${PTHREAD_LIBS}
  - Stagify and unmute copying of examples while here

Modified:
  head/lang/nickle/Makefile
  head/lang/nickle/pkg-plist

Modified: head/lang/nickle/Makefile
==============================================================================
--- head/lang/nickle/Makefile	Mon Nov 18 13:45:44 2013	(r334194)
+++ head/lang/nickle/Makefile	Mon Nov 18 13:51:51 2013	(r334195)
@@ -7,38 +7,30 @@ CATEGORIES=	lang
 MASTER_SITES=	http://www.nickle.org/release/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A numeric oriented programming language
+COMMENT=	Numeric-oriented programming language
 
 LICENSE=	MIT
 
-OPTIONS_DEFINE=	EXAMPLES
-
-USES=		ncurses
-USE_GMAKE=	yes
+USES=		gmake ncurses
 GNU_CONFIGURE=	yes
 
 # Nickle now has bindings which are likely to pull in libraries that need
 # libpthread.  Link to it now explicitly, or it wouldn't work at runtime.
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-pthread
 
-MAN1=		nickle.1
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^SUBDIRS/s|examples|| ; \
-		 s| -O2||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|examples|| ; s| -O2||' \
+		${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/examples && ${FIND} . ! \( -name "*Makefile*" -or \
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${FIND} . ! \( -name "*Makefile*" -or \
 		-name "*.sgml" \) | ${CPIO} -pdm -L \
-		-R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR})
-	@${FIND} ${EXAMPLESDIR} -type d | ${XARGS} ${CHMOD} a+rx
-	@${FIND} ${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-.endif
+		-R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR})
+	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type d | ${XARGS} ${CHMOD} a+rx
+	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} \
+		${SHAREMODE}
 
 .include <bsd.port.mk>

Modified: head/lang/nickle/pkg-plist
==============================================================================
--- head/lang/nickle/pkg-plist	Mon Nov 18 13:45:44 2013	(r334194)
+++ head/lang/nickle/pkg-plist	Mon Nov 18 13:51:51 2013	(r334195)
@@ -10,6 +10,7 @@ include/nickle/opcode.h
 include/nickle/ref.h
 include/nickle/stack.h
 include/nickle/value.h
+man/man1/nickle.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/COPYING
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/comb.5c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cribbage.5c