Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Jul 2013 19:47:49 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r322141 - in head/textproc/xmlada: . files
Message-ID:  <201307011947.r61Jln8I031891@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Mon Jul  1 19:47:49 2013
New Revision: 322141
URL: http://svnweb.freebsd.org/changeset/ports/322141

Log:
  textproc/xmlada: update to 4.4.0.0
  
  - Update to 4.4.0.0
  - Auto-generate pkg-plist
  - Add DOCS option
  
  PR:		ports/180158
  Submitted by:	John Marino <draco@marino.st> (maintainer)

Deleted:
  head/textproc/xmlada/files/patch-docs__Makefile.in
  head/textproc/xmlada/pkg-plist
Modified:
  head/textproc/xmlada/Makefile
  head/textproc/xmlada/distinfo
  head/textproc/xmlada/files/patch-Makefile.in
  head/textproc/xmlada/files/patch-dom_dom.gpr
  head/textproc/xmlada/files/patch-input__sources_input__sources.gpr
  head/textproc/xmlada/files/patch-sax_sax.gpr
  head/textproc/xmlada/files/patch-schema_schema.gpr

Modified: head/textproc/xmlada/Makefile
==============================================================================
--- head/textproc/xmlada/Makefile	Mon Jul  1 19:18:17 2013	(r322140)
+++ head/textproc/xmlada/Makefile	Mon Jul  1 19:47:49 2013	(r322141)
@@ -1,23 +1,34 @@
-# Created by: John Marino <draco@marino.st> 
+# Created by: John Marino <draco@marino.st>
 # $FreeBSD$
 
 PORTNAME=	xmlada
-PORTVERSION=	4.2.0.0
-PORTREVISION=	1
+PORTVERSION=	4.4.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
 MAINTAINER=	draco@marino.st
 COMMENT=	Adacore XML suite for the Ada language
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USES=		ada
 
-LICENSE=		GPLv2
+DESTINY=	${WRKDIR}/destino
+MAKE_ENV+=	DESTDIR=${DESTINY}
+
 MAKE_JOBS_UNSAFE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+.endif
+
 # Link options were added for sax, dom, schema, and input_sources libraries
 # "-R" option disables all rpaths except adalib and compiler libs.  This is
 #      done because by default the rpaths will points at the WRKOBJDIR because
@@ -31,5 +42,22 @@ post-patch:
 	  ${WRKSRC}/dom/dom.gpr \
 	  ${WRKSRC}/schema/schema.gpr \
 	  ${WRKSRC}/input_sources/input_sources.gpr
+.if ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's/^all: \(.*\)/all: \1 docs/g' ${WRKSRC}/Makefile.in
+.endif
+
+post-install:
+	${RM} -rf ${DESTINY}${PREFIX}/share/doc/xmlada/_sources
+	${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/
+	@cd ${DESTINY}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+	   ${SORT} > ${WRKDIR}/PLIST.all
+	@cd ${DESTINY}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
+	   ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' -e '/share\/gps/d' \
+	   -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@${CAT} ${WRKDIR}/PLIST.all >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/textproc/xmlada/distinfo
==============================================================================
--- head/textproc/xmlada/distinfo	Mon Jul  1 19:18:17 2013	(r322140)
+++ head/textproc/xmlada/distinfo	Mon Jul  1 19:47:49 2013	(r322141)
@@ -1,2 +1,2 @@
-SHA256 (xmlada-4.2.0.0.tar.bz2) = c20700e8eda190e31fcc6384aff69428136a50e9e0d3150999abe57d1977642c
-SIZE (xmlada-4.2.0.0.tar.bz2) = 668384
+SHA256 (xmlada-4.4.0.0.tar.bz2) = 6e5da4fbde26caa41c761f8d5181f7a362a62c7ab55cccdb883915e19da5798f
+SIZE (xmlada-4.4.0.0.tar.bz2) = 632217

Modified: head/textproc/xmlada/files/patch-Makefile.in
==============================================================================
--- head/textproc/xmlada/files/patch-Makefile.in	Mon Jul  1 19:18:17 2013	(r322140)
+++ head/textproc/xmlada/files/patch-Makefile.in	Mon Jul  1 19:47:49 2013	(r322141)
@@ -1,57 +1,63 @@
-$NetBSD: patch-aa,v 1.4 2011/12/03 07:30:48 marino Exp $
-
---- Makefile.in.orig	2011-10-08 19:19:00.000000000 +0000
+--- Makefile.in.orig	2013-06-30 18:36:28.000000000 +0000
 +++ Makefile.in
-@@ -52,10 +52,10 @@ MAKE_ARGS=-XMODE=${MODE} -XLIBRARY_TYPE=
- .PHONY: all obj clean install install_dirs build_library_type install_library_type
+@@ -83,72 +83,65 @@ run_test_valgrind: test
+ 	cd dom/test; valgrind --tool=memcheck --leak-check=full ./testxml -auto
  
- ifeq (${BUILDS_SHARED},yes)
--all: static relocatable
-+all: static relocatable docs
- install: install_static install_relocatable
- else
--all: static
-+all: static docs
- install: install_static
- endif
- 
-@@ -91,53 +91,50 @@ docs: force
+ docs: force
+-	-${MAKE} -e -C docs html latexpdf
++	-${MAKE} -e -C docs html
  
  # Rule for installing the modules
  %_inst: force
 -	${CP} $*/*.ad[bs]        ${includedir}/xmlada
--	cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr
+-	cd $*; ls *.ad[bs] > ${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr
 -	-cd ${xmllib}; ${CHMOD} ugo+w *.ali
 -	-${CP} $*/lib/${LIBRARY_TYPE}/*.ali   ${xmllib}
 -	${RM} ${libdir}/libxmlada_$**
 -	${RM} ${xmllib}libxmlada_$**
-+	${CP} $*/*.ad[bs]        ${DESTDIR}${includedir}/xmlada
-+	cd $*; ls *.ad[bs] > ${DESTDIR}${libdir}/gnat/xmlada/xmlada_$*.lgpr
++	${CP} $*/*.ad[bs] ${DESTDIR}${includedir}/xmlada
++	cd $*; ls *.ad[bs] > ${DESTDIR}${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr
 +	-cd ${DESTDIR}${xmllib}; ${CHMOD} ugo+w *.ali
-+	-${CP} $*/lib/${LIBRARY_TYPE}/*.ali   ${DESTDIR}${xmllib}
++	-${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}${xmllib}
 +	${RM} ${DESTDIR}${libdir}/libxmlada_$**
 +	${RM} ${DESTDIR}${xmllib}libxmlada_$**
  ifeq (${LIBRARY_TYPE},static)
 -	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib}
-+	${INSTALL} -m 644 $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}${xmllib}
++	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}${xmllib}
  else
- ifeq (${OS},Windows_NT)
--	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib}
--	cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT}
-+	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${DESTDIR}${xmllib}
-+	cd ${DESTDIR}${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT}
- else
--	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib}
--	cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
--	cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
--	cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
--	cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
-+	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}${xmllib}
-+	cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
-+	cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-+	cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-+	cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
+-ifeq (${LIBEXT},.dll)
+-	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} ${xmllib}
+-	cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT}
+-else
+-	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} ${xmllib}
++	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} ${DESTDIR}${xmllib}
+ 
+ 	@# prefix/lib/xmlada/relocatable/libxmlada.so -> libxmlada.so.4.4.0w
+-	cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}
++	cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}
+ 
+ 	@# prefix/lib/xmlada/relocatable/libxmlada.so.4.4 -> libxmlada.so.4.4.0w
+-	-cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
++	-cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
+ 
+ 	@# prefix/lib/xmlada/relocatable/libxmlada.so.4 -> libxmlada.so.4.4.0w
+ ifneq (${basename ${basename ${VERSION}}},${basename ${VERSION}})
+-	cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
++	cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
+ 
+ 	@# prefix/lib/libxmlada.so.4 -> prefix/lib/xmlada/relocatable/libxmlada.so.4.4.0w
+-	cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
++	cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
  endif
+ 
+ 	@# prefix/lib/libxmlada.so.4.4 -> prefix/lib/xmlada/relocatable/libxmlada.so.4.4.0w
+-	-cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
++	-cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
+ 
+ 	@# prefix/lib/libxmlada.so.4.4.0w -> prefix/lib/xmlada/relocatable/libxmlada.so.4.4.0w
+-	-cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION}
+-endif
++	-cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION}
  endif
 -	cd ${xmllib}; ${CHMOD} ugo-w *.ali
 +	cd ${DESTDIR}${xmllib}; ${CHMOD} ugo-w *.ali
@@ -59,13 +65,15 @@ $NetBSD: patch-aa,v 1.4 2011/12/03 07:30
  install_dirs: force
 -	@${MKDIR} ${bindir}
 -	@${MKDIR} ${xmllib}
--	@${MKDIR} ${libdir}/gnat/xmlada
+-	@${MKDIR} ${prefix}/lib/gnat/xmlada
+-	@${MKDIR} ${libdir}
 -	@${MKDIR} ${datadir}/doc/xmlada
 -	@${MKDIR} ${includedir}/xmlada
 -	@${MKDIR} ${datadir}/gps/plug-ins/
 +	@${MKDIR} ${DESTDIR}${bindir}
 +	@${MKDIR} ${DESTDIR}${xmllib}
-+	@${MKDIR} ${DESTDIR}${libdir}/gnat/xmlada
++	@${MKDIR} ${DESTDIR}${prefix}/lib/gnat/xmlada
++	@${MKDIR} ${DESTDIR}${libdir}
 +	@${MKDIR} ${DESTDIR}${datadir}/doc/xmlada
 +	@${MKDIR} ${DESTDIR}${includedir}/xmlada
 +	@${MKDIR} ${DESTDIR}${datadir}/gps/plug-ins/
@@ -73,31 +81,28 @@ $NetBSD: patch-aa,v 1.4 2011/12/03 07:30
  ## Do the installation for either shared or static, depending on
  ## $LIBRARY_TYPE
  install_library_type: install_dirs ${MODULE_INSTALL}
--	${INSTALL} distrib/xmlada_shared.gpr         ${libdir}/gnat
--	${INSTALL} distrib/xmlada.gpr                ${libdir}/gnat/
--	${INSTALL} distrib/xmlada_dom.gpr            ${libdir}/gnat/
--	${INSTALL} distrib/xmlada_sax.gpr            ${libdir}/gnat/
--	${INSTALL} distrib/xmlada_input.gpr          ${libdir}/gnat/
--	${INSTALL} distrib/xmlada_schema.gpr         ${libdir}/gnat/
--	${INSTALL} distrib/xmlada_unicode.gpr        ${libdir}/gnat/
+-	${INSTALL} distrib/xmlada_shared.gpr         ${prefix}/lib/gnat/
+-	${INSTALL} distrib/xmlada.gpr                ${prefix}/lib/gnat/
+-	${INSTALL} distrib/xmlada_dom.gpr            ${prefix}/lib/gnat/
+-	${INSTALL} distrib/xmlada_sax.gpr            ${prefix}/lib/gnat/
+-	${INSTALL} distrib/xmlada_input.gpr          ${prefix}/lib/gnat/
+-	${INSTALL} distrib/xmlada_schema.gpr         ${prefix}/lib/gnat/
+-	${INSTALL} distrib/xmlada_unicode.gpr        ${prefix}/lib/gnat/
 -	${INSTALL} xmlada-config  ${bindir}
--	-${INSTALL} docs/xml.ps   ${datadir}/doc/xmlada 2>/dev/null
--	-${INSTALL} docs/xml.pdf  ${datadir}/doc/xmlada
--	-${INSTALL} docs/xml.html ${datadir}/doc/xmlada
--	-${INSTALL} docs/xml.info ${datadir}/doc/xmlada
+-	-$(CP) -r docs/_build/html/* $(datadir)/doc/xmlada/ 2>/dev/null
+-	-$(CP) -r docs/_build/latex/XMLAda.pdf $(datadir)/doc/xmlada/ 2>/dev/null
 -	${CHMOD} +x ${bindir}/xmlada-config
 -	${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/
-+	${INSTALL} -m 644 distrib/xmlada_shared.gpr  ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} -m 644 distrib/xmlada.gpr         ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} -m 644 distrib/xmlada_dom.gpr     ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} -m 644 distrib/xmlada_sax.gpr     ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} -m 644 distrib/xmlada_input.gpr   ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} -m 644 distrib/xmlada_schema.gpr  ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} -m 644 distrib/xmlada_unicode.gpr ${DESTDIR}${libdir}/gnat/
-+	${INSTALL} xmlada-config  ${DESTDIR}${bindir}
-+	${INSTALL} -m 644 docs/xml.html ${DESTDIR}${datadir}/doc/xmlada
-+	${INSTALL} -m 644 docs/xml.info ${DESTDIR}${datadir}/doc/xmlada
-+	${INSTALL} -m 644 distrib/xmlada_gps.py ${DESTDIR}${datadir}/gps/plug-ins/
++	${BSD_INSTALL_DATA} distrib/xmlada_shared.gpr  ${DESTDIR}${prefix}/lib/gnat/
++	${BSD_INSTALL_DATA} distrib/xmlada.gpr         ${DESTDIR}${prefix}/lib/gnat/
++	${BSD_INSTALL_DATA} distrib/xmlada_dom.gpr     ${DESTDIR}${prefix}/lib/gnat/
++	${BSD_INSTALL_DATA} distrib/xmlada_sax.gpr     ${DESTDIR}${prefix}/lib/gnat/
++	${BSD_INSTALL_DATA} distrib/xmlada_input.gpr   ${DESTDIR}${prefix}/lib/gnat/
++	${BSD_INSTALL_DATA} distrib/xmlada_schema.gpr  ${DESTDIR}${prefix}/lib/gnat/
++	${BSD_INSTALL_DATA} distrib/xmlada_unicode.gpr ${DESTDIR}${prefix}/lib/gnat/
++	${BSD_INSTALL_SCRIPT} xmlada-config  ${DESTDIR}${bindir}
++	-$(CP) -r docs/_build/html/* ${DESTDIR}$(datadir)/doc/xmlada/ 2>/dev/null
++	${BSD_INSTALL_DATA} distrib/xmlada_gps.py ${DESTDIR}${datadir}/gps/plug-ins/
  
  ## Do the installation for an explicit target
  install_static: 

Modified: head/textproc/xmlada/files/patch-dom_dom.gpr
==============================================================================
--- head/textproc/xmlada/files/patch-dom_dom.gpr	Mon Jul  1 19:18:17 2013	(r322140)
+++ head/textproc/xmlada/files/patch-dom_dom.gpr	Mon Jul  1 19:47:49 2013	(r322141)
@@ -1,11 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- dom/dom.gpr.orig	2011-11-11 12:40:42.991596000 +0000
+--- dom/dom.gpr.orig	2013-06-30 18:36:28.000000000 +0000
 +++ dom/dom.gpr
-@@ -10,6 +10,7 @@ project Dom is
-    for Object_Dir  use "obj/" & Project'Library_Kind;
+@@ -11,6 +11,7 @@ project Dom is
     for Library_Dir use "lib/" & Project'Library_Kind;
-    for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+    for Library_Version use "lib" & Project'Library_Name
+       & Shared.So_Ext & "." & Shared.Version;
 +   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;

Modified: head/textproc/xmlada/files/patch-input__sources_input__sources.gpr
==============================================================================
--- head/textproc/xmlada/files/patch-input__sources_input__sources.gpr	Mon Jul  1 19:18:17 2013	(r322140)
+++ head/textproc/xmlada/files/patch-input__sources_input__sources.gpr	Mon Jul  1 19:47:49 2013	(r322141)
@@ -1,11 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- input_sources/input_sources.gpr.orig	2011-10-08 19:18:37.000000000 +0000
+--- input_sources/input_sources.gpr.orig	2013-06-30 18:36:28.000000000 +0000
 +++ input_sources/input_sources.gpr
-@@ -8,6 +8,7 @@ project Input_Sources is
-    for Object_Dir  use "obj/" & Project'Library_Kind;
+@@ -9,6 +9,7 @@ project Input_Sources is
     for Library_Dir use "lib/" & Project'Library_Kind;
-    for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+    for Library_Version use "lib" & Project'Library_Name
+       & Shared.So_Ext & "." & Shared.Version;
 +   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;

Modified: head/textproc/xmlada/files/patch-sax_sax.gpr
==============================================================================
--- head/textproc/xmlada/files/patch-sax_sax.gpr	Mon Jul  1 19:18:17 2013	(r322140)
+++ head/textproc/xmlada/files/patch-sax_sax.gpr	Mon Jul  1 19:47:49 2013	(r322141)
@@ -1,11 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- sax/sax.gpr.orig	2011-10-08 19:18:44.000000000 +0000
+--- sax/sax.gpr.orig	2013-06-30 18:36:28.000000000 +0000
 +++ sax/sax.gpr
-@@ -9,6 +9,7 @@ project Sax is
-    for Object_Dir  use "obj/" & Project'Library_Kind;
+@@ -10,6 +10,7 @@ project Sax is
     for Library_Dir use "lib/" & Project'Library_Kind;
-    for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+    for Library_Version use "lib" & Project'Library_Name
+       & Shared.So_Ext & "." & Shared.Version;
 +   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;

Modified: head/textproc/xmlada/files/patch-schema_schema.gpr
==============================================================================
--- head/textproc/xmlada/files/patch-schema_schema.gpr	Mon Jul  1 19:18:17 2013	(r322140)
+++ head/textproc/xmlada/files/patch-schema_schema.gpr	Mon Jul  1 19:47:49 2013	(r322141)
@@ -1,11 +1,9 @@
-$NetBSD: patch-af,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- schema/schema.gpr.orig	2011-10-08 19:18:59.000000000 +0000
+--- schema/schema.gpr.orig	2013-06-30 18:36:28.000000000 +0000
 +++ schema/schema.gpr
-@@ -10,6 +10,7 @@ project Schema is
-    for Object_Dir  use "obj/" & Project'Library_Kind;
+@@ -11,6 +11,7 @@ project Schema is
     for Library_Dir use "lib/" & Project'Library_Kind;
-    for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+    for Library_Version use "lib" & Project'Library_Name
+       & Shared.So_Ext & "." & Shared.Version;
 +   for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
  
     package Builder  renames Shared.Builder;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307011947.r61Jln8I031891>