2 files changed, 168 insertions, 26 deletions
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index a430dbfc59f3..31f21f828dea 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -14,20 +14,17 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-
 USES=		gmake
 USE_GCC=	any
-USE_AUTOTOOLS=	autoconf
-PORTDOCS=	*
-PORTEXAMPLES=	*
 CFLAGS+=	-O3 # gcc5/gcc6 + -O2 = pl2wam hangs
 PLIST_SUB=	GPROLOG_VER=${PORTVERSION}
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-c-flags="${CFLAGS}" \
 		--with-doc-dir="${DOCSDIR}" \
 		--with-examples-dir="${EXAMPLESDIR}"
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 MAKE_JOBS_UNSAFE=	yes
+WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=		FD DOCS EXAMPLES
 OPTIONS_DEFAULT=	FD
@@ -36,26 +33,17 @@ OPTIONS_SUB=		yes
 FD_DESC=		Enable finite domain constraint solver
 FD_CONFIGURE_OFF=	--disable-fd-solver
 
+.include <bsd.port.options.mk>
+
 # Disable registers on i386. This fixes build with gcc6.
 # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852008
-.include <bsd.port.pre.mk>
 .if ${ARCH} == i386
 CONFIGURE_ARGS+=		--disable-regs
 .endif
 
-post-configure:
-	${REINPLACE_CMD} \
-		-E 's|^(INSTALL_PROGRAM *= *install +-s +-m) 555|\1 755|g' \
-		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -E 's|^(INSTALL_DATA *= *install +-m) 444|\1 644|g' \
-		${WRKSRC}/Makefile
-	${REINPLACE_CMD} 's|$$(LN_S) $$(INSTALL_DIR)/bin|$$(LN_S) ../${PORTNAME}-${PORTVERSION}/bin|g' \
-		${WRKSRC}/Makefile
-
-post-install-EXAMPLES-off:
-	${RM} -r ${STAGEDIR}${EXAMPLESDIR}
-
-post-install-DOCS-off:
-	${RM} -r ${STAGEDIR}${DOCSDIR}
+post-patch:
+	@${REINPLACE_CMD} \
+		'/LINKS_DIR/s|$$(INSTALL_DIR)|../${PORTNAME}-${PORTVERSION}|' \
+		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/gprolog/pkg-plist b/lang/gprolog/pkg-plist
index e15350e9b532..230e55f839bb 100644
--- a/lang/gprolog/pkg-plist
+++ b/lang/gprolog/pkg-plist
@@ -1,19 +1,16 @@
-%%FD%%bin/fd2c
+bin/fd2c
 bin/gplc
 bin/gprolog
 bin/hexgplc
 bin/ma2asm
 bin/pl2wam
 bin/wam2ma
-%%FD%%gprolog-%%GPROLOG_VER%%/bin/fd2c
-%%FD%%gprolog-%%GPROLOG_VER%%/lib/all_fd_bips.o
-%%FD%%gprolog-%%GPROLOG_VER%%/lib/libbips_fd.a
-%%FD%%gprolog-%%GPROLOG_VER%%/lib/libengine_fd.a
 gprolog-%%GPROLOG_VER%%/COPYING
 gprolog-%%GPROLOG_VER%%/ChangeLog
 gprolog-%%GPROLOG_VER%%/NEWS
 gprolog-%%GPROLOG_VER%%/README
 gprolog-%%GPROLOG_VER%%/VERSION
+gprolog-%%GPROLOG_VER%%/bin/fd2c
 gprolog-%%GPROLOG_VER%%/bin/gplc
 gprolog-%%GPROLOG_VER%%/bin/gprolog
 gprolog-%%GPROLOG_VER%%/bin/hexgplc
@@ -23,9 +20,166 @@ gprolog-%%GPROLOG_VER%%/bin/wam2ma
 gprolog-%%GPROLOG_VER%%/gprolog.ico
 gprolog-%%GPROLOG_VER%%/include/fd_to_c.h
 gprolog-%%GPROLOG_VER%%/include/gprolog.h
+gprolog-%%GPROLOG_VER%%/lib/all_fd_bips.o
 gprolog-%%GPROLOG_VER%%/lib/all_pl_bips.o
 gprolog-%%GPROLOG_VER%%/lib/debugger.o
+gprolog-%%GPROLOG_VER%%/lib/libbips_fd.a
 gprolog-%%GPROLOG_VER%%/lib/libbips_pl.a
+gprolog-%%GPROLOG_VER%%/lib/libengine_fd.a
 gprolog-%%GPROLOG_VER%%/lib/libengine_pl.a
 gprolog-%%GPROLOG_VER%%/lib/liblinedit.a
 gprolog-%%GPROLOG_VER%%/lib/top_level.o
+%%PORTDOCS%%%%DOCSDIR%%/compil-scheme.eps
+%%PORTDOCS%%%%DOCSDIR%%/compil-scheme.pdf
+%%PORTDOCS%%%%DOCSDIR%%/contents_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/debug-box.eps
+%%PORTDOCS%%%%DOCSDIR%%/debug-box.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gprolog.chm
+%%PORTDOCS%%%%DOCSDIR%%/gprolog.dvi
+%%PORTDOCS%%%%DOCSDIR%%/gprolog.html
+%%PORTDOCS%%%%DOCSDIR%%/gprolog.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gprolog.ps
+%%PORTDOCS%%%%DOCSDIR%%/html_node/contents_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog-idx.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog.css
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog001.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog002.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog003.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog004.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog005.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog006.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog007.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog008.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog009.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog010.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog011.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog012.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog013.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog014.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog015.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog016.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog017.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog018.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog019.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog020.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog021.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog022.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog023.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog024.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog025.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog026.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog027.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog028.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog029.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog030.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog031.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog032.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog033.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog034.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog035.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog036.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog037.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog038.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog039.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog040.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog041.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog042.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog043.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog044.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog045.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog046.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog047.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog048.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog049.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog050.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog051.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog052.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog053.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog054.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog055.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog056.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog057.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog058.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog059.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog060.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog061.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog062.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog063.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog064.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog065.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog066.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog067.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog068.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog069.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog070.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog071.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog072.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/gprolog073.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html_node/next_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html_node/previous_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/logo.eps
+%%PORTDOCS%%%%DOCSDIR%%/logo.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/examp.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/examp_c.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/new_main.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/new_main_c.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/alpha.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/array.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bdiag.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bdonald.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bpigeon.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bqueens.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bramsey.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bridge.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bridge1.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bschur.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/bsend.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/cars.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/crypta.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/digit8.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/donald.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/eq10.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/eq20.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/five.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/gardner.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/interval.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/langford.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/magic.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/magsq.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/multipl.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/partit.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/qg5.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/queens.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/queens_fd.fd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/send.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/square.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/srq.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/PROGS
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/boyer.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/browse.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/cal.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/chat_parser.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/common.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/crypt.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/ham.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/hook.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/meta_qsort.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/nand.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/nrev.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/poly_10.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/qsort.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/queens.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/queensn.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/query.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/reducer.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/sdda.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/sendmore.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/tak.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/tak_gvar.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesPl/zebra.pl