diff options
Diffstat (limited to 'www/aws/patches')
26 files changed, 157 insertions, 387 deletions
diff --git a/www/aws/patches/patch-ad b/www/aws/patches/patch-ad deleted file mode 100644 index b1b40a9cf18..00000000000 --- a/www/aws/patches/patch-ad +++ /dev/null @@ -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 --git a/www/aws/patches/patch-af b/www/aws/patches/patch-af deleted file mode 100644 index 231b841f642..00000000000 --- a/www/aws/patches/patch-af +++ /dev/null @@ -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 --git a/www/aws/patches/patch-ag b/www/aws/patches/patch-ag deleted file mode 100644 index a6cf4418396..00000000000 --- a/www/aws/patches/patch-ag +++ /dev/null @@ -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 --git a/www/aws/patches/patch-ba b/www/aws/patches/patch-ba deleted file mode 100644 index a5694d7ea5a..00000000000 --- a/www/aws/patches/patch-ba +++ /dev/null @@ -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) -+ $(RM) -fr $(DESTDIR)$(prefix)/share/examples/aws -+ $(RM) -fr $(DESTDIR)$(I_DOC) -+ $(RM) -f $(DESTDIR)$(I_GPR)/aws.gpr - - install_dirs: install_clean -- $(MKDIR) -p $(I_BIN) -- $(MKDIR) -p $(I_INC) -- $(MKDIR) -p $(TI_INC) -- $(MKDIR) -p $(I_CPN) -- $(MKDIR) -p $(I_LIB)/static -+ $(MKDIR) -p $(DESTDIR)$(I_BIN) -+ $(MKDIR) -p $(DESTDIR)$(I_INC) -+ $(MKDIR) -p $(DESTDIR)$(TI_INC) -+ $(MKDIR) -p $(DESTDIR)$(I_CPN) -+ $(MKDIR) -p $(DESTDIR)$(I_LIB)/static - ifeq (${ENABLE_SHARED}, true) -- $(MKDIR) -p $(I_LIB)/relocatable -+ $(MKDIR) -p $(DESTDIR)$(I_LIB)/relocatable - endif -- $(MKDIR) -p $(I_DOC) -- $(MKDIR) -p $(I_GPR) -- $(MKDIR) -p $(I_AGP) -- $(MKDIR) -p $(I_TPL) -- $(MKDIR) -p $(I_IMG) -- $(MKDIR) -p $(I_SBN) -- $(MKDIR) -p $(I_PLG) -- $(MKDIR) -p $(I_WEL) -+ $(MKDIR) -p $(DESTDIR)$(I_DOC) -+ $(MKDIR) -p $(DESTDIR)$(I_GPR) -+ $(MKDIR) -p $(DESTDIR)$(I_AGP) -+ $(MKDIR) -p $(DESTDIR)$(I_TPL) -+ $(MKDIR) -p $(DESTDIR)$(I_IMG) -+ $(MKDIR) -p $(DESTDIR)$(I_SBN) -+ $(MKDIR) -p $(DESTDIR)$(I_PLG) -+ $(MKDIR) -p $(DESTDIR)$(I_WEL) - - install: install_dirs $(MODULES_INSTALL) -- $(CP) templates_parser/src/t*.ad[sb] $(I_INC) -+ $(CP) templates_parser/src/t*.ad[sb] $(DESTDIR)$(I_INC) - ifeq ($(XMLADA),true) -- $(CP) templates_parser/xsrc/*.ad[sb] $(I_INC) -+ $(CP) templates_parser/xsrc/*.ad[sb] $(DESTDIR)$(I_INC) - endif -- $(CP) templates_parser/tools/templates.tads $(I_TPL) -- $(CP) $(CONFADC) $(I_LIB)/static -- $(CP) $(CONFGPR) $(I_AGP) -- $(CP) $(PRJDIR)/aws_xmlada.gpr $(I_AGP) -+ $(CP) templates_parser/tools/templates.tads $(DESTDIR)$(I_TPL) -+ $(CP) $(CONFADC) $(DESTDIR)$(I_LIB)/static -+ $(CP) $(CONFGPR) $(DESTDIR)$(I_AGP) -+ $(CP) $(PRJDIR)/aws_xmlada.gpr $(DESTDIR)$(I_AGP) - # Copy all shared libraries into the main bin directory - ifeq (${ENABLE_SHARED}, true) - ifeq ($(OS), Windows_NT) - $(CP) $(I_LIB)/relocatable/*$(SOEXT) $(I_BIN) - endif -- $(CP) $(CONFADC) $(I_LIB)/relocatable -- -$(CHMOD) a-w $(I_LIB)/relocatable/* -+ $(CP) $(CONFADC) $(DESTDIR)$(I_LIB)/relocatable -+ -$(CHMOD) a-w $(DESTDIR)$(I_LIB)/relocatable/* - endif -- -$(CHMOD) a-w $(I_LIB)/static/* -+ -$(CHMOD) a-w $(DESTDIR)$(I_LIB)/static/* diff --git a/www/aws/patches/patch-bb b/www/aws/patches/patch-bb deleted file mode 100644 index 9d709c44a0f..00000000000 --- a/www/aws/patches/patch-bb +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- config/makefile.orig 2011-02-11 11:06:48.000000000 +0000 -+++ config/makefile -@@ -98,18 +98,18 @@ else - endif - - install: -- $(CP) $(SDIR)/src/aws-os_lib.ads $(TI_INC) -- $(CP) src/aws-net-std__* $(I_INC) -- $(CP) src/aws-net-ssl__* $(I_INC) -- $(CP) src/aws-net-ssl-certificate__* $(I_INC) -- $(CP) src/ssl-thin__* $(I_INC) -- $(CP) src/templates_parser-* $(I_INC) -- $(CP) projects/aws_components.gpr $(I_AGP) -- $(CP) projects/aws.gpr $(I_GPR) -- $(CP) projects/*_lib.gpr $(I_AGP) -- $(CP) projects/aws_shared.gpr $(I_AGP) -- $(CP) projects/aws_libz.gpr $(I_AGP) -- $(CP) projects/aws_ssl_support.gpr $(I_AGP) -- $(CP) $(LIBGPR) $(I_AGP) -+ $(CP) $(SDIR)/src/aws-os_lib.ads $(DESTDIR)$(TI_INC) -+ $(CP) src/aws-net-std__* $(DESTDIR)$(I_INC) -+ $(CP) src/aws-net-ssl__* $(DESTDIR)$(I_INC) -+ $(CP) src/aws-net-ssl-certificate__* $(DESTDIR)$(I_INC) -+ $(CP) src/ssl-thin__* $(DESTDIR)$(I_INC) -+ $(CP) src/templates_parser-* $(DESTDIR)$(I_INC) -+ $(CP) projects/aws_components.gpr $(DESTDIR)$(I_AGP) -+ $(CP) projects/aws.gpr $(DESTDIR)$(I_GPR) -+ $(CP) projects/*_lib.gpr $(DESTDIR)$(I_AGP) -+ $(CP) projects/aws_shared.gpr $(DESTDIR)$(I_AGP) -+ $(CP) projects/aws_libz.gpr $(DESTDIR)$(I_AGP) -+ $(CP) projects/aws_ssl_support.gpr $(DESTDIR)$(I_AGP) -+ $(CP) $(LIBGPR) $(DESTDIR)$(I_AGP) - - check: diff --git a/www/aws/patches/patch-bc b/www/aws/patches/patch-bc deleted file mode 100644 index 08518af4076..00000000000 --- a/www/aws/patches/patch-bc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- include/makefile.orig 2011-02-11 11:09:01.000000000 +0000 -+++ include/makefile -@@ -30,10 +30,10 @@ - setup: - - install: -- $(CP) *.ad? $(I_CPN) -- -$(CP) ../$(BDIR)/static/lib/include/* $(I_LIB)/static -+ $(CP) *.ad? $(DESTDIR)$(I_CPN) -+ -$(CP) ../$(BDIR)/static/lib/include/* $(DESTDIR)$(I_LIB)/static - ifeq (${ENABLE_SHARED}, true) -- -$(CP) ../$(BDIR)/relocatable/lib/include/* $(I_LIB)/relocatable -+ -$(CP) ../$(BDIR)/relocatable/lib/include/* $(DESTDIR)$(I_LIB)/relocatable - endif - ${MAKE} -C zlib install $(GALL_OPTIONS) - diff --git a/www/aws/patches/patch-bd b/www/aws/patches/patch-bd deleted file mode 100644 index db128efd50d..00000000000 --- a/www/aws/patches/patch-bd +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bd,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- include/zlib/makefile.orig 2011-02-11 11:10:06.000000000 +0000 -+++ include/zlib/makefile -@@ -35,8 +35,8 @@ LIBZ_shared = $(LDIR_R)/libz$(SOEXT) - - install: - ifeq ($(ZLIB), false) -- $(CP) $(LIBZ_static) $(I_LIB)/static -+ $(CP) $(LIBZ_static) $(DESTDIR)$(I_LIB)/static - ifeq (${ENABLE_SHARED}, true) -- $(CP) $(LIBZ_shared) $(I_LIB)/relocatable -+ $(CP) $(LIBZ_shared) $(DESTDIR)$(I_LIB)/relocatable - endif - endif diff --git a/www/aws/patches/patch-be b/www/aws/patches/patch-be deleted file mode 100644 index 42abf55dbe8..00000000000 --- a/www/aws/patches/patch-be +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-be,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- ssl/makefile.orig 2011-02-11 11:11:02.000000000 +0000 -+++ ssl/makefile -@@ -33,8 +33,8 @@ check: - setup: - - install: -- $(CP) *.ad[sb] $(I_INC) -- $(CP) ../$(BDIR)/static/lib/ssl/* $(I_LIB)/static -+ $(CP) *.ad[sb] $(DESTDIR)$(I_INC) -+ $(CP) ../$(BDIR)/static/lib/ssl/* $(DESTDIR)$(I_LIB)/static - ifeq (${ENABLE_SHARED}, true) -- $(CP) ../$(BDIR)/relocatable/lib/ssl/* $(I_LIB)/relocatable -+ $(CP) ../$(BDIR)/relocatable/lib/ssl/* $(DESTDIR)$(I_LIB)/relocatable - endif diff --git a/www/aws/patches/patch-bf b/www/aws/patches/patch-bf deleted file mode 100644 index a8e5eb6972e..00000000000 --- a/www/aws/patches/patch-bf +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bf,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- src/makefile.orig 2011-02-11 11:12:22.000000000 +0000 -+++ src/makefile -@@ -30,17 +30,17 @@ - setup: - - install: -- $(CP) core/*.ad[sb] extended/*.ad[sb] $(I_INC) -- $(CP) ../$(BDIR)/static/lib/src/* $(I_LIB)/static -+ $(CP) core/*.ad[sb] extended/*.ad[sb] $(DESTDIR)$(I_INC) -+ $(CP) ../$(BDIR)/static/lib/src/* $(DESTDIR)$(I_LIB)/static - ifeq (${ENABLE_SHARED}, true) -- $(CP) ../$(BDIR)/relocatable/lib/src/* $(I_LIB)/relocatable -+ $(CP) ../$(BDIR)/relocatable/lib/src/* $(DESTDIR)$(I_LIB)/relocatable - endif - ifeq ($(XMLADA),true) -- $(CP) soap/*.ad[sb] $(I_INC) -- $(CP) xsrc/*.ad[sb] $(I_INC) -+ $(CP) soap/*.ad[sb] $(DESTDIR)$(I_INC) -+ $(CP) xsrc/*.ad[sb] $(DESTDIR)$(I_INC) - endif - ifeq ($(LDAP),true) -- $(CP) ldap/*.ad[sb] $(I_INC) -+ $(CP) ldap/*.ad[sb] $(DESTDIR)$(I_INC) - endif - - check: diff --git a/www/aws/patches/patch-bg b/www/aws/patches/patch-bg deleted file mode 100644 index 01dcd483293..00000000000 --- a/www/aws/patches/patch-bg +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bg,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- tools/makefile.orig 2011-02-11 11:13:37.000000000 +0000 -+++ tools/makefile -@@ -57,16 +57,16 @@ setup: setup_dir $(GEN) - - install: - ifeq ($(PLATFORM),native) -- -$(CP) ../$(BDIR)/static/tools/awsres${EXEEXT} $(I_BIN) -- -$(CP) ../$(BDIR)/static/tools/aws_password${EXEEXT} $(I_BIN) -- -$(CP) ../$(BDIR)/static/tools/templates2ada${EXEEXT} $(I_BIN) -- -$(CP) ../$(BDIR)/static/tools/templatespp${EXEEXT} $(I_BIN) -- -$(CP) ../$(BDIR)/static/tools/webxref${EXEEXT} $(I_BIN) -+ -$(CP) ../$(BDIR)/static/tools/awsres${EXEEXT} $(DESTDIR)$(I_BIN) -+ -$(CP) ../$(BDIR)/static/tools/aws_password${EXEEXT} $(DESTDIR)$(I_BIN) -+ -$(CP) ../$(BDIR)/static/tools/templates2ada${EXEEXT} $(DESTDIR)$(I_BIN) -+ -$(CP) ../$(BDIR)/static/tools/templatespp${EXEEXT} $(DESTDIR)$(I_BIN) -+ -$(CP) ../$(BDIR)/static/tools/webxref${EXEEXT} $(DESTDIR)$(I_BIN) - ifeq ($(XMLADA),true) -- $(CP) ../$(BDIR)/static/tools/wsdl2aws${EXEEXT} $(I_BIN) -+ $(CP) ../$(BDIR)/static/tools/wsdl2aws${EXEEXT} $(DESTDIR)$(I_BIN) - endif - ifeq (${ASIS},true) -- $(CP) ../$(BDIR)/static/tools/ada2wsdl${EXEEXT} $(I_BIN) -+ $(CP) ../$(BDIR)/static/tools/ada2wsdl${EXEEXT} $(DESTDIR)$(I_BIN) - endif - endif - diff --git a/www/aws/patches/patch-bh b/www/aws/patches/patch-bh deleted file mode 100644 index 64ab2651757..00000000000 --- a/www/aws/patches/patch-bh +++ /dev/null @@ -1,29 +0,0 @@ -$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,16 @@ check_texi: - aws.texi: gen_texi check_texi - - install: -- -$(CP) aws.pdf $(I_DOC) -- -$(CP) aws.html $(I_DOC) -- -$(CP) aws.txt $(I_DOC) -- -$(CP) aws*.info* $(I_DOC) -- -$(CP) ../templates_parser/docs/templates_parser.pdf $(I_DOC) -- -$(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) -+ 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.html $(DESTDIR)$(I_DOC) -+ -$(CP) ../templates_parser/docs/templates_parser.txt $(DESTDIR)$(I_DOC) -+ -$(CP) ../templates_parser/docs/templates_parser.info* $(DESTDIR)$(I_DOC) - - clean: - -$(GNAT) clean -XLIBRARY_TYPE=static -Pdocs diff --git a/www/aws/patches/patch-bi b/www/aws/patches/patch-bi deleted file mode 100644 index 6e85ace1379..00000000000 --- a/www/aws/patches/patch-bi +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-bi,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- gps/makefile.orig 2011-02-11 11:16:14.000000000 +0000 -+++ gps/makefile -@@ -34,11 +34,11 @@ ALL_API = $(sort $(shell ls ../src/core/ - setup: - - install: -- -$(CP) aws_api.xml $(I_PLG) -- $(CP) aws.py $(I_PLG) -- $(CP) aws.xml $(I_PLG) -- $(CP) ada2wsdl.xml $(I_PLG) -- $(CP) wsdl2aws.xml $(I_PLG) -+ -$(CP) aws_api.xml $(DESTDIR)$(I_PLG) -+ $(CP) aws.py $(DESTDIR)$(I_PLG) -+ $(CP) aws.xml $(DESTDIR)$(I_PLG) -+ $(CP) ada2wsdl.xml $(DESTDIR)$(I_PLG) -+ $(CP) wsdl2aws.xml $(DESTDIR)$(I_PLG) - - check: - diff --git a/www/aws/patches/patch-bj b/www/aws/patches/patch-bj deleted file mode 100644 index 96d3df303f3..00000000000 --- a/www/aws/patches/patch-bj +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bj,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- web_elements/makefile.orig 2011-02-11 11:17:58.000000000 +0000 -+++ web_elements/makefile -@@ -36,13 +36,13 @@ build: - clean: - - init: -- $(CP) readme.txt $(I_WEL) -- $(CP) mime.types $(I_WEL) -+ $(CP) readme.txt $(DESTDIR)$(I_WEL) -+ $(CP) mime.types $(DESTDIR)$(I_WEL) - - force: - - $(DIRS): force -- $(MKDIR) $(I_WEL)/$@ -- $(CP) $@/*.* $(I_WEL)/$@ -+ $(MKDIR) $(DESTDIR)$(I_WEL)/$@ -+ $(CP) $@/*.* $(DESTDIR)$(I_WEL)/$@ - - install: init $(DIRS) diff --git a/www/aws/patches/patch-bk b/www/aws/patches/patch-bk deleted file mode 100644 index 3f58bb02adf..00000000000 --- a/www/aws/patches/patch-bk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bk,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ - ---- demos/makefile.orig 2011-02-11 11:19:10.000000000 +0000 -+++ demos/makefile -@@ -30,8 +30,8 @@ MAKEFILES = $(wildcard */makefile) - setup: - - install: -- $(CP) web_mail/*html $(I_TPL) -- $(CP) runme/aws_*.png $(I_IMG) -+ $(CP) web_mail/*html $(DESTDIR)$(I_TPL) -+ $(CP) runme/aws_*.png $(DESTDIR)$(I_IMG) - - build: $(MAKEFILES) - diff --git a/www/aws/patches/patch-config__projects__aws.gpr b/www/aws/patches/patch-config__projects__aws.gpr new file mode 100644 index 00000000000..b0636a5e3cc --- /dev/null +++ b/www/aws/patches/patch-config__projects__aws.gpr @@ -0,0 +1,14 @@ +$NetBSD: patch-config__projects__aws.gpr,v 1.1 2013/07/07 23:46:50 marino Exp $ + +BSD doesn't use libdl although DragonFly will tolerate it. + +--- config/projects/aws.gpr.orig 2013-07-03 01:11:54.000000000 +0000 ++++ config/projects/aws.gpr +@@ -22,7 +22,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 --git a/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr index 0423a453a07..ec2d65efec5 100644 --- a/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr +++ b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr @@ -1,11 +1,16 @@ ---- demos/test_ldap/test_ldap.gpr.orig 2011-01-25 20:53:15.000000000 +0000 +$NetBSD: patch-demos_test__ldap_test__ldap.gpr,v 1.3 2013/07/07 23:46:50 marino Exp $ + +Add -L$PREFIX/lib to linker flags to fix build. + +--- demos/test_ldap/test_ldap.gpr.orig 2013-07-03 01:11:54.000000000 +0000 +++ demos/test_ldap/test_ldap.gpr -@@ -42,7 +42,7 @@ project Test_LDAP is +@@ -35,7 +35,8 @@ project Test_LDAP is when "Windows_NT" => for Default_Switches ("Ada") use ("-lwldap32"); when others => -- for Default_Switches ("Ada") use ("-lldap"); -+ for Default_Switches ("Ada") use ("-L@PREFIX@/lib", "-lldap", "-llber"); +- for Default_Switches ("Ada") use ("-lldap", "-llber"); ++ for Default_Switches ("Ada") use ("-L@PREFIX@/lib", ++ "-lldap", "-llber"); end case; end Linker; diff --git a/www/aws/patches/patch-docs__gentexifile b/www/aws/patches/patch-docs__gentexifile new file mode 100644 index 00000000000..55036e0bea9 --- /dev/null +++ b/www/aws/patches/patch-docs__gentexifile @@ -0,0 +1,29 @@ +$NetBSD: patch-docs__gentexifile,v 1.1 2013/07/07 23:46:50 marino Exp $ + +Always use native awk, passed though MAKE_ENV + +--- docs/gentexifile.orig 2013-07-03 01:11:54.000000000 +0000 ++++ docs/gentexifile +@@ -32,12 +32,7 @@ SOURCE=$1 + TARGET=`basename ${SOURCE}`.texi + TMPTAR=${TARGET}.tmp + +-awk=`type gawk 2>/dev/null` +-if [ x"$awk" = x ]; then +- awk="awk" +-else +- awk="gawk" +-fi ++awk=${AWK} + + $awk 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print " -- implementation removed"}' ${SOURCE} > genout + +@@ -51,7 +46,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-docs__makefile b/www/aws/patches/patch-docs__makefile new file mode 100644 index 00000000000..43ee4e10c3a --- /dev/null +++ b/www/aws/patches/patch-docs__makefile @@ -0,0 +1,19 @@ +$NetBSD: patch-docs__makefile,v 1.1 2013/07/07 23:46:50 marino Exp $ + +Disable PDF documentation generation; it pulls way too much in. + +--- docs/makefile.orig 2013-07-03 01:11:54.000000000 +0000 ++++ docs/makefile +@@ -116,10 +116,9 @@ build_doc: $(APIFILES) aws_docs sg_docs + echo AWS Documentation built with success. + ${MAKE} -C ../templates_parser doc + +-aws_docs: aws.texi aws.pdf aws.html aws.txt aws.info ++aws_docs: aws.texi aws.html aws.txt aws.info + +-sg_docs: style-guide.pdf style-guide.html style-guide.txt \ +- style-guide.info ++sg_docs: style-guide.html style-guide.txt style-guide.info + + setup: + diff --git a/www/aws/patches/patch-include_include.gpr b/www/aws/patches/patch-include_include.gpr index 04e4aa0782a..83badab8e03 100644 --- a/www/aws/patches/patch-include_include.gpr +++ b/www/aws/patches/patch-include_include.gpr @@ -1,4 +1,6 @@ -$NetBSD: patch-include_include.gpr,v 1.1 2012/07/08 20:14:28 marino Exp $ +$NetBSD: patch-include_include.gpr,v 1.2 2013/07/07 23:46:50 marino Exp $ + +Fix RUNPATH on libraries --- include/include.gpr.orig 2011-01-25 20:52:57.000000000 +0000 +++ include/include.gpr diff --git a/www/aws/patches/patch-makefile b/www/aws/patches/patch-makefile new file mode 100644 index 00000000000..f9d97c1956d --- /dev/null +++ b/www/aws/patches/patch-makefile @@ -0,0 +1,14 @@ +$NetBSD: patch-makefile,v 1.1 2013/07/07 23:46:50 marino Exp $ + +Prevent empty ${EXAMPLESDIR}/bin directory from being created + +--- makefile.orig 2013-07-03 01:11:54.000000000 +0000 ++++ makefile +@@ -390,7 +390,6 @@ endif + $(MKDIR) -p $(DESTDIR)$(I_AGP) + $(MKDIR) -p $(DESTDIR)$(I_TPL) + $(MKDIR) -p $(DESTDIR)$(I_IMG) +- $(MKDIR) -p $(DESTDIR)$(I_SBN) + $(MKDIR) -p $(DESTDIR)$(I_PLG) + $(MKDIR) -p $(DESTDIR)$(I_WEL) + diff --git a/www/aws/patches/patch-ac b/www/aws/patches/patch-regtests__0043_check_mem__test.opt index 369fd697fc0..fd17cea44ab 100644 --- a/www/aws/patches/patch-ac +++ b/www/aws/patches/patch-regtests__0043_check_mem__test.opt @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ +$NetBSD: patch-regtests__0043_check_mem__test.opt,v 1.1 2013/07/07 23:46:50 marino Exp $ + +Disable unsupported memory test for BSD --- regtests/0043_check_mem/test.opt.orig 2010-12-13 14:42:37 +0000 +++ regtests/0043_check_mem/test.opt diff --git a/www/aws/patches/patch-src_soap_soap-message-xml.adb b/www/aws/patches/patch-src_soap_soap-message-xml.adb deleted file mode 100644 index ca5e4c8c35c..00000000000 --- a/www/aws/patches/patch-src_soap_soap-message-xml.adb +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_soap_soap-message-xml.adb,v 1.1 2012/07/08 20:14:28 marino Exp $ - ---- src/soap/soap-message-xml.adb.orig 2012-07-05 03:56:08.000000000 +0000 -+++ src/soap/soap-message-xml.adb -@@ -437,7 +437,8 @@ package body SOAP.Message.XML is - Faultstring => SOAP.Parameters.Get (S.Parameters, "faultstring")); - else - return Message.Response.Object' -- (S.Name_Space, S.Wrapper_Name, S.Parameters); -+ (Message.Object'(S.Name_Space, S.Wrapper_Name, S.Parameters) -+ with null record); - end if; - - exception -@@ -483,7 +484,8 @@ package body SOAP.Message.XML is - Faultstring => SOAP.Parameters.Get (S.Parameters, "faultstring")); - else - return Message.Response.Object' -- (S.Name_Space, S.Wrapper_Name, S.Parameters); -+ (Message.Object'(S.Name_Space, S.Wrapper_Name, S.Parameters) -+ with null record); - end if; - - exception diff --git a/www/aws/patches/patch-src_src.gpr b/www/aws/patches/patch-src_src.gpr index 856917f0d1b..2007cd7588b 100644 --- a/www/aws/patches/patch-src_src.gpr +++ b/www/aws/patches/patch-src_src.gpr @@ -1,8 +1,10 @@ -$NetBSD: patch-src_src.gpr,v 1.2 2013/04/27 11:49:56 marino Exp $ +$NetBSD: patch-src_src.gpr,v 1.3 2013/07/07 23:46:50 marino Exp $ ---- src/src.gpr.orig 2011-01-25 20:52:57.000000000 +0000 +Fix RUNPATH + +--- src/src.gpr.orig 2013-07-03 01:11:54.000000000 +0000 +++ src/src.gpr -@@ -77,7 +77,7 @@ project Src is +@@ -67,7 +67,7 @@ library project Src is when "Windows_NT" => for Library_Options use ("-lwsock32", "-lws2_32"); when others => @@ -11,12 +13,12 @@ $NetBSD: patch-src_src.gpr,v 1.2 2013/04/27 11:49:56 marino Exp $ end case; case Shared.LDAP is -@@ -88,7 +88,7 @@ project Src is +@@ -78,7 +78,7 @@ library project Src is Project'Library_Options & ("-lwldap32"); when others => for Library_Options use - Project'Library_Options & ("-lldap"); + Project'Library_Options & ("-L@PREFIX@/lib", "-lldap"); end case; + when "Disabled" => - null; diff --git a/www/aws/patches/patch-ae b/www/aws/patches/patch-ssl__crypto_lib.gpr index 1d28693d59d..13f5337cde9 100644 --- a/www/aws/patches/patch-ae +++ b/www/aws/patches/patch-ssl__crypto_lib.gpr @@ -1,4 +1,6 @@ -$NetBSD: patch-ae,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $ +$NetBSD: patch-ssl__crypto_lib.gpr,v 1.1 2013/07/07 23:46:50 marino Exp $ + +BSD doesn't use libdl although DragonFly will tolerate it. --- ssl/crypto_lib.gpr.orig 2010-12-20 12:41:17 +0000 +++ ssl/crypto_lib.gpr diff --git a/www/aws/patches/patch-templates_parser__docs__gentexifile b/www/aws/patches/patch-templates_parser__docs__gentexifile new file mode 100644 index 00000000000..3c4ce23e210 --- /dev/null +++ b/www/aws/patches/patch-templates_parser__docs__gentexifile @@ -0,0 +1,34 @@ +$NetBSD: patch-templates_parser__docs__gentexifile,v 1.1 2013/07/07 23:46:50 marino Exp $ + +Always use native awk, passed though MAKE_ENV + +--- templates_parser/docs/gentexifile.orig 2011-01-09 15:48:02.000000000 +0100 ++++ templates_parser/docs/gentexifile 2011-07-17 16:14:44.000000000 +0200 +@@ -32,24 +32,17 @@ + TARGET=`basename ${SOURCE}`.texi + TMPTAR=${TARGET}.tmp + +-awk=`type gawk 2>/dev/null` +-if [ x"$awk" = x ]; then +- awk="awk" +-else +- awk="gawk" +-fi +- +-$awk 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print " -- implementation removed"}' ${SOURCE} > genout ++${AWK} 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print " -- implementation removed"}' ${SOURCE} > genout + + 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-templates_parser__docs__makefile b/www/aws/patches/patch-templates_parser__docs__makefile new file mode 100644 index 00000000000..d1c359c8aaa --- /dev/null +++ b/www/aws/patches/patch-templates_parser__docs__makefile @@ -0,0 +1,22 @@ +$NetBSD: patch-templates_parser__docs__makefile,v 1.1 2013/07/07 23:46:50 marino Exp $ + +Remove PDF documentation to avoid pulling in many dependencies. + +--- templates_parser/docs/makefile.orig 2013-07-03 01:13:24.000000000 +0000 ++++ templates_parser/docs/makefile +@@ -43,7 +43,7 @@ GFLAGS = -I../src -I../include + GNATMAKE_FLAGS ?= -q + + DOCS = templates_parser.info templates_parser.html \ +- templates_parser.txt templates_parser.pdf ++ templates_parser.txt + + APIFILES = ../src/templates_parser.ads.texi \ + ../src/templates_parser-debug.ads.texi \ +@@ -139,5 +139,5 @@ endif + *.aux *.cp* *.fn *.ky *.pg *.toc *.tp *.vr *.dvi *.log \ + *.exe templates_parser*.ads.texi ada.sed \ + templates_parser.tar.gz +- -rm -f templates_parser.html templates_parser.pdf \ ++ -rm -f templates_parser.html \ + templates_parser.info* templates_parser.txt |