diff options
| author | drochner <drochner@pkgsrc.org> | 2011-07-19 19:56:37 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-07-19 19:56:37 +0000 |
| commit | 7ebc2ee148ece1fcf492cf7fea5ac68103a225d6 (patch) | |
| tree | c954ca4b61cb76cd65f0c7cb983e717a3a302a0f /www/aws/patches | |
| parent | 66cfbfa6a053ff0e631e1333d22ff3ddd70c402a (diff) | |
| download | pkgsrc-7ebc2ee148ece1fcf492cf7fea5ac68103a225d6.tar.gz | |
fix DESTDIR breakage and other problems, from John Marino per
PR pkg/45136, with minor fixes by me
(PKGREV bumped)
Diffstat (limited to 'www/aws/patches')
| -rw-r--r-- | www/aws/patches/patch-af | 13 | ||||
| -rw-r--r-- | www/aws/patches/patch-ag | 18 | ||||
| -rw-r--r-- | www/aws/patches/patch-bh | 10 |
3 files changed, 37 insertions, 4 deletions
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) |