diff options
| author | drochner <drochner@pkgsrc.org> | 2012-08-29 19:11:12 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2012-08-29 19:11:12 +0000 |
| commit | 7bb24224ddf6690d5cf322850c791c0453f9cf6e (patch) | |
| tree | 08e75c4f42e58a9f8cac7eae3b56ae3d3495f415 /textproc/gnome-doc-utils | |
| parent | 7061c6f4b71dd703e28cea5e410f9586e1fe65a8 (diff) | |
| download | pkgsrc-7bb24224ddf6690d5cf322850c791c0453f9cf6e.tar.gz | |
make sure the "gnome-doc-tool" bash script picks up GNU getopt,
NetBSD's native one is not compatible
bump PKGREV
Diffstat (limited to 'textproc/gnome-doc-utils')
| -rw-r--r-- | textproc/gnome-doc-utils/Makefile | 9 | ||||
| -rw-r--r-- | textproc/gnome-doc-utils/distinfo | 3 | ||||
| -rw-r--r-- | textproc/gnome-doc-utils/patches/patch-aa | 24 |
3 files changed, 34 insertions, 2 deletions
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 3ffdf861353..524a831a10b 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2012/08/23 15:18:07 drochner Exp $ +# $NetBSD: Makefile,v 1.58 2012/08/29 19:11:12 drochner Exp $ # DISTNAME= gnome-doc-utils-0.20.10 +PKGREVISION= 1 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-doc-utils/0.20/} EXTRACT_SUFX= .tar.xz @@ -16,6 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.6.16:../../textproc/py-libxml2 DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt DEPENDS+= docbook-xml>=4.5:../../textproc/docbook-xml +DEPENDS+= getopt-[0-9]*:../../misc/getopt USE_TOOLS+= intltool pkg-config gmake gawk msgfmt bash:run GNU_CONFIGURE= YES @@ -29,6 +31,11 @@ CONFIGURE_ARGS+= PYTHON=${PYTHONBIN:Q} PKGCONFIG_OVERRIDE= tools/gnome-doc-utils.pc.in PKGCONFIG_OVERRIDE+= xml2po/xml2po.pc.in +SUBST_CLASSES+= getopt +SUBST_STAGE.getopt= pre-configure +SUBST_FILES.getopt= tools/gnome-doc-tool.in +SUBST_SED.getopt= "s|@GETOPT@|${LOCALBASE}/bin/getopt|g" + PY_PATCHPLIST= yes BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12 diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo index 9096dc0f193..df7fa9d7f21 100644 --- a/textproc/gnome-doc-utils/distinfo +++ b/textproc/gnome-doc-utils/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.27 2012/08/23 15:18:07 drochner Exp $ +$NetBSD: distinfo,v 1.28 2012/08/29 19:11:12 drochner Exp $ SHA1 (gnome-doc-utils-0.20.10.tar.xz) = 8320a30e1b7239aa33ba276da046090407a93bbf RMD160 (gnome-doc-utils-0.20.10.tar.xz) = 64fcdf0166c213b6bf5c872f583546b3a9a17bf4 Size (gnome-doc-utils-0.20.10.tar.xz) = 526700 bytes +SHA1 (patch-aa) = 6940085d1887846869a1b58611b841ced392ab20 diff --git a/textproc/gnome-doc-utils/patches/patch-aa b/textproc/gnome-doc-utils/patches/patch-aa new file mode 100644 index 00000000000..05011cf155f --- /dev/null +++ b/textproc/gnome-doc-utils/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.4 2012/08/29 19:11:12 drochner Exp $ + +make sure pkgsrc getopt is used, native might be insufficient + +--- tools/gnome-doc-tool.in.orig 2011-01-10 16:13:20.000000000 +0000 ++++ tools/gnome-doc-tool.in +@@ -548,7 +548,7 @@ create_css() { + -lversion + -lhelp + '; +- options=`getopt -qn$progname $longopts -- o:vVh "$@"` ++ options=`@GETOPT@ -qn$progname $longopts -- o:vVh "$@"` + if [ "$?" != "0" ]; then print_help_css 1>&2; exit 1; fi + eval set -- "$options"; + while [ "$1" != "--" ]; do +@@ -604,7 +604,7 @@ convert_2html() { + -lversion + -lhelp + '; +- options=`getopt -qn$progname $longopts -- c:d:e:o:x:nvVh "$@"` ++ options=`@GETOPT@ -qn$progname $longopts -- c:d:e:o:x:nvVh "$@"` + if [ "$?" != "0" ]; then print_help_html $doc_format 1>&2; exit 1; fi + eval set -- "$options"; + while [ "$1" != "--" ]; do |