svn commit: r344986 - in head/devel/libspark2012: . files

[John Marino]

Author: marino
Date: Wed Feb 19 02:19:43 2014
New Revision: 344986
URL: http://svnweb.freebsd.org/changeset/ports/344986
QAT: https://qat.redports.org/buildarchive/r344986/

Log:
  devel/spark2012: Build the static library to stop ironsides leftovers
  
  Without a static library present, gnatmake will build the objects it
  needs in the base system -- that's not legal.
  
  The original issue I had with this was using BSD_INSTALL_LIB which
  stripped out the symbols in the static library, but I didn't realize
  what was happening.  Now I know and the library is installed intact
  with BSD_INSTALL_DATA.

Added:
  head/devel/libspark2012/files/
  head/devel/libspark2012/files/patch-Makefile   (contents, props changed)
  head/devel/libspark2012/files/patch-spark2012.gpr   (contents, props changed)
Modified:
  head/devel/libspark2012/Makefile
  head/devel/libspark2012/pkg-plist

Modified: head/devel/libspark2012/Makefile
==============================================================================
--- head/devel/libspark2012/Makefile	Wed Feb 19 02:08:53 2014	(r344985)
+++ head/devel/libspark2012/Makefile	Wed Feb 19 02:19:43 2014	(r344986)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libspark2012
 PORTVERSION=	2012
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
@@ -11,9 +12,7 @@ COMMENT=	SPARK 2012 Spark.Ada library
 
 LICENSE=	GPLv3
 
+USES=		ada
 USE_BZIP2=	yes
 
-# No library is built; only the source files are installed
-# Therefore, USES=ada is not required
-
 .include <bsd.port.mk>

Added: head/devel/libspark2012/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libspark2012/files/patch-Makefile	Wed Feb 19 02:19:43 2014	(r344986)
@@ -0,0 +1,29 @@
+--- Makefile.orig	2014-02-17 05:26:40.000000000 -0500
++++ Makefile
+@@ -1,23 +1,13 @@
+-all: nada
++all: build
+ 
+-nada:
+-
+-build-orig:
++build:
+ 	gnatmake -p -P build_spark2012
+ 
+ install:
+ 	mkdir -p ${DESTDIR}${PREFIX}/lib/gnat \
+-		 ${DESTDIR}${PREFIX}/include/spark2012
+-	${BSD_INSTALL_DATA} spark2012.gpr \
+-		${DESTDIR}${PREFIX}/lib/gnat
+-	${BSD_INSTALL_DATA} src/*.ad[bs] \
+-		${DESTDIR}${PREFIX}/include/spark2012
+-
+-install-orig:
+-	mkdir -p ${DESTDIR}${PREFIX}/lib/gnat \
+ 		 ${DESTDIR}${PREFIX}/lib/spark2012 \
+ 		 ${DESTDIR}${PREFIX}/include/spark2012
+-	${BSD_INSTALL_LIB} src/build/lib/libspark2012.a \
++	${BSD_INSTALL_DATA} src/build/lib/libspark2012.a \
+ 		${DESTDIR}${PREFIX}/lib/spark2012
+ 	${BSD_INSTALL_DATA} src/build/lib/*.ali \
+ 		${DESTDIR}${PREFIX}/lib/spark2012

Added: head/devel/libspark2012/files/patch-spark2012.gpr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libspark2012/files/patch-spark2012.gpr	Wed Feb 19 02:19:43 2014	(r344986)
@@ -0,0 +1,13 @@
+--- spark2012.gpr.orig	2014-02-17 05:33:24.000000000 -0500
++++ spark2012.gpr
+@@ -1,5 +1,10 @@
+ project SPARK2012 is
+ 
++   for Languages use ("Ada");
+    for Source_Dirs use ("../../include/spark2012");
++   for Library_Dir use "../../lib/spark2012";
++   for Library_Name use "spark2012";
++   for Library_Kind use "static";
++   for Externally_Built use "True";
+ 
+ end SPARK2012;

Modified: head/devel/libspark2012/pkg-plist
==============================================================================
--- head/devel/libspark2012/pkg-plist	Wed Feb 19 02:08:53 2014	(r344985)
+++ head/devel/libspark2012/pkg-plist	Wed Feb 19 02:19:43 2014	(r344986)
@@ -31,5 +31,26 @@ include/spark2012/spark-unsigned.adb
 include/spark2012/spark-unsigned.ads
 include/spark2012/spark.ads
 lib/gnat/spark2012.gpr
+lib/spark2012/libspark2012.a
+lib/spark2012/spark-ada-command_line-unbounded_string.ali
+lib/spark2012/spark-ada-command_line.ali
+lib/spark2012/spark-ada-containers.ali
+lib/spark2012/spark-ada-strings-maps-not_spark.ali
+lib/spark2012/spark-ada-strings-maps.ali
+lib/spark2012/spark-ada-strings-not_spark.ali
+lib/spark2012/spark-ada-strings-unbounded-not_spark.ali
+lib/spark2012/spark-ada-strings-unbounded.ali
+lib/spark2012/spark-ada-strings.ali
+lib/spark2012/spark-ada-text_io-not_spark.ali
+lib/spark2012/spark-ada-text_io-unbounded_string.ali
+lib/spark2012/spark-ada-text_io.ali
+lib/spark2012/spark-ada.ali
+lib/spark2012/spark-crypto-debug.ali
+lib/spark2012/spark-crypto-hash-skein.ali
+lib/spark2012/spark-crypto-hash.ali
+lib/spark2012/spark-crypto.ali
+lib/spark2012/spark-unsigned.ali
+lib/spark2012/spark.ali
+ at dirrm lib/spark2012
 @dirrmtry lib/gnat
 @dirrm include/spark2012