cvs commit: ports/lang/gprolog Makefile

[Anonymous]

Stefan Walter <stefan at FreeBSD.org> writes:

> Hi,
>
> QAT at FreeBSD.org, 25.06.10, 15:08h CEST:
>
>> The Restless Daemon identified a mtree error while trying to build:
>>  gprolog-1.3.1 maintained by ports at FreeBSD.org
>>  Makefile ident: $FreeBSD: ports/lang/gprolog/Makefile,v 1.28 2010/06/25 13:05:33 stefan Exp $
>> 
>> Excerpt from http://QAT.TecNik93.com/logs/8-STABLE-NPD/gprolog-1.3.1.log :
>
> I'm unable to reproduce this on a tinderbox. It doesn't leave any files
> behind there...

Even when NOPORTDOCS is defined? Here is a quick fix that makes the port
respect NOPORTEXAMPLES, too.

%%
Index: lang/gprolog/Makefile
===================================================================
RCS file: /a/.cvsup/ports/lang/gprolog/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- lang/gprolog/Makefile	25 Jun 2010 13:05:33 -0000	1.28
+++ lang/gprolog/Makefile	25 Jun 2010 20:03:37 -0000
@@ -19,16 +19,26 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:262
-CONFIGURE_ARGS=	--with-c-flags="${CFLAGS}" \
-		--with-doc-dir="${DOCSDIR}" \
-		--with-examples-dir="${EXAMPLESDIR}"
+CONFIGURE_ARGS=	--with-c-flags="${CFLAGS}"
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 
 PLIST_SUB+=	GPROLOG_VER=${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if !defined(NOPORTDOCS)
 PORTDOCS=	*
+CONFIGURE_ARGS+=--with-doc-dir="${DOCSDIR}"
+.else
+CONFIGURE_ARGS+=--with-doc-dir="${WRKDIR}/docs"
+.endif
 
-.include <bsd.port.pre.mk>
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
+CONFIGURE_ARGS+=--with-examples-dir="${EXAMPLESDIR}"
+.else
+CONFIGURE_ARGS+=--with-examples-dir="${WRKDIR}/examples"
+.endif
 
 .if defined(WITHOUT_FD)
 CONFIGURE_ARGS+=--disable-fd-solver
Index: lang/gprolog/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/lang/gprolog/pkg-plist,v
retrieving revision 1.9
diff -u -p -r1.9 pkg-plist
--- lang/gprolog/pkg-plist	19 Mar 2008 07:43:35 -0000	1.9
+++ lang/gprolog/pkg-plist	25 Jun 2010 20:02:34 -0000
@@ -27,72 +27,6 @@ gprolog-%%GPROLOG_VER%%/COPYING
 gprolog-%%GPROLOG_VER%%/VERSION
 gprolog-%%GPROLOG_VER%%/NEWS
 gprolog-%%GPROLOG_VER%%/ChangeLog
-%%EXAMPLESDIR%%/ExamplesPl/Makefile
-%%EXAMPLESDIR%%/ExamplesPl/README
-%%EXAMPLESDIR%%/ExamplesPl/PROGS
-%%EXAMPLESDIR%%/ExamplesPl/boyer.pl
-%%EXAMPLESDIR%%/ExamplesPl/browse.pl
-%%EXAMPLESDIR%%/ExamplesPl/cal.pl
-%%EXAMPLESDIR%%/ExamplesPl/chat_parser.pl
-%%EXAMPLESDIR%%/ExamplesPl/common.pl
-%%EXAMPLESDIR%%/ExamplesPl/crypt.pl
-%%EXAMPLESDIR%%/ExamplesPl/ham.pl
-%%EXAMPLESDIR%%/ExamplesPl/hook.pl
-%%EXAMPLESDIR%%/ExamplesPl/meta_qsort.pl
-%%EXAMPLESDIR%%/ExamplesPl/nand.pl
-%%EXAMPLESDIR%%/ExamplesPl/nrev.pl
-%%EXAMPLESDIR%%/ExamplesPl/poly_10.pl
-%%EXAMPLESDIR%%/ExamplesPl/qsort.pl
-%%EXAMPLESDIR%%/ExamplesPl/queens.pl
-%%EXAMPLESDIR%%/ExamplesPl/queensn.pl
-%%EXAMPLESDIR%%/ExamplesPl/query.pl
-%%EXAMPLESDIR%%/ExamplesPl/reducer.pl
-%%EXAMPLESDIR%%/ExamplesPl/sdda.pl
-%%EXAMPLESDIR%%/ExamplesPl/sendmore.pl
-%%EXAMPLESDIR%%/ExamplesPl/tak.pl
-%%EXAMPLESDIR%%/ExamplesPl/tak_gvar.pl
-%%EXAMPLESDIR%%/ExamplesPl/zebra.pl
-%%EXAMPLESDIR%%/ExamplesC/Makefile
-%%EXAMPLESDIR%%/ExamplesC/README
-%%EXAMPLESDIR%%/ExamplesC/examp.pl
-%%EXAMPLESDIR%%/ExamplesC/new_main.pl
-%%EXAMPLESDIR%%/ExamplesC/examp_c.c
-%%EXAMPLESDIR%%/ExamplesC/new_main_c.c
-%%EXAMPLESDIR%%/ExamplesFD/Makefile
-%%EXAMPLESDIR%%/ExamplesFD/alpha.pl
-%%EXAMPLESDIR%%/ExamplesFD/array.pl
-%%EXAMPLESDIR%%/ExamplesFD/bdiag.pl
-%%EXAMPLESDIR%%/ExamplesFD/bdonald.pl
-%%EXAMPLESDIR%%/ExamplesFD/bpigeon.pl
-%%EXAMPLESDIR%%/ExamplesFD/bqueens.pl
-%%EXAMPLESDIR%%/ExamplesFD/bramsey.pl
-%%EXAMPLESDIR%%/ExamplesFD/bridge.pl
-%%EXAMPLESDIR%%/ExamplesFD/bridge1.pl
-%%EXAMPLESDIR%%/ExamplesFD/bschur.pl
-%%EXAMPLESDIR%%/ExamplesFD/bsend.pl
-%%EXAMPLESDIR%%/ExamplesFD/cars.pl
-%%EXAMPLESDIR%%/ExamplesFD/crypta.pl
-%%EXAMPLESDIR%%/ExamplesFD/digit8.pl
-%%EXAMPLESDIR%%/ExamplesFD/donald.pl
-%%EXAMPLESDIR%%/ExamplesFD/eq10.pl
-%%EXAMPLESDIR%%/ExamplesFD/eq20.pl
-%%EXAMPLESDIR%%/ExamplesFD/five.pl
-%%EXAMPLESDIR%%/ExamplesFD/gardner.pl
-%%EXAMPLESDIR%%/ExamplesFD/langford.pl
-%%EXAMPLESDIR%%/ExamplesFD/magic.pl
-%%EXAMPLESDIR%%/ExamplesFD/magsq.pl
-%%EXAMPLESDIR%%/ExamplesFD/multipl.pl
-%%EXAMPLESDIR%%/ExamplesFD/partit.pl
-%%EXAMPLESDIR%%/ExamplesFD/qg5.pl
-%%EXAMPLESDIR%%/ExamplesFD/queens.pl
-%%EXAMPLESDIR%%/ExamplesFD/send.pl
-%%EXAMPLESDIR%%/ExamplesFD/square.pl
-%%EXAMPLESDIR%%/ExamplesFD/srq.pl
-%%EXAMPLESDIR%%/ExamplesFD/queens_fd.fd
- at dirrm %%EXAMPLESDIR%%/ExamplesFD
- at dirrm %%EXAMPLESDIR%%/ExamplesC
- at dirrm %%EXAMPLESDIR%%/ExamplesPl
- at dirrm %%EXAMPLESDIR%%
 @dirrm gprolog-%%GPROLOG_VER%%/lib
 @dirrm gprolog-%%GPROLOG_VER%%/include
 @dirrm gprolog-%%GPROLOG_VER%%/bin
%%