svn commit: r334195 - head/lang/nickle

[Alexey Dokuchaev]

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 at 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