3 files changed, 10 insertions, 42 deletions

diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile
index c044c01126ef..26f69e8fff7a 100644
--- a/lang/nickle/Makefile
+++ b/lang/nickle/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nickle
-PORTVERSION=	2.81
+PORTVERSION=	2.82
 CATEGORIES=	lang
 MASTER_SITES=	http://www.nickle.org/release/
 
@@ -10,9 +10,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Numeric-oriented programming language
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake ncurses readline
+
 GNU_CONFIGURE=	yes
+PORTEXAMPLES=	*
 
 # 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.
@@ -24,13 +27,9 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|examples|| ; s| -O2||' \
 		${WRKSRC}/Makefile.in
 
-post-install:
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples && ${FIND} . ! \( -name "*Makefile*" -or \
-		-name "*.sgml" \) | ${CPIO} -pdm -L \
-		-R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR})
-	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type d | ${XARGS} ${CHMOD} a+rx
-	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} \
-		${SHAREMODE}
+	${FIND} ${WRKSRC}/examples -name 'Makefile*' -exec ${RM} {} +
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . "${STAGEDIR}${EXAMPLESDIR}"
 
 .include <bsd.port.mk>
diff --git a/lang/nickle/distinfo b/lang/nickle/distinfo
index 486d54625880..37b1df382752 100644
--- a/lang/nickle/distinfo
+++ b/lang/nickle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514813160
-SHA256 (nickle-2.81.tar.gz) = 99a9331489e290fb768bf8d88e8b03e76f25485d7636c30d9eee616ca9d358b5
-SIZE (nickle-2.81.tar.gz) = 579140
+TIMESTAMP = 1539746941
+SHA256 (nickle-2.82.tar.gz) = 403f34b397deb0621a06a2a0657a6cb804438272b558eeb3ae362f1cc037c94b
+SIZE (nickle-2.82.tar.gz) = 582670
diff --git a/lang/nickle/pkg-plist b/lang/nickle/pkg-plist
index af16e9c6b738..00ee5779877d 100644
--- a/lang/nickle/pkg-plist
+++ b/lang/nickle/pkg-plist
@@ -11,37 +11,6 @@ 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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/erat.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fourfours.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/initializer.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/is-prime.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kaiser.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menace2.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/miller-rabin.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutextest.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/numbers.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/polynomial.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prime.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qbrating.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/randtest.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/restart.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/roman.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-demo.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/skiplisttest.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smlng/COPYING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smlng/context.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smlng/generate.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smlng/parse.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smlng/test.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoku.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/COPYING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/snowflake.5c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/snowflake.tex
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/turtle.5c
 %%DATADIR%%/COPYING
 %%DATADIR%%/abort.5c
 %%DATADIR%%/arc4.5c