summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lawrance <lawrance@FreeBSD.org>2005-06-15 11:43:41 +0000
committerSam Lawrance <lawrance@FreeBSD.org>2005-06-15 11:43:41 +0000
commitc7cb0e7bc90e90c3a4b88253d113d03ac83f7308 (patch)
treec7afb3092a5ae72d807c4994960f1cb942cb9063
parentStop patching nvidia_subr.c when building version 7174 of driver, correct (diff)
Add a simple patch to reintroduce option parsing behaviour some ports
depend on (allow short form options longer than one character, eg. -bl). This behaviour was removed when libdockapp was updated to 0.6.0. Bump PORTREVISION. I'll follow up with libdockapp author. PR: ports/82242 Reported by: regis rampnoux <regisr@pobox.com>
Notes
Notes: svn path=/head/; revision=137486
-rw-r--r--x11-wm/libdockapp/Makefile1
-rw-r--r--x11-wm/libdockapp/files/patch-src_daargs.c15
2 files changed, 16 insertions, 0 deletions
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index d5e9f86dc871..9c3a1bc1c97c 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libdockapp
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/
diff --git a/x11-wm/libdockapp/files/patch-src_daargs.c b/x11-wm/libdockapp/files/patch-src_daargs.c
new file mode 100644
index 000000000000..0f4a45958346
--- /dev/null
+++ b/x11-wm/libdockapp/files/patch-src_daargs.c
@@ -0,0 +1,15 @@
+--- src/daargs.c.orig Thu Apr 21 04:05:04 2005
++++ src/daargs.c Wed Jun 15 21:32:35 2005
+@@ -85,8 +85,11 @@
+ for (j = 0; j < count; j++) {
+ DAProgramOption *option = &options[j];
+
++ /* A number of ports depend on the old libdockapp behaviour
++ * which permitted short form options longer than one character
++ */
+ if ((option->longForm && strcmp(option->longForm, optStr) == 0) ||
+- (option->shortForm && contains(option->shortForm, optStr)))
++ (option->shortForm && strcmp(option->shortForm, optStr) == 0))
+ {
+ found = 1;
+ i = parseOption(option, i, argc, argv);