Removed use of Makefile.archy and tidied the PKGBUILD.

3 files changed, 6 insertions, 165 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b31524f2d8e1..3e194d78563c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,10 +8,8 @@ pkgbase = gprbuild
 	depends = gcc-ada
 	depends = xmlada
 	source = http://mirrors.cdn.adacore.com/art/564b3e2ec8e196b040fbd13a
-	source = Makefile.archy
 	source = patch-gnat_targparm
 	sha256sums = 5d5bbc8c57075250c264e2f15d9949383450ac696eb8a90803c2a36b55ecd0e2
-	sha256sums = 374dc526242e5210508c11631d3bd84c41a4322b228c9c6b4210cd1a95eac76c
 	sha256sums = d5da23b8457c2746e2a23adcfea053d070a08b84e87a2bf076a29245e75abdc5
 
 pkgname = gprbuild
diff --git a/Makefile.archy b/Makefile.archy
deleted file mode 100644
index 0e9a29f44042..000000000000
--- a/Makefile.archy
+++ /dev/null
@@ -1,111 +0,0 @@
-.PHONY: all
-.PHONY: generate_sources
-
-AFLAGS=	-gnat12 -gnaty -gnatQ -O2 -gnatpn -gnatws -g1 -j7
-
-COBJS=	obj/link.o obj/gprbuild_dummies.o
-
-CURRENT_FOLDER=$(shell pwd)
-
-
-LOOK=	-aI${CURRENT_FOLDER}/gnat -aI${CURRENT_FOLDER}/gen_src \
-	-aL${PREFIX}/lib/xmlada/static -aI${PREFIX}/include/xmlada
-
-LARGS=	-largs ${CURRENT_FOLDER}/obj/link.o \
-	-largs ${CURRENT_FOLDER}/obj/gprbuild_dummies.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
-
-GENDIR=		gen_src
-GEN_SRCS=	${GENDIR}/snames.adb ${GENDIR}/snames.ads
-DOCSDIR=	${PREFIX}/share/doc/gprbuild
-
-
-BSD_INSTALL_PROGRAM=install
-BSD_INSTALL_DATA=install
-
-
-all: gprbuild
-
-install:
-	mkdir -p ${DESTDIR}${PREFIX}/bin \
-		${DESTDIR}${PREFIX}/libexec/gprbuild \
-		${DESTDIR}${PREFIX}/share/gpr \
-		${DESTDIR}${PREFIX}/share/gprconfig
-
-	${BSD_INSTALL_PROGRAM} \
-                ${CURRENT_FOLDER}/gprclean \
-		${CURRENT_FOLDER}/gprinstall \
-		${CURRENT_FOLDER}/gprconfig \
-		${CURRENT_FOLDER}/gprslave \
-		${CURRENT_FOLDER}/gprbuild ${DESTDIR}${PREFIX}/bin
-
-	${BSD_INSTALL_PROGRAM} ${CURRENT_FOLDER}/gprbind \
-		${CURRENT_FOLDER}/gprlib ${DESTDIR}${PREFIX}/libexec/gprbuild
-
-	${BSD_INSTALL_DATA} ${CURRENT_FOLDER}/share/_default.gpr \
-		${DESTDIR}${PREFIX}/share/gpr
-
-	${BSD_INSTALL_DATA} ${CURRENT_FOLDER}/share/gprconfig/* \
-		${DESTDIR}${PREFIX}/share/gprconfig
-
-install-docs:
-	mkdir -p ${DESTDIR}${DOCSDIR}/html ${DESTDIR}${DOCSDIR}/txt \
-		${DESTDIR}${DOCSDIR}/pdf
-	${BSD_INSTALL_DATA} ${CURRENT_FOLDER}/doc/txt/gprbuild_ug.txt \
-		${DESTDIR}${DOCSDIR}/txt
-	${BSD_INSTALL_DATA} ${CURRENT_FOLDER}/doc/pdf/gprbuild_ug.pdf \
-		${DESTDIR}${DOCSDIR}/pdf
-	cp -r ${CURRENT_FOLDER}/doc/html/* ${DESTDIR}${DOCSDIR}/html
-	rm -rf ${DESTDIR}${DOCSDIR}/html/_sources
-	${BSD_INSTALL_DATA} ${CURRENT_FOLDER}/doc/*.png \
-		${DESTDIR}${DOCSDIR}/html
-
-gprclean: src/gprclean-main.adb ${GEN_SRCS} ${COBJS}
-	gnatmake -o gprclean ${AFLAGS} ${LOOK} \
-		${CURRENT_FOLDER}/src/gprclean-main.adb ${LARGS}
-
-gprbind: gprclean src/gprslave.adb ${GEN_SRCS} ${COBJS}
-	gnatmake -o gprbind ${AFLAGS} ${LOOK} \
-		${CURRENT_FOLDER}/src/gprbind.adb ${LARGS}
-
-gprlib: gprbind src/gprslave.adb ${GEN_SRCS} ${COBJS}
-	gnatmake -o gprlib ${AFLAGS} ${LOOK} \
-		${CURRENT_FOLDER}/src/gprlib.adb ${LARGS}
-
-gprslave: gprlib src/gprslave.adb ${GEN_SRCS} ${COBJS}
-	gnatmake -o gprslave ${AFLAGS} ${LOOK} \
-		${CURRENT_FOLDER}/src/gprslave.adb ${LARGS}
-
-gprinstall: gprslave src/gprinstall-main.adb ${GEN_SRCS} ${COBJS}
-	gnatmake -o gprinstall ${AFLAGS} ${LOOK} \
-		${CURRENT_FOLDER}/src/gprinstall-main.adb ${LARGS}
-
-gprconfig: gprinstall src/gprconfig-main.adb ${GEN_SRCS} ${COBJS}
-	gnatmake -o gprconfig ${AFLAGS} ${LOOK} \
-		${CURRENT_FOLDER}/src/gprconfig-main.adb ${LARGS}
-
-gprbuild: gprconfig src/gprbuild-main.adb ${GEN_SRCS} ${COBJS}
-	gnatmake -o gprbuild ${AFLAGS} ${LOOK} \
-		${CURRENT_FOLDER}/src/gprbuild-main.adb ${LARGS}
-
-obj/link.o: gnat/link.c
-	gcc -c -o ${CURRENT_FOLDER}/obj/link.o gnat/link.c
-
-obj/gprbuild_dummies.o: src/gprbuild_dummies.c
-	gcc -c -o ${CURRENT_FOLDER}/obj/gprbuild_dummies.o src/gprbuild_dummies.c
-
-generate_sources:
-	mkdir -p ${CURRENT_FOLDER}/${GENDIR}
-	(cd ${CURRENT_FOLDER}/gnat && cp xsnamest.adb xutil.* snames.adb-tmpl \
-		snames.ads-tmpl snames.h-tmpl ../${GENDIR})
-	(cd ${CURRENT_FOLDER}/${GENDIR} && \
-		gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
-		./xsnamest && \
-		mv snames.ns snames.ads && \
-		mv snames.nb snames.adb)
-
-${GEN_SRCS}: generate_sources
diff --git a/PKGBUILD b/PKGBUILD
index f46da0873ed9..5124a7c0d6e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,48 +13,19 @@ arch=('any')
 license=('GPL')
 url="http://www.adacore.com/gnatpro/toolsuite/gprbuild/"
 
-#source=("http://downloads.dragonlace.net/src/${pkgname}-gpl-${pkgver}-src.tar.gz"
-#        "https://www.assembla.com/spaces/openada/documents/aNlX7o4oyr5lxdacwqjQWU/download/aNlX7o4oyr5lxdacwqjQWU"
-#        "patch-src_gpr__version.adb"
-#       "extrapatch-src_gprbuild-main.adb"
-#        "extrapatch-src_rewrite__data.ada"
-#        "extrapatch-5-gprbuild-slave.adb"
-#        "extrapatch-protocol.adb"
-#        "patch-src_gprinstall-install.adb"
-#        "extrapatch-src_gprslave.adb")
-
 source=("http://mirrors.cdn.adacore.com/art/564b3e2ec8e196b040fbd13a"
-        "Makefile.archy"
-        "patch-gnat_targparm"
-)
-
+        "patch-gnat_targparm")
 
 sha256sums=('5d5bbc8c57075250c264e2f15d9949383450ac696eb8a90803c2a36b55ecd0e2'
-            '374dc526242e5210508c11631d3bd84c41a4322b228c9c6b4210cd1a95eac76c'
-            'd5da23b8457c2746e2a23adcfea053d070a08b84e87a2bf076a29245e75abdc5'
-)
+            'd5da23b8457c2746e2a23adcfea053d070a08b84e87a2bf076a29245e75abdc5')
 
 
 
 prepare()
 {
   WRKSRC=$srcdir/$pkgname-gpl-$pkgver-src
-  CONHOST=Linux
-  
-
-	cp $srcdir/Makefile.archy ${WRKSRC}
-
-#	sed -i "" -e "s,@AUXPREFIX@,${PREFIX}/gcc5-aux," \
-#		${WRKSRC}/share/gprconfig/compilers.xml
-
-	sed -e 's|@host@|${CONHOST}|' \
-		${WRKSRC}/src/gprconfig-sdefault.ads.in > \
-		${WRKSRC}/src/gprconfig-sdefault.ads
-
-#	mv ${WRKSRC}/share/gprconfig/*.orig ${WRKSRC}/obj-cov
 
   cd $pkgname-gpl-$pkgver-src
-
   patch -p0 -i ../patch-gnat_targparm
 }
 
@@ -62,34 +33,17 @@ prepare()
 
 build() 
 {
-#  export OS=unix
-
-
   cd $pkgname-gpl-$pkgver-src
 
-#  rm -fr gnat
-#  cp -r ../gnat .
-
-#  find -name '*.adb' -print -exec sed -i.bak 's/Try_Help;//g' {} \;
-
-#  rm -fr src/rewrite_data.ads
-#  rm -fr src/rewrite_data.adb
-
-#  patch -p0 -i ../patch-src_gpr__version.adb
-#  patch -p0 -i ../extrapatch-src_gprbuild-main.adb
-#  patch -p0 -i ../extrapatch-src_rewrite__data.ada
-#  patch -p0 -i ../extrapatch-5-gprbuild-slave.adb
-#  patch -p0 -i ../extrapatch-protocol.adb
-#  patch -p0 -i ../patch-src_gprinstall-install.adb
-#  patch -p0 -i ../extrapatch-src_gprslave.adb
-
   ./configure --prefix="/usr"
-  PREFIX=/usr  make -f Makefile.archy all
+  PREFIX=/usr  make all
 }
 
 
+
 package() 
 {
   cd $pkgname-gpl-$pkgver-src
-  DESTDIR=$pkgdir  PREFIX=/usr  make -f Makefile.archy prefix="$pkgdir/usr" install
+
+  DESTDIR=$pkgdir  PREFIX=/usr  make  prefix="$pkgdir/usr" install
 }