pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/aws www/aws: Update to from version 2.10.0 to 3.1.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/4b554058801e
branches: trunk
changeset: 621385:4b554058801e
user: marino <marino%pkgsrc.org@localhost>
date: Sun Jul 07 23:46:50 2013 +0000
description:
www/aws: Update to from version 2.10.0 to 3.1.0
There is no dedicated change log but version 2.10 was introduced to
pkgsrc 2.5 years ago. The current capability is described by
http://docs.adacore.com/aws-docs/aws.html
This is roughly equivalent to Adacore release 2013 of aws.
The "gnutls" option was added as an alternative to ssl.
diffstat:
www/aws/MESSAGE_NETBSD_SSL | 7 -
www/aws/Makefile | 38 ++----
www/aws/distinfo | 39 ++----
www/aws/options.mk | 19 ++-
www/aws/patches/patch-ac | 15 --
www/aws/patches/patch-ad | 12 --
www/aws/patches/patch-ae | 12 --
www/aws/patches/patch-af | 13 --
www/aws/patches/patch-ag | 18 ---
www/aws/patches/patch-ba | 80 ---------------
www/aws/patches/patch-bb | 36 ------
www/aws/patches/patch-bc | 18 ---
www/aws/patches/patch-bd | 15 --
www/aws/patches/patch-be | 16 ---
www/aws/patches/patch-bf | 28 -----
www/aws/patches/patch-bg | 28 -----
www/aws/patches/patch-bh | 29 -----
www/aws/patches/patch-bi | 21 ---
www/aws/patches/patch-bj | 22 ----
www/aws/patches/patch-bk | 15 --
www/aws/patches/patch-config__projects__aws.gpr | 14 ++
www/aws/patches/patch-demos_test__ldap_test__ldap.gpr | 13 +-
www/aws/patches/patch-docs__gentexifile | 29 +++++
www/aws/patches/patch-docs__makefile | 19 +++
www/aws/patches/patch-include_include.gpr | 4 +-
www/aws/patches/patch-makefile | 14 ++
www/aws/patches/patch-regtests__0043_check_mem__test.opt | 17 +++
www/aws/patches/patch-src_soap_soap-message-xml.adb | 24 ----
www/aws/patches/patch-src_src.gpr | 12 +-
www/aws/patches/patch-ssl__crypto_lib.gpr | 14 ++
www/aws/patches/patch-templates_parser__docs__gentexifile | 34 ++++++
www/aws/patches/patch-templates_parser__docs__makefile | 22 ++++
32 files changed, 220 insertions(+), 477 deletions(-)
diffs (truncated from 921 to 300 lines):
diff -r 76397ba12493 -r 4b554058801e www/aws/MESSAGE_NETBSD_SSL
--- a/www/aws/MESSAGE_NETBSD_SSL Sun Jul 07 18:28:13 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE_NETBSD_SSL,v 1.1.1.1 2011/02/11 16:48:52 drochner Exp $
-Due to the combination of an old version of the gcc library in NetBSD 5+
-(/usr/lib/libgcc.*) and a recently discovered bug in gnatmake/gprbuild,
-it is not possible to build the Ada Web Server with SSL support at this
-time. This means https:// will not function. Sorry!
-===========================================================================
diff -r 76397ba12493 -r 4b554058801e www/aws/Makefile
--- a/www/aws/Makefile Sun Jul 07 18:28:13 2013 +0000
+++ b/www/aws/Makefile Sun Jul 07 23:46:50 2013 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/06/16 23:09:50 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/07 23:46:50 marino Exp $
#
DISTNAME= aws-${AWS_VERSION}
-PKGREVISION= 5
CATEGORIES= www
MASTER_SITES= http://downloads.dragonlace.net/src/
EXTRACT_SUFX= .tar.bz2
@@ -12,9 +11,9 @@
COMMENT= Adacore Ada Web Server and framework
LICENSE= gnu-gpl-v2
-AWS_VERSION= 2.10.0.1
-USE_TOOLS+= gmake makeinfo sed gawk
-USE_LANGUAGES= c ada c++
+AWS_VERSION= 3.1.0.0
+USE_TOOLS+= gmake makeinfo sed awk
+USE_LANGUAGES= c ada c++ fortran
# Note: c++ and fortran aren't used, but gprconfig probes for them.
# When that happens, pkgsrc wrapper emits a warning message which causes
@@ -23,7 +22,9 @@
.include "options.mk"
-MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
+MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
+MAKE_ENV+= AWK=awk
+CONFIGURE_ARGS+= LPATH=${PREFIX}/lib ZPATH=/usr/lib
# Link options were added for the aws library
# "-R" option disables all rpaths except adalib and compiler libs. This is
@@ -38,26 +39,10 @@
demos/test_ldap/test_ldap.gpr
SUBST_SED.rpath= -e "s,@ADDITIONAL_RPATH@,${ADDITIONAL_RPATH}," \
-e "s,@PREFIX@,${PREFIX},g"
-ADDITIONAL_RPATH= ${PREFIX}/lib:${PREFIX}/lib/aws/native/relocatable
+ADDITIONAL_RPATH= ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable
GENERATE_PLIST= cd ${DESTDIR}${PREFIX};
-GENERATE_PLIST+= ${FIND} bin/aws_password;
-GENERATE_PLIST+= ${FIND} bin/awsres;
-GENERATE_PLIST+= ${FIND} bin/templates2ada;
-GENERATE_PLIST+= ${FIND} bin/templatespp;
-GENERATE_PLIST+= ${FIND} bin/webxref;
-GENERATE_PLIST+= ${FIND} bin/wsdl2aws;
-GENERATE_PLIST+= ${FIND} include/aws/ -name \* -type f | ${SORT} -dr;
-GENERATE_PLIST+= ${FIND} lib/aws/ -name \* -type f | ${SORT} -dr;
-GENERATE_PLIST+= ${FIND} lib/gnat/aws/ -name \* -type f | ${SORT};
-GENERATE_PLIST+= ${FIND} lib/gnat/aws.gpr;
-GENERATE_PLIST+= ${FIND} share/doc/aws/ -name \* -type f | ${SORT};
-GENERATE_PLIST+= ${FIND} share/examples/aws/ -name \* -type f | ${SORT} -dr;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/ada2wsdl.xml;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws.py;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws.xml;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws_api.xml;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/wsdl2aws.xml;
+GENERATE_PLIST+= ${FIND} * -type f | ${SORT};
do-configure:
cd ${WRKSRC} && ${GMAKE} setup ${CONFIGURE_ARGS}
@@ -66,11 +51,12 @@
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} build build_doc
do-test: install
- cd ${WRKSRC}/regtests && python${PYVERSSUFFIX} testsuite.py
+ cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} \
+ python${PYVERSSUFFIX} testsuite.py
do-install:
cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install
- ${TOUCH} ${DESTDIR}${PREFIX}/share/examples/aws/bin/IGNORE.ME
+ @cd ${DESTDIR}/${PREFIX} && ${FIND} * -type d -empty -exec rmdir {} \;
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/pyversion.mk"
diff -r 76397ba12493 -r 4b554058801e www/aws/distinfo
--- a/www/aws/distinfo Sun Jul 07 18:28:13 2013 +0000
+++ b/www/aws/distinfo Sun Jul 07 23:46:50 2013 +0000
@@ -1,26 +1,17 @@
-$NetBSD: distinfo,v 1.6 2013/04/27 13:02:48 marino Exp $
+$NetBSD: distinfo,v 1.7 2013/07/07 23:46:50 marino Exp $
-SHA1 (aws-2.10.0.1.tar.bz2) = 3ea20d4328951089f93caa3693eb24d67cf76594
-RMD160 (aws-2.10.0.1.tar.bz2) = 8d6c2e9e681f18b16bbd79e76e6b65bb8f07a871
-Size (aws-2.10.0.1.tar.bz2) = 1386481 bytes
-SHA1 (patch-ac) = 1985aca4185538590cea3d939f095b69495eb0fa
-SHA1 (patch-ad) = 6bfa89f2837cc0dca4f5c391b7e05e74a3d85181
-SHA1 (patch-ae) = 44f66219a999b90d626f8f581942ae4f406e6c18
-SHA1 (patch-af) = b3f6ca145cede4df4e101c9cd0fd255e2ad23d3f
-SHA1 (patch-ag) = 5c5122daa913cc541fcd05d61f5b67a989a00b4d
-SHA1 (patch-ba) = 334c40657793f0a6bcec295cc07329ca96bc8372
-SHA1 (patch-bb) = e2db43dd317b01b9d0e97c481b2851b19469667b
-SHA1 (patch-bc) = b4f9926351a0ab3c5e5c73601093266f0d8efaaa
-SHA1 (patch-bd) = b640a61fe75e9bfd06ea6a546ba827a71631517c
-SHA1 (patch-be) = c07e84b8f669e1aec7368a5be0fbcb91b37b32fe
-SHA1 (patch-bf) = 22fe61a2441649cf2bb2c9b6b22008562ca7127f
-SHA1 (patch-bg) = ebbba6439c4cdbeb2f0e1afaec9c46f429e408b9
-SHA1 (patch-bh) = 59f370db7e47d5fb18fa239dfc3396703f7251c8
-SHA1 (patch-bi) = 3878eb24a44a23f119d78aad5b0c5bcfce1fc4a2
-SHA1 (patch-bj) = 6e138dbe344600ea870e33b030662422cadf6cbc
-SHA1 (patch-bk) = 7be4ff0eefa89a24d942fc38c55f81864dd483de
-SHA1 (patch-demos_test__ldap_test__ldap.gpr) = 0271d8c429f8fd3014ff169ded61f4b282243a38
+SHA1 (aws-3.1.0.0.tar.bz2) = a8135b10bad5a751840858acb305cbb01b5558db
+RMD160 (aws-3.1.0.0.tar.bz2) = d7c8dc904a0a91a8754aae8d07eb8b015fbf3b1f
+Size (aws-3.1.0.0.tar.bz2) = 1529933 bytes
+SHA1 (patch-config__projects__aws.gpr) = 3a93507e35c30bb6cf376409b681303bf7e39d7a
+SHA1 (patch-demos_test__ldap_test__ldap.gpr) = eeb126ab85442cc47b6a8844c4c4eea1b697be72
+SHA1 (patch-docs__gentexifile) = 0613450bb248a17659ae0a435a3e8ca64d29cd0c
+SHA1 (patch-docs__makefile) = 6f36ef4688b542ec100882014d3c1842c1d00dd8
SHA1 (patch-docs_docs.gpr) = acbe31da756c0cc3ee86132eedd0f0cc0ae6dd0e
-SHA1 (patch-include_include.gpr) = 8e65a8238077df79fedaafa8b95eb51c8897b6c0
-SHA1 (patch-src_soap_soap-message-xml.adb) = d7b84968c615c017fb33536d177ce8b4557e29dc
-SHA1 (patch-src_src.gpr) = 18480f2478c6fa3a1a7939f2a9fbdc4bd09178e3
+SHA1 (patch-include_include.gpr) = 1c407b9769e10106cd521241986f569146879af1
+SHA1 (patch-makefile) = 31a316463838c7ab38edcd92ee2a376043065832
+SHA1 (patch-regtests__0043_check_mem__test.opt) = abe81a8c9aeb10faac6ea9469408dd89b1c85a65
+SHA1 (patch-src_src.gpr) = 6b7d6732724dbcc5da5e917ee2f2f5d597b3441b
+SHA1 (patch-ssl__crypto_lib.gpr) = e6624d49c72e3dea73ad2b66044f0da5e7ef0a99
+SHA1 (patch-templates_parser__docs__gentexifile) = d9019f7ee865d38e3cf3f4fb08d942e1a6bb1367
+SHA1 (patch-templates_parser__docs__makefile) = a26ea46580397c06c7a1148cdf9be44545bb124e
diff -r 76397ba12493 -r 4b554058801e www/aws/options.mk
--- a/www/aws/options.mk Sun Jul 07 18:28:13 2013 +0000
+++ b/www/aws/options.mk Sun Jul 07 23:46:50 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2013/04/27 13:02:48 marino Exp $
+# $NetBSD: options.mk,v 1.7 2013/07/07 23:46:50 marino Exp $
# xmlada is built-in (not optional) due to gprbuild dependency
@@ -10,7 +10,9 @@
# support IPv6. For that reason, the option name is not "inet6".
PKG_OPTIONS_VAR= PKG_OPTIONS.aws
-PKG_SUPPORTED_OPTIONS= ssl ldap ipv6 debug disable-shared-rt relocatable
+PKG_OPTIONS_OPTIONAL_GROUPS= slayer
+PKG_OPTIONS_GROUP.slayer= ssl gnutls
+PKG_SUPPORTED_OPTIONS= ldap inet6 debug disable-shared-rt relocatable
PKG_SUGGESTED_OPTIONS= ssl
.include "../../mk/bsd.prefs.mk"
@@ -44,14 +46,18 @@
###################
.if !empty(PKG_OPTIONS:Mssl)
-.if $(OPSYS) == "NetBSD"
-MESSAGE_SRC= MESSAGE_NETBSD_SSL
-.else
.include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= SOCKET=openssl
.endif
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+= SOCKET=gnutls
.endif
+
####################
## LDAP Support ##
####################
@@ -68,9 +74,6 @@
PLIST_VARS+= ipv6 noipv6
.if !empty(PKG_OPTIONS:Mipv6)
CONFIGURE_ARGS+= IPv6=true
-PLIST.ipv6= yes
-.else
-PLIST.noipv6= yes
.endif
#####################
diff -r 76397ba12493 -r 4b554058801e www/aws/patches/patch-ac
--- a/www/aws/patches/patch-ac Sun Jul 07 18:28:13 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- regtests/0043_check_mem/test.opt.orig 2010-12-13 14:42:37 +0000
-+++ regtests/0043_check_mem/test.opt
-@@ -1,2 +1,10 @@
- !ssl DEAD
- !xmlada DEAD
-+x86-dragonfly DEAD
-+x86-freebsd DEAD
-+x86-openbsd DEAD
-+x86-netbsd DEAD
-+x86_64-dragonfly DEAD
-+x86_64-freebsd DEAD
-+x86_64-openbsd DEAD
-+x86_64-netbsd DEAD
diff -r 76397ba12493 -r 4b554058801e www/aws/patches/patch-ad
--- a/www/aws/patches/patch-ad Sun Jul 07 18:28:13 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- config/projects/aws.gpr.orig 2010-12-20 12:38:25 +0000
-+++ config/projects/aws.gpr
-@@ -31,7 +31,6 @@ with "aws/aws_crypto_lib";
- with "aws/aws_ssl_support";
- with "aws/aws_ssl_lib";
- with "aws/aws_ssl_error_lib";
--with "aws/aws_dl_lib";
- with "aws/aws_shared";
- with "aws/aws_config";
-
diff -r 76397ba12493 -r 4b554058801e www/aws/patches/patch-ae
--- a/www/aws/patches/patch-ae Sun Jul 07 18:28:13 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- ssl/crypto_lib.gpr.orig 2010-12-20 12:41:17 +0000
-+++ ssl/crypto_lib.gpr
-@@ -29,7 +29,6 @@
-
- with "../.build/projects/aws_config";
- with "../.build/projects/aws_lib_shared";
--with "dl_lib";
-
- project Crypto_Lib is
-
diff -r 76397ba12493 -r 4b554058801e www/aws/patches/patch-af
--- a/www/aws/patches/patch-af Sun Jul 07 18:28:13 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/07/19 19:56:37 drochner Exp $
-
---- docs/gentexifile.orig 2011-07-10 18:18:29.252301000 +0000
-+++ docs/gentexifile
-@@ -51,7 +51,7 @@ if [ $# = 1 ]; then
- echo "@group" >>${TMPTAR}
- fi
- echo "" >>${TMPTAR}
--sed -f ada.sed genout >>${TMPTAR}
-+sed -E -f ada.sed genout >>${TMPTAR}
- echo "" >>${TMPTAR}
- if [ $# = 1 ]; then
- echo "@end group" >>${TMPTAR}
diff -r 76397ba12493 -r 4b554058801e www/aws/patches/patch-ag
--- a/www/aws/patches/patch-ag Sun Jul 07 18:28:13 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/07/19 19:56:37 drochner Exp $
-
---- templates_parser/docs/gentexifile.orig 2011-07-10 18:22:36.151053000 +0000
-+++ templates_parser/docs/gentexifile
-@@ -45,11 +45,11 @@ rm -f ${TMPTAR}
-
- if [ $# = 1 ]; then
- echo "@TPEXP{" >>${TMPTAR}
--sed -f ada.sed genout >>${TMPTAR}
-+sed -E -f ada.sed genout >>${TMPTAR}
- echo "}" >>${TMPTAR}
- else
- echo "@smallexample" >>${TMPTAR}
--sed -f ada.sed genout >>${TMPTAR}
-+sed -E -f ada.sed genout >>${TMPTAR}
- echo "@end smallexample" >>${TMPTAR}
- fi
-
diff -r 76397ba12493 -r 4b554058801e www/aws/patches/patch-ba
--- a/www/aws/patches/patch-ba Sun Jul 07 18:28:13 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2011/03/02 10:14:31 drochner Exp $
-
---- makefile.orig 2011-01-25 20:53:19.000000000 +0000
-+++ makefile
-@@ -416,46 +416,46 @@ setup_tp:
- $(MAKE) -C templates_parser setup $(GALL_OPTIONS)
-
- install_clean:
-- $(RM) -fr $(I_INC)/$(PLATFORM)
-- $(RM) -fr $(I_LIB)
-- $(RM) -fr $(I_AGP)
-- $(RM) -fr $(prefix)/share/examples/aws
-- $(RM) -fr $(I_DOC)
-- $(RM) -f $(I_GPR)/aws.gpr
-+ $(RM) -fr $(DESTDIR)$(I_INC)/$(PLATFORM)
-+ $(RM) -fr $(DESTDIR)$(I_LIB)
-+ $(RM) -fr $(DESTDIR)$(I_AGP)
Home |
Main Index |
Thread Index |
Old Index