(If this message needs to go to ports-bugs, let me know.)

While working on another port, I discovered the gnome-doc-tool command has two uses of getopt(1), but assumes GNU getopt. If gnome-doc-tool is called from a Makefile, the normal system getopt(1) will be used and you'll get a failed build.

I patched x11/gnome/doc-utils locally on my system to depend on misc/gnugetopt and call gnugetopt specifically from gnome-doc-tool:

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/doc-utils/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile    22 Nov 2010 08:36:57 -0000      1.38
+++ Makefile    7 Dec 2010 03:34:10 -0000
@@ -21,6 +21,7 @@ BUILD_DEPENDS=        ${RUN_DEPENDS} \
                sysutils/ggrep \
                textproc/rarian
 RUN_DEPENDS=   devel/gettext \
+               misc/gnugetopt \
                textproc/libxml,-python \
                textproc/libxslt,-python \
                textproc/rarian
Index: patches/patch-tools_gnome-doc-tool_in
===================================================================
RCS file: patches/patch-tools_gnome-doc-tool_in
diff -N patches/patch-tools_gnome-doc-tool_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_gnome-doc-tool_in       7 Dec 2010 03:34:10 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- tools/gnome-doc-tool.in.orig       Mon Dec  6 17:31:12 2010
++++ tools/gnome-doc-tool.in    Mon Dec  6 17:31:28 2010
+@@ -548,7 +548,7 @@ create_css() {
+       -lversion
+       -lhelp
+     ';
+-    options=`getopt -qn$progname $longopts -- o:vVh "$@"`
++    options=`gnugetopt -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=`gnugetopt -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

--
David Cantrell | KB1PCX
http://www.burdell.org/

Reply via email to