3 files changed, 16 insertions, 248 deletions

diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index 4d0023df765f..47303f2b561b 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	yap
-PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTVERSION=	5.1.1
+PORTREVISION=	0
 CATEGORIES=	lang
-MASTER_SITES=	http://www.ncc.up.pt/~vsc/Yap/%SUBDIR%/
+MASTER_SITES=	http://www.ncc.up.pt/~vsc/Yap/current/
 MASTER_SITE_SUBDIR=	Yap-${PORTVERSION}
 DISTNAME=	Yap-${PORTVERSION}
 
@@ -23,6 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GMAKE=	yes
 
 INFO=		yap
 
@@ -33,6 +34,8 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|VERSION}|VERSION:}|g' ${WRKSRC}/docs/yap.tex
+	@${REINPLACE_CMD} -e "s,make),${GMAKE})," \
+		-e "s,make install,${GMAKE} install," ${WRKSRC}/Makefile.in
 
 post-build:
 	cd ${WRKSRC}/docs && makeinfo --no-split yap.tex
@@ -41,4 +44,10 @@ pre-install:
 	@${MKDIR} ${PREFIX}/${INFO_PATH}
 	${INSTALL_DATA} ${WRKSRC}/docs/yap.info ${PREFIX}/${INFO_PATH}
 
+post-install:
+	@${FIND} ${PREFIX}/share/Yap ! -type d | \
+		${SED} "s,^${PREFIX},," >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/share/Yap -type d | ${SORT} -r | \
+		${SED} "s,^${PREFIX},@dirrm ," >> ${TMPPLIST}
+
 .include <bsd.port.post.mk>
diff --git a/lang/yap/distinfo b/lang/yap/distinfo
index e13eded87710..01054930d86f 100644
--- a/lang/yap/distinfo
+++ b/lang/yap/distinfo
@@ -1,3 +1,3 @@
-MD5 (Yap-5.0.1.tar.gz) = d8d1f1c5a38d501eb9db38d880668eda
-SHA256 (Yap-5.0.1.tar.gz) = 1556ccc148ce2d4add03e005d7d82ca096ff37f2807a9ed5bdee78f41c70df24
-SIZE (Yap-5.0.1.tar.gz) = 3260612
+MD5 (Yap-5.1.1.tar.gz) = 1f5c26642a27158c98f6c2fac56d3dad
+SHA256 (Yap-5.1.1.tar.gz) = cadb35cb3b7e469aa6bc6f7a819904f1f746b1e9c71f4a2af1ea254569ed522d
+SIZE (Yap-5.1.1.tar.gz) = 3429186
diff --git a/lang/yap/pkg-plist b/lang/yap/pkg-plist
index 457e43b40ebd..9de4ed0090c6 100644
--- a/lang/yap/pkg-plist
+++ b/lang/yap/pkg-plist
@@ -2,6 +2,7 @@ bin/yap
 include/Yap/YapInterface.h
 include/Yap/c_interface.h
 include/Yap/yap_structs.h
+@dirrm include/Yap
 lib/Yap/random.so
 lib/Yap/regcomp.so
 lib/Yap/regerror.so
@@ -13,246 +14,4 @@ lib/Yap/sys.so
 lib/Yap/yap2swi.so
 lib/Yap/yap_tries.so
 lib/libYap.a
-share/Yap/CHR.LICENSE
-share/Yap/CLPQR.LICENSE
-share/Yap/apply_macros.yap
-share/Yap/assoc.yap
-share/Yap/atts.yap
-share/Yap/avl.yap
-share/Yap/charsio.yap
-share/Yap/chr/chrcmp.pl
-share/Yap/chr/compenv.pl
-share/Yap/chr/concat.pl
-share/Yap/chr/examples/allentable.pl
-share/Yap/chr/examples/arc.pl
-share/Yap/chr/examples/bool.pl
-share/Yap/chr/examples/cft.pl
-share/Yap/chr/examples/domain.pl
-share/Yap/chr/examples/examples-adder.bool
-share/Yap/chr/examples/examples-benchmark.math
-share/Yap/chr/examples/examples-deussen.bool
-share/Yap/chr/examples/examples-diaz.bool
-share/Yap/chr/examples/examples-fourier.math
-share/Yap/chr/examples/examples-holzbaur.math
-share/Yap/chr/examples/examples-lim1.math
-share/Yap/chr/examples/examples-lim2.math
-share/Yap/chr/examples/examples-lim3.math
-share/Yap/chr/examples/examples-puzzle.bool
-share/Yap/chr/examples/examples-queens.bool
-share/Yap/chr/examples/examples-queens.domain
-share/Yap/chr/examples/examples-stuckey.math
-share/Yap/chr/examples/examples-thom.math
-share/Yap/chr/examples/gcd.pl
-share/Yap/chr/examples/interval.pl
-share/Yap/chr/examples/kl-one.pl
-share/Yap/chr/examples/leq.pl
-share/Yap/chr/examples/list.pl
-share/Yap/chr/examples/listdom.pl
-share/Yap/chr/examples/math-elim.pl
-share/Yap/chr/examples/math-fougau.pl
-share/Yap/chr/examples/math-fourier.pl
-share/Yap/chr/examples/math-gauss.pl
-share/Yap/chr/examples/math-utilities.pl
-share/Yap/chr/examples/minmax.pl
-share/Yap/chr/examples/modelgenerator.pl
-share/Yap/chr/examples/osf.pl
-share/Yap/chr/examples/oztype.pl
-share/Yap/chr/examples/path.pl
-share/Yap/chr/examples/pathc.pl
-share/Yap/chr/examples/primes.pl
-share/Yap/chr/examples/scheduling.pl
-share/Yap/chr/examples/tarski.pl
-share/Yap/chr/examples/term.pl
-share/Yap/chr/examples/time-pc.pl
-share/Yap/chr/examples/time-point.pl
-share/Yap/chr/examples/time-rnd.pl
-share/Yap/chr/examples/time.pl
-share/Yap/chr/examples/tree.pl
-share/Yap/chr/examples/type.pl
-share/Yap/chr/getval.pl
-share/Yap/chr/matching.pl
-share/Yap/chr/operator.pl
-share/Yap/chr/ordering.pl
-share/Yap/chr/sbag.pl
-share/Yap/chr/sbag_a.pl
-share/Yap/chr/sbag_l.pl
-share/Yap/chr/trace.yap
-share/Yap/chr.yap
-share/Yap/cleanup.yap
-share/Yap/clpbn/aggregates.yap
-share/Yap/clpbn/bnt.yap
-share/Yap/clpbn/discrete_utils.yap
-share/Yap/clpbn/evidence.yap
-share/Yap/clpbn/gibbs.yap
-share/Yap/clpbn/graphs.yap
-share/Yap/clpbn/graphviz.yap
-share/Yap/clpbn/topsort.yap
-share/Yap/clpbn/utils.yap
-share/Yap/clpbn/vel.yap
-share/Yap/clpbn/viterbi.yap
-share/Yap/clpbn/xbif.yap
-share/Yap/clpbn.yap
-share/Yap/clpq/arith_q.yap
-share/Yap/clpq/class.yap
-share/Yap/clpq/geler.yap
-share/Yap/clpq/nf.yap
-share/Yap/clpq/nfq.yap
-share/Yap/clpq.yap
-share/Yap/clpqr/arith.pl
-share/Yap/clpqr/bb.yap
-share/Yap/clpqr/bv.yap
-share/Yap/clpqr/compenv.pl
-share/Yap/clpqr/dump.pl
-share/Yap/clpqr/examples/README
-share/Yap/clpqr/examples/SESSION/010
-share/Yap/clpqr/examples/SESSION/011
-share/Yap/clpqr/examples/SESSION/012
-share/Yap/clpqr/examples/SESSION/013
-share/Yap/clpqr/examples/SESSION/014
-share/Yap/clpqr/examples/SESSION/015
-share/Yap/clpqr/examples/SESSION/016
-share/Yap/clpqr/examples/SESSION/017
-share/Yap/clpqr/examples/SESSION/018
-share/Yap/clpqr/examples/SESSION/019
-share/Yap/clpqr/examples/SESSION/020
-share/Yap/clpqr/examples/SESSION/021
-share/Yap/clpqr/examples/SESSION/022
-share/Yap/clpqr/examples/SESSION/023
-share/Yap/clpqr/examples/SESSION/024
-share/Yap/clpqr/examples/SESSION/030
-share/Yap/clpqr/examples/SESSION/031
-share/Yap/clpqr/examples/SESSION/032
-share/Yap/clpqr/examples/SESSION/033
-share/Yap/clpqr/examples/SESSION/034
-share/Yap/clpqr/examples/SESSION/035
-share/Yap/clpqr/examples/SESSION/110
-share/Yap/clpqr/examples/SESSION/111
-share/Yap/clpqr/examples/SESSION/112
-share/Yap/clpqr/examples/SESSION/113
-share/Yap/clpqr/examples/SESSION/114
-share/Yap/clpqr/examples/SESSION/115
-share/Yap/clpqr/examples/SESSION/116
-share/Yap/clpqr/examples/SESSION/117
-share/Yap/clpqr/examples/SESSION/118
-share/Yap/clpqr/examples/SESSION/119
-share/Yap/clpqr/examples/SESSION/120
-share/Yap/clpqr/examples/SESSION/122
-share/Yap/clpqr/examples/SESSION/123
-share/Yap/clpqr/examples/SESSION/124
-share/Yap/clpqr/examples/SESSION/130
-share/Yap/clpqr/examples/SESSION/131
-share/Yap/clpqr/examples/SESSION/132
-share/Yap/clpqr/examples/SESSION/133
-share/Yap/clpqr/examples/SESSION/134
-share/Yap/clpqr/examples/SESSION/135
-share/Yap/clpqr/examples/caneghem.pl
-share/Yap/clpqr/examples/eliminat.pl
-share/Yap/clpqr/examples/matmul.pl
-share/Yap/clpqr/examples/mg.pl
-share/Yap/clpqr/examples/mip.pl
-share/Yap/clpqr/examples/monash/README
-share/Yap/clpqr/examples/monash/air
-share/Yap/clpqr/examples/monash/amplif
-share/Yap/clpqr/examples/monash/complex
-share/Yap/clpqr/examples/monash/critical
-share/Yap/clpqr/examples/monash/dnf
-share/Yap/clpqr/examples/monash/fib
-share/Yap/clpqr/examples/monash/findroot
-share/Yap/clpqr/examples/monash/invert
-share/Yap/clpqr/examples/monash/laplace
-share/Yap/clpqr/examples/monash/mortgage
-share/Yap/clpqr/examples/monash/nrev
-share/Yap/clpqr/examples/monash/option
-share/Yap/clpqr/examples/monash/pictures
-share/Yap/clpqr/examples/monash/rkf45
-share/Yap/clpqr/examples/monash/rlc
-share/Yap/clpqr/examples/monash/smm
-share/Yap/clpqr/examples/monash/toolpath
-share/Yap/clpqr/examples/monash/zebra
-share/Yap/clpqr/examples/root.pl
-share/Yap/clpqr/examples/simplex.pl
-share/Yap/clpqr/examples/squares.pl
-share/Yap/clpqr/expand.yap
-share/Yap/clpqr/fourmotz.pl
-share/Yap/clpqr/ineq.yap
-share/Yap/clpqr/itf3.pl
-share/Yap/clpqr/monash.pl
-share/Yap/clpqr/ordering.yap
-share/Yap/clpqr/printf.pl
-share/Yap/clpqr/project.pl
-share/Yap/clpqr/redund.pl
-share/Yap/clpqr/store.yap
-share/Yap/clpr/arith_r.yap
-share/Yap/clpr/class.yap
-share/Yap/clpr/geler.yap
-share/Yap/clpr/nf.yap
-share/Yap/clpr/nfr.yap
-share/Yap/clpr.yap
-share/Yap/heaps.yap
-share/Yap/icon_address.pl
-share/Yap/lists.yap
-share/Yap/logtalk/logtalk.pl
-share/Yap/logtalk/yap.config
-share/Yap/logtalk.yap
-share/Yap/ordsets.yap
-share/Yap/pillow.pl
-share/Yap/pl/arith.yap
-share/Yap/pl/arrays.yap
-share/Yap/pl/boot.yap
-share/Yap/pl/callcount.yap
-share/Yap/pl/checker.yap
-share/Yap/pl/consult.yap
-share/Yap/pl/corout.yap
-share/Yap/pl/debug.yap
-share/Yap/pl/depth_bound.yap
-share/Yap/pl/directives.yap
-share/Yap/pl/errors.yap
-share/Yap/pl/grammar.yap
-share/Yap/pl/ground.yap
-share/Yap/pl/init.yap
-share/Yap/pl/listing.yap
-share/Yap/pl/load_foreign.yap
-share/Yap/pl/modules.yap
-share/Yap/pl/preds.yap
-share/Yap/pl/profile.yap
-share/Yap/pl/protect.yap
-share/Yap/pl/setof.yap
-share/Yap/pl/signals.yap
-share/Yap/pl/sockets.yap
-share/Yap/pl/sort.yap
-share/Yap/pl/statistics.yap
-share/Yap/pl/strict_iso.yap
-share/Yap/pl/tabling.yap
-share/Yap/pl/threads.yap
-share/Yap/pl/utils.yap
-share/Yap/pl/yapor.yap
-share/Yap/pl/yio.yap
-share/Yap/prandom.yap
-share/Yap/queues.yap
-share/Yap/random.yap
-share/Yap/rbtrees.yap
-share/Yap/regexp.yap
-share/Yap/splay.yap
-share/Yap/swi.yap
-share/Yap/system.yap
-share/Yap/terms.yap
-share/Yap/timeout.yap
-share/Yap/trees.yap
-share/Yap/tries.yap
-share/Yap/ugraphs.yap
-share/Yap/ypp.yap
-@dirrm share/Yap/pl
-@dirrm share/Yap/logtalk
-@dirrm share/Yap/clpr
-@dirrm share/Yap/clpqr/examples/monash
-@dirrm share/Yap/clpqr/examples/SESSION
-@dirrm share/Yap/clpqr/examples
-@dirrm share/Yap/clpqr
-@dirrm share/Yap/clpq
-@dirrm share/Yap/clpbn/examples
-@dirrm share/Yap/clpbn
-@dirrm share/Yap/chr/examples
-@dirrm share/Yap/chr
-@dirrm share/Yap
 @dirrm lib/Yap
-@dirrm include/Yap