Tue Jul 19 19:56:37 2011 UTC ()
fix DESTDIR breakage and other problems, from John Marino per
PR pkg/45136, with minor fixes by me
(PKGREV bumped)


(drochner)
diff -r1.3 -r1.4 pkgsrc/www/aws/Makefile
diff -r1.2 -r1.3 pkgsrc/www/aws/distinfo
diff -r1.2 -r1.3 pkgsrc/www/aws/options.mk
diff -r0 -r1.1 pkgsrc/www/aws/patches/patch-af
diff -r0 -r1.1 pkgsrc/www/aws/patches/patch-ag
diff -r1.1.1.1 -r1.2 pkgsrc/www/aws/patches/patch-bh
cvs diff -r1.3 -r1.4 pkgsrc/www/aws/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/aws/Attic/Makefile 2011/03/23 15:41:55 1.3
+++ pkgsrc/www/aws/Attic/Makefile 2011/07/19 19:56:37 1.4
@@ -1,46 +1,70 @@ @@ -1,46 +1,70 @@
1# $NetBSD: Makefile,v 1.3 2011/03/23 15:41:55 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2011/07/19 19:56:37 drochner Exp $
2# 2#
3 3
4DISTNAME= aws-${AWS_VERSION} 4DISTNAME= aws-${AWS_VERSION}
 5PKGREVISION= 1
5CATEGORIES= www 6CATEGORIES= www
6MASTER_SITES= http://downloads.dragonlace.net/src/ \ 7MASTER_SITES= http://downloads.dragonlace.net/src/ \
7 http://dragonlace.mirrors.ada.cx/src/ 8 http://dragonlace.mirrors.ada.cx/src/
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= draco@marino.st 11MAINTAINER= draco@marino.st
11HOMEPAGE= http://libre.adacore.com/libre/tools/aws/ 12HOMEPAGE= http://libre.adacore.com/libre/tools/aws/
12COMMENT= Adacore Ada Web Server and framework 13COMMENT= Adacore Ada Web Server and framework
13LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16AWS_VERSION= 2.10.0.1 17AWS_VERSION= 2.10.0.1
17USE_TOOLS+= gmake makeinfo sed 18USE_TOOLS+= gmake makeinfo sed gawk
18BUILD_DEPENDS+= gawk-[0-9]*:../../lang/gawk 19
 20PYTHON_VERSIONS_ACCEPTED= 26 27
19 21
20.include "options.mk" 22.include "options.mk"
21 23
22MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat 24MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
23 25
 26GENERATE_PLIST= cd ${DESTDIR}${PREFIX};
 27GENERATE_PLIST+= ${FIND} bin/aws_password;
 28GENERATE_PLIST+= ${FIND} bin/awsres;
 29GENERATE_PLIST+= ${FIND} bin/templates2ada;
 30GENERATE_PLIST+= ${FIND} bin/templatespp;
 31GENERATE_PLIST+= ${FIND} bin/webxref;
 32GENERATE_PLIST+= ${FIND} bin/wsdl2aws;
 33GENERATE_PLIST+= ${FIND} include/aws/ -name \* -type f | ${SORT} -dr;
 34GENERATE_PLIST+= ${FIND} lib/aws/ -name \* -type f | ${SORT} -dr;
 35GENERATE_PLIST+= ${FIND} lib/gnat/aws/ -name \* -type f | ${SORT};
 36GENERATE_PLIST+= ${FIND} lib/gnat/aws.gpr;
 37GENERATE_PLIST+= ${FIND} share/doc/aws/ -name \* -type f | ${SORT};
 38GENERATE_PLIST+= ${FIND} share/examples/aws/ -name \* -type f | ${SORT} -dr;
 39GENERATE_PLIST+= ${FIND} share/gps/plug-ins/ada2wsdl.xml;
 40GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws.py;
 41GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws.xml;
 42GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws_api.xml;
 43GENERATE_PLIST+= ${FIND} share/gps/plug-ins/wsdl2aws.xml;
 44
24post-wrapper: 45post-wrapper:
25 # We disable at least the wrapper binaries on all GNAT AUX to 46 # We disable at least the wrapper binaries on all GNAT AUX to
26 # avoid potential linkage problems 47 # avoid potential linkage problems
27 ${RM} ${WRKDIR}/.wrapper/bin/* 48 ${RM} ${WRKDIR}/.wrapper/bin/*
28 49
29do-configure: 50do-configure:
30 cd ${WRKSRC} && ${SETENV} CC=gnatgcc \ 51 cd ${WRKSRC} && ${SETENV} CC=gnatgcc \
31 ${GMAKE} setup ${CONFIGURE_ARGS} 52 ${GMAKE} setup ${CONFIGURE_ARGS}
32 53
33do-build: 54do-build:
34 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} build build_doc 55 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} build build_doc
35 56
36do-test: install 57do-test: install
37 cd ${WRKSRC}/regtests && python2.6 testsuite.py 58 cd ${WRKSRC}/regtests && python${PYVERSSUFFIX} testsuite.py
38 59
39do-install: 60do-install:
40 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install 61 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install
41 ${TOUCH} ${DESTDIR}${PREFIX}/share/examples/aws/bin/IGNORE.ME 62 ${TOUCH} ${DESTDIR}${PREFIX}/share/examples/aws/bin/IGNORE.ME
42 63
43.include "../../devel/zlib/buildlink3.mk" 64.include "../../devel/zlib/buildlink3.mk"
 65.include "../../lang/python/pyversion.mk"
44.include "../../devel/gnatpython/buildlink3.mk" 66.include "../../devel/gnatpython/buildlink3.mk"
 67.include "../../lang/gnat-aux/buildlink3.mk"
 68.include "../../textproc/xmlada/buildlink3.mk"
45.include "../../devel/gprbuild-aux/buildlink3.mk" 69.include "../../devel/gprbuild-aux/buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 70.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/aws/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/aws/Attic/distinfo 2011/03/02 10:14:31 1.2
+++ pkgsrc/www/aws/Attic/distinfo 2011/07/19 19:56:37 1.3
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1$NetBSD: distinfo,v 1.2 2011/03/02 10:14:31 drochner Exp $ 1$NetBSD: distinfo,v 1.3 2011/07/19 19:56:37 drochner Exp $
2 2
3SHA1 (aws-2.10.0.1.tar.bz2) = 3ea20d4328951089f93caa3693eb24d67cf76594 3SHA1 (aws-2.10.0.1.tar.bz2) = 3ea20d4328951089f93caa3693eb24d67cf76594
4RMD160 (aws-2.10.0.1.tar.bz2) = 8d6c2e9e681f18b16bbd79e76e6b65bb8f07a871 4RMD160 (aws-2.10.0.1.tar.bz2) = 8d6c2e9e681f18b16bbd79e76e6b65bb8f07a871
5Size (aws-2.10.0.1.tar.bz2) = 1386481 bytes 5Size (aws-2.10.0.1.tar.bz2) = 1386481 bytes
6SHA1 (patch-ac) = 1985aca4185538590cea3d939f095b69495eb0fa 6SHA1 (patch-ac) = 1985aca4185538590cea3d939f095b69495eb0fa
7SHA1 (patch-ad) = 6bfa89f2837cc0dca4f5c391b7e05e74a3d85181 7SHA1 (patch-ad) = 6bfa89f2837cc0dca4f5c391b7e05e74a3d85181
8SHA1 (patch-ae) = 44f66219a999b90d626f8f581942ae4f406e6c18 8SHA1 (patch-ae) = 44f66219a999b90d626f8f581942ae4f406e6c18
 9SHA1 (patch-af) = b3f6ca145cede4df4e101c9cd0fd255e2ad23d3f
 10SHA1 (patch-ag) = 5c5122daa913cc541fcd05d61f5b67a989a00b4d
9SHA1 (patch-ba) = 334c40657793f0a6bcec295cc07329ca96bc8372 11SHA1 (patch-ba) = 334c40657793f0a6bcec295cc07329ca96bc8372
10SHA1 (patch-bb) = e2db43dd317b01b9d0e97c481b2851b19469667b 12SHA1 (patch-bb) = e2db43dd317b01b9d0e97c481b2851b19469667b
11SHA1 (patch-bc) = b4f9926351a0ab3c5e5c73601093266f0d8efaaa 13SHA1 (patch-bc) = b4f9926351a0ab3c5e5c73601093266f0d8efaaa
12SHA1 (patch-bd) = b640a61fe75e9bfd06ea6a546ba827a71631517c 14SHA1 (patch-bd) = b640a61fe75e9bfd06ea6a546ba827a71631517c
13SHA1 (patch-be) = c07e84b8f669e1aec7368a5be0fbcb91b37b32fe 15SHA1 (patch-be) = c07e84b8f669e1aec7368a5be0fbcb91b37b32fe
14SHA1 (patch-bf) = 22fe61a2441649cf2bb2c9b6b22008562ca7127f 16SHA1 (patch-bf) = 22fe61a2441649cf2bb2c9b6b22008562ca7127f
15SHA1 (patch-bg) = ebbba6439c4cdbeb2f0e1afaec9c46f429e408b9 17SHA1 (patch-bg) = ebbba6439c4cdbeb2f0e1afaec9c46f429e408b9
16SHA1 (patch-bh) = 90275e1841639ca8068190a4b8604341a2b1b99c 18SHA1 (patch-bh) = 59f370db7e47d5fb18fa239dfc3396703f7251c8
17SHA1 (patch-bi) = 3878eb24a44a23f119d78aad5b0c5bcfce1fc4a2 19SHA1 (patch-bi) = 3878eb24a44a23f119d78aad5b0c5bcfce1fc4a2
18SHA1 (patch-bj) = 6e138dbe344600ea870e33b030662422cadf6cbc 20SHA1 (patch-bj) = 6e138dbe344600ea870e33b030662422cadf6cbc
19SHA1 (patch-bk) = 7be4ff0eefa89a24d942fc38c55f81864dd483de 21SHA1 (patch-bk) = 7be4ff0eefa89a24d942fc38c55f81864dd483de
cvs diff -r1.2 -r1.3 pkgsrc/www/aws/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/aws/Attic/options.mk 2011/03/02 10:14:31 1.2
+++ pkgsrc/www/aws/Attic/options.mk 2011/07/19 19:56:37 1.3
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: options.mk,v 1.2 2011/03/02 10:14:31 drochner Exp $ 1# $NetBSD: options.mk,v 1.3 2011/07/19 19:56:37 drochner Exp $
2 2
3 3
4# xmlada is built-in (not optional) due to gprbuild dependency 4# xmlada is built-in (not optional) due to gprbuild dependency
5# zlib is built-in because it's mandatory. It even comes with AWS. 5# zlib is built-in because it's mandatory. It even comes with AWS.
6# ASIS is not supported right now (custom build, requires part of GNAT) 6# ASIS is not supported right now (custom build, requires part of GNAT)
7 7
8# The "ipv6" option effectively disabled IPv4 support, so it 8# The "ipv6" option effectively disabled IPv4 support, so it
9# should not be switched on per default even on systems which 9# should not be switched on per default even on systems which
10# support IPv6. For that reason, the option name is not "inet6". 10# support IPv6. For that reason, the option name is not "inet6".
11 11
12PKG_OPTIONS_VAR= PKG_OPTIONS.aws 12PKG_OPTIONS_VAR= PKG_OPTIONS.aws
13PKG_SUPPORTED_OPTIONS= ssl ldap ipv6 debug disable-shared-rt relocatable 13PKG_SUPPORTED_OPTIONS= ssl ldap ipv6 debug disable-shared-rt relocatable
14PKG_SUGGESTED_OPTIONS= ssl 14PKG_SUGGESTED_OPTIONS= ssl
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
18 18
19CONFIGURE_ARGS+= GCC=gnatgcc 19CONFIGURE_ARGS+= GCC=gnatgcc
20CONFIGURE_ARGS+= PROCESSORS=1 20CONFIGURE_ARGS+= PROCESSORS=1
21CONFIGURE_ARGS+= PYTHON=python2.6 21CONFIGURE_ARGS+= PYTHON=python${PYVERSSUFFIX}
22DOTBUILD= release 22DOTBUILD= release
23 23
24# The system libgcc is from version 4.1 which doesn't include the symbol 24# The system libgcc is from version 4.1 which doesn't include the symbol
25# _Unwind_GetIPInfo. If AWS uses the system zlib or if it's configured to use 25# _Unwind_GetIPInfo. If AWS uses the system zlib or if it's configured to use
26# SSL the search path /usr/lib is inserted in the gnatmake/gprbuild 26# SSL the search path /usr/lib is inserted in the gnatmake/gprbuild
27# instructions and the system libgcc.a is picked up instead of 27# instructions and the system libgcc.a is picked up instead of
28# /usr/pkg/lib/libgcc.a. This is a bug confirmed by Adacore and an internal 28# /usr/pkg/lib/libgcc.a. This is a bug confirmed by Adacore and an internal
29# bug report has been generated. In the meantime, this means AWS can't be 29# bug report has been generated. In the meantime, this means AWS can't be
30# configured for HTTPS on NetBSD, and that zlib must be built from scratch on 30# configured for HTTPS on NetBSD, and that zlib must be built from scratch on
31# NetBSD until NetBSD upgrades it's libgcc or until a new GNAT and GPRBuild 31# NetBSD until NetBSD upgrades it's libgcc or until a new GNAT and GPRBuild
32# are delivered that don't have this bug. 32# are delivered that don't have this bug.
33 33
34.if $(OPSYS) == "NetBSD" 34.if $(OPSYS) == "NetBSD"
File Added: pkgsrc/www/aws/patches/Attic/patch-af
$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}
File Added: pkgsrc/www/aws/patches/Attic/patch-ag
$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
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/aws/patches/Attic/patch-bh (expand / switch to unified diff)

--- pkgsrc/www/aws/patches/Attic/patch-bh 2011/02/11 16:48:53 1.1.1.1
+++ pkgsrc/www/aws/patches/Attic/patch-bh 2011/07/19 19:56:37 1.2
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1$NetBSD: patch-bh,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ 1$NetBSD: patch-bh,v 1.2 2011/07/19 19:56:37 drochner Exp $
2 2
3--- docs/makefile.orig 2011-02-11 11:14:58.000000000 +0000 3--- docs/makefile.orig 2011-02-11 11:14:58.000000000 +0000
4+++ docs/makefile 4+++ docs/makefile
5@@ -209,14 +209,14 @@ check_texi: 5@@ -209,14 +209,16 @@ check_texi:
6 aws.texi: gen_texi check_texi 6 aws.texi: gen_texi check_texi
7  7
8 install: 8 install:
9- -$(CP) aws.pdf $(I_DOC) 9- -$(CP) aws.pdf $(I_DOC)
10- -$(CP) aws.html $(I_DOC) 10- -$(CP) aws.html $(I_DOC)
11- -$(CP) aws.txt $(I_DOC) 11- -$(CP) aws.txt $(I_DOC)
12- -$(CP) aws*.info* $(I_DOC) 12- -$(CP) aws*.info* $(I_DOC)
13- -$(CP) ../templates_parser/docs/templates_parser.pdf $(I_DOC) 13- -$(CP) ../templates_parser/docs/templates_parser.pdf $(I_DOC)
14- -$(CP) ../templates_parser/docs/templates_parser.html $(I_DOC) 14- -$(CP) ../templates_parser/docs/templates_parser.html $(I_DOC)
15- -$(CP) ../templates_parser/docs/templates_parser.txt $(I_DOC) 15- -$(CP) ../templates_parser/docs/templates_parser.txt $(I_DOC)
16- -$(CP) ../templates_parser/docs/templates_parser.info* $(I_DOC) 16- -$(CP) ../templates_parser/docs/templates_parser.info* $(I_DOC)
17+ -$(CP) aws.pdf $(DESTDIR)$(I_DOC) 17+ if [ -f aws.pdf ]; then \
 18+ $(CP) aws.pdf $(DESTDIR)$(I_DOC); \
 19+ $(CP) ../templates_parser/docs/templates_parser.pdf $(DESTDIR)$(I_DOC); \
 20+ fi;
18+ -$(CP) aws.html $(DESTDIR)$(I_DOC) 21+ -$(CP) aws.html $(DESTDIR)$(I_DOC)
19+ -$(CP) aws.txt $(DESTDIR)$(I_DOC) 22+ -$(CP) aws.txt $(DESTDIR)$(I_DOC)
20+ -$(CP) aws*.info* $(DESTDIR)$(I_DOC) 23+ -$(CP) aws*.info* $(DESTDIR)$(I_DOC)
21+ -$(CP) ../templates_parser/docs/templates_parser.pdf $(DESTDIR)$(I_DOC) 
22+ -$(CP) ../templates_parser/docs/templates_parser.html $(DESTDIR)$(I_DOC) 24+ -$(CP) ../templates_parser/docs/templates_parser.html $(DESTDIR)$(I_DOC)
23+ -$(CP) ../templates_parser/docs/templates_parser.txt $(DESTDIR)$(I_DOC) 25+ -$(CP) ../templates_parser/docs/templates_parser.txt $(DESTDIR)$(I_DOC)
24+ -$(CP) ../templates_parser/docs/templates_parser.info* $(DESTDIR)$(I_DOC) 26+ -$(CP) ../templates_parser/docs/templates_parser.info* $(DESTDIR)$(I_DOC)
25  27
26 clean: 28 clean:
27 -$(GNAT) clean -XLIBRARY_TYPE=static -Pdocs 29 -$(GNAT) clean -XLIBRARY_TYPE=static -Pdocs