Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1480131445225790"
MIME-Version: 1.0
Date: Sat, 26 Nov 2016 03:37:25 +0000
From: "John Marino" <marino@netbsd.org>
Subject: CVS commit: pkgsrc/devel/gprbuild-aux
To: pkgsrc-changes@NetBSD.org
Reply-To: marino@netbsd.org
Message-Id: <20161126033725.D5A34FBA6@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1480131445225790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	marino
Date:		Sat Nov 26 03:37:25 UTC 2016

Modified Files:
	pkgsrc/devel/gprbuild-aux: Makefile
Added Files:
	pkgsrc/devel/gprbuild-aux/files: Makefile.BSD

Log Message:
devel/gprbuild-aux: Commit forgotten file

User-error on CVS, the file didn't get successfully added the first time.
While here, correct the localbase on the xml data file.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/gprbuild-aux/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gprbuild-aux/files/Makefile.BSD

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1480131445225790
Content-Disposition: inline
Content-Length: 3643
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/gprbuild-aux/Makefile
diff -u pkgsrc/devel/gprbuild-aux/Makefile:1.7 pkgsrc/devel/gprbuild-aux/Makefile:1.8
--- pkgsrc/devel/gprbuild-aux/Makefile:1.7	Fri Nov 25 20:36:49 2016
+++ pkgsrc/devel/gprbuild-aux/Makefile	Sat Nov 26 03:37:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/11/25 20:36:49 marino Exp $
+# $NetBSD: Makefile,v 1.8 2016/11/26 03:37:25 marino Exp $
 #
 
 DISTNAME=	gprbuild-aux-${SNAPSHOT}
@@ -20,6 +20,13 @@ MAKE_ENV=		ADA_PROJECT_PATH=${PREFIX}/li
 WRKSRC=			${WRKDIR}/gprbuild-${TAGNAME}
 BUILD_DIRS=		${WRKSRC}/construction
 
+SUBST_CLASSES=		lbase
+
+SUBST_STAGE.lbase=	post-patch
+SUBST_FILES.lbase=	share/gprconfig/compilers.xml
+SUBST_SED.lbase=	-e "s|/usr/local|${LOCALBASE}|"
+SUBST_MESSAGE.lbase=	Ensure pkgsrc localbase is used
+
 post-patch:
 	${MKDIR} ${WRKDIR}/trash ${BUILD_DIRS}
 	${CP} ${FILESDIR}/Makefile.BSD ${BUILD_DIRS}/Makefile

Added files:

Index: pkgsrc/devel/gprbuild-aux/files/Makefile.BSD
diff -u /dev/null pkgsrc/devel/gprbuild-aux/files/Makefile.BSD:1.1
--- /dev/null	Sat Nov 26 03:37:25 2016
+++ pkgsrc/devel/gprbuild-aux/files/Makefile.BSD	Sat Nov 26 03:37:25 2016
@@ -0,0 +1,82 @@
+.PATH:		../src
+.PATH:		../gpr/src
+
+STATIC_FLAGS=	-gnat12 -gnaty -gnatQ -O2 -gnatpn -gnatws -g1
+
+PREFIX?=	/usr/local
+GPRLIB_INC=	-I${PREFIX}/include/xmlada -I../gpr/src
+LOOK=		-aL${PREFIX}/lib/xmlada/static -aI${PREFIX}/include/xmlada
+
+libgpr_csrc=	gprbuild_dummies.c \
+		gpr_imports.c
+
+LARGS=		 ${libgpr_csrc:S/^/-largs /:.c=.o} \
+		-largs ${PREFIX}/lib/xmlada/static/libxmlada_dom.a \
+		-largs ${PREFIX}/lib/xmlada/static/libxmlada_input_sources.a \
+		-largs ${PREFIX}/lib/xmlada/static/libxmlada_sax.a \
+		-largs ${PREFIX}/lib/xmlada/static/libxmlada_schema.a \
+		-largs ${PREFIX}/lib/xmlada/static/libxmlada_unicode.a
+
+APPS=		gprclean/gprclean-main.adb \
+		gprconfig/gprconfig-main.adb \
+		gprbuild/gprbuild-main.adb \
+		gprbind/gprbind.adb \
+		gprlib/gprlib.adb \
+		gprinstall/gprinstall-main.adb \
+		gprname/gprname-main.adb \
+		gprls/gprls-main.adb
+# gprslave needs gcc6-aux to build
+#		gprslave/gprslave.adb
+
+all:		${APPS:H}
+
+gprclean: gprclean-main.adb ${libgpr_csrc:.c=.o}
+	gnatmake -o ${.TARGET} -j${PROCESSORS} \
+		${STATIC_FLAGS} ${GPRLIB_INC} ${LOOK} \
+		${.ALLSRC:M*adb} ${LARGS}
+
+.for app in ${APPS:Ngprclean*}
+${app:H}: gprclean ${app:T} ${libgpr_csrc:.c=.o}
+	gnatmake -o ${.TARGET} ${STATIC_FLAGS} ${GPRLIB_INC} ${LOOK} \
+		${.ALLSRC:M*adb} ${LARGS}
+.endfor
+
+clean:
+	rm -f *.o *.ali b~* ${APP:H}
+
+gen-docs:
+	${MAKE} -e -C ${.CURDIR:H}/doc html txt
+
+install:
+	mkdir -p ${DESTDIR}${PREFIX}/bin \
+		${DESTDIR}${PREFIX}/libexec/gprbuild \
+		${DESTDIR}${PREFIX}/share/gpr \
+		${DESTDIR}${PREFIX}/share/gprconfig
+	${BSD_INSTALL_PROGRAM} \
+		${.CURDIR}/gprclean \
+		${.CURDIR}/gprinstall \
+		${.CURDIR}/gprconfig \
+		${.CURDIR}/gprls \
+		${.CURDIR}/gprname \
+		${.CURDIR}/gprbuild \
+			${DESTDIR}${PREFIX}/bin
+#		${.CURDIR}/gprslave
+
+	${BSD_INSTALL_PROGRAM} \
+		${.CURDIR}/gprbind \
+		${.CURDIR}/gprlib \
+			${DESTDIR}${PREFIX}/libexec/gprbuild
+	${BSD_INSTALL_DATA} \
+		${.CURDIR}/../share/_default.gpr \
+			${DESTDIR}${PREFIX}/share/gpr
+	${BSD_INSTALL_DATA} \
+		${.CURDIR}/../share/gprconfig/*.x[sm][dl] \
+			${DESTDIR}${PREFIX}/share/gprconfig
+
+install-docs:
+	mkdir -p ${DESTDIR}${PREFIX}/share/doc/gprbuild/txt
+	${BSD_INSTALL_DATA} ${.CURDIR}/../doc/txt/gprbuild_ug.txt \
+		${DESTDIR}${PREFIX}/share/doc/gprbuild/txt
+	rm -rf ${.CURDIR}/../doc/html/_sources
+	rm -f ${.CURDIR}/../doc/html/.buildinfo
+	cp -a ${.CURDIR}/../doc/html ${DESTDIR}${PREFIX}/share/doc/gprbuild


--_----------=_1480131445225790--