fix DESTDIR breakage and other problems, from John Marino per

PR pkg/45136, with minor fixes by me
(PKGREV bumped)

6 files changed, 71 insertions, 12 deletions

diff --git a/www/aws/Makefile b/www/aws/Makefile
index 1fd0e2bb352..358f2f05955 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/03/23 15:41:55 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/19 19:56:37 drochner Exp $
 #
 
 DISTNAME=	aws-${AWS_VERSION}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
@@ -14,13 +15,33 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 AWS_VERSION=		2.10.0.1
-USE_TOOLS+=		gmake makeinfo sed
-BUILD_DEPENDS+=		gawk-[0-9]*:../../lang/gawk
+USE_TOOLS+=		gmake makeinfo sed gawk
+
+PYTHON_VERSIONS_ACCEPTED=	26 27
 
 .include "options.mk"
 
 MAKE_ENV+=	ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 
+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;
+
 post-wrapper:
 	# We disable at least the wrapper binaries on all GNAT AUX to
 	# avoid potential linkage problems
@@ -34,13 +55,16 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} build build_doc
 
 do-test: install
-	cd ${WRKSRC}/regtests && python2.6 testsuite.py
+	cd ${WRKSRC}/regtests && python${PYVERSSUFFIX} testsuite.py
 
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install
 	${TOUCH} ${DESTDIR}${PREFIX}/share/examples/aws/bin/IGNORE.ME
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../devel/gnatpython/buildlink3.mk"
+.include "../../lang/gnat-aux/buildlink3.mk"
+.include "../../textproc/xmlada/buildlink3.mk"
 .include "../../devel/gprbuild-aux/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/aws/distinfo b/www/aws/distinfo
index 886f4937cf5..98a7e4de6d2 100644
--- a/www/aws/distinfo
+++ b/www/aws/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/03/02 10:14:31 drochner Exp $
+$NetBSD: distinfo,v 1.3 2011/07/19 19:56:37 drochner Exp $
 
 SHA1 (aws-2.10.0.1.tar.bz2) = 3ea20d4328951089f93caa3693eb24d67cf76594
 RMD160 (aws-2.10.0.1.tar.bz2) = 8d6c2e9e681f18b16bbd79e76e6b65bb8f07a871
@@ -6,6 +6,8 @@ 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
@@ -13,7 +15,7 @@ SHA1 (patch-bd) = b640a61fe75e9bfd06ea6a546ba827a71631517c
 SHA1 (patch-be) = c07e84b8f669e1aec7368a5be0fbcb91b37b32fe
 SHA1 (patch-bf) = 22fe61a2441649cf2bb2c9b6b22008562ca7127f
 SHA1 (patch-bg) = ebbba6439c4cdbeb2f0e1afaec9c46f429e408b9
-SHA1 (patch-bh) = 90275e1841639ca8068190a4b8604341a2b1b99c
+SHA1 (patch-bh) = 59f370db7e47d5fb18fa239dfc3396703f7251c8
 SHA1 (patch-bi) = 3878eb24a44a23f119d78aad5b0c5bcfce1fc4a2
 SHA1 (patch-bj) = 6e138dbe344600ea870e33b030662422cadf6cbc
 SHA1 (patch-bk) = 7be4ff0eefa89a24d942fc38c55f81864dd483de
diff --git a/www/aws/options.mk b/www/aws/options.mk
index 8e7ef2fb126..207f890a345 100644
--- a/www/aws/options.mk
+++ b/www/aws/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2011/03/02 10:14:31 drochner Exp $
+# $NetBSD: options.mk,v 1.3 2011/07/19 19:56:37 drochner Exp $
 
 
 # xmlada is built-in (not optional) due to gprbuild dependency
@@ -18,7 +18,7 @@ PKG_SUGGESTED_OPTIONS=	ssl
 
 CONFIGURE_ARGS+=	GCC=gnatgcc
 CONFIGURE_ARGS+=	PROCESSORS=1
-CONFIGURE_ARGS+=	PYTHON=python2.6
+CONFIGURE_ARGS+=	PYTHON=python${PYVERSSUFFIX}
 DOTBUILD=		release
 
 # The system libgcc is from version 4.1 which doesn't include the symbol
diff --git a/www/aws/patches/patch-af b/www/aws/patches/patch-af
new file mode 100644
index 00000000000..231b841f642
--- /dev/null
+++ b/www/aws/patches/patch-af
@@ -0,0 +1,13 @@
+$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 --git a/www/aws/patches/patch-ag b/www/aws/patches/patch-ag
new file mode 100644
index 00000000000..a6cf4418396
--- /dev/null
+++ b/www/aws/patches/patch-ag
@@ -0,0 +1,18 @@
+$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 --git a/www/aws/patches/patch-bh b/www/aws/patches/patch-bh
index a674da3c0f1..64ab2651757 100644
--- a/www/aws/patches/patch-bh
+++ b/www/aws/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
+$NetBSD: patch-bh,v 1.2 2011/07/19 19:56:37 drochner Exp $
 
 --- docs/makefile.orig	2011-02-11 11:14:58.000000000 +0000
 +++ docs/makefile
-@@ -209,14 +209,14 @@ check_texi:
+@@ -209,14 +209,16 @@ check_texi:
  aws.texi: gen_texi check_texi
  
  install:
@@ -14,11 +14,13 @@ $NetBSD: patch-bh,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
 -	-$(CP) ../templates_parser/docs/templates_parser.html $(I_DOC)
 -	-$(CP) ../templates_parser/docs/templates_parser.txt $(I_DOC)
 -	-$(CP) ../templates_parser/docs/templates_parser.info* $(I_DOC)
-+	-$(CP) aws.pdf $(DESTDIR)$(I_DOC)
++	if [ -f aws.pdf ]; then \
++	   $(CP) aws.pdf $(DESTDIR)$(I_DOC); \
++	   $(CP) ../templates_parser/docs/templates_parser.pdf $(DESTDIR)$(I_DOC); \
++	fi;
 +	-$(CP) aws.html $(DESTDIR)$(I_DOC)
 +	-$(CP) aws.txt $(DESTDIR)$(I_DOC)
 +	-$(CP) aws*.info* $(DESTDIR)$(I_DOC)
-+	-$(CP) ../templates_parser/docs/templates_parser.pdf $(DESTDIR)$(I_DOC)
 +	-$(CP) ../templates_parser/docs/templates_parser.html $(DESTDIR)$(I_DOC)
 +	-$(CP) ../templates_parser/docs/templates_parser.txt $(DESTDIR)$(I_DOC)
 +	-$(CP) ../templates_parser/docs/templates_parser.info* $(DESTDIR)$(I_DOC)