aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-wm/libdockapp/Makefile8
-rw-r--r--x11-wm/libdockapp/distinfo4
-rw-r--r--x11-wm/libdockapp/files/patch-src_daargs.c15
3 files changed, 8 insertions, 19 deletions
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 9c3a1bc1c97c..b3419b3bc43c 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libdockapp
-PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= x11-wm
MASTER_SITES= http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/
@@ -19,11 +18,16 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S/^lib//}-${PORTVERSION}
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
+USE_REINPLACE= yes
USE_LIBTOOL_VER= 15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --without-font --without-examples
INSTALLS_SHLIB= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+ ${WRKSRC}/configure
+
post-install:
@${MKDIR} ${PREFIX}/lib/X11/fonts/dockapp
.for file in fonts.alias fonts.dir *.pcf.gz
diff --git a/x11-wm/libdockapp/distinfo b/x11-wm/libdockapp/distinfo
index 85d5b34fbb04..c653a1afabae 100644
--- a/x11-wm/libdockapp/distinfo
+++ b/x11-wm/libdockapp/distinfo
@@ -1,2 +1,2 @@
-MD5 (libdockapp-0.6.0.tar.bz2) = fcad826f544c67f8fdde2802f46fd330
-SIZE (libdockapp-0.6.0.tar.bz2) = 308705
+MD5 (libdockapp-0.6.1.tar.bz2) = ec1219c355516d63b6e2ee1e4cb10c30
+SIZE (libdockapp-0.6.1.tar.bz2) = 155920
diff --git a/x11-wm/libdockapp/files/patch-src_daargs.c b/x11-wm/libdockapp/files/patch-src_daargs.c
deleted file mode 100644
index 0f4a45958346..000000000000
--- a/x11-wm/libdockapp/files/patch-src_daargs.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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);