summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>1999-08-30 08:44:47 +0000
committerjlam <jlam>1999-08-30 08:44:47 +0000
commit1247eafe47a0eeae0988ff58d9c37a0c25e1bbe3 (patch)
tree6513182b5b7ba268c3ade6cf0684a09bcafbbb32 /x11
parent6bda1d1ecb3da0835f1eff24dbec63f6d5d31675 (diff)
downloadpkgsrc-1247eafe47a0eeae0988ff58d9c37a0c25e1bbe3.tar.gz
Update wmakerconf to 2.2. Now works with gtk+-1.2.4.
Diffstat (limited to 'x11')
-rw-r--r--x11/wmakerconf/Makefile13
-rw-r--r--x11/wmakerconf/files/md55
-rw-r--r--x11/wmakerconf/files/patch-sum3
-rw-r--r--x11/wmakerconf/patches/patch-aa31
4 files changed, 8 insertions, 44 deletions
diff --git a/x11/wmakerconf/Makefile b/x11/wmakerconf/Makefile
index 366a99a4e45..04c8f68d53a 100644
--- a/x11/wmakerconf/Makefile
+++ b/x11/wmakerconf/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1999/08/28 09:43:16 rh Exp $
+# $NetBSD: Makefile,v 1.7 1999/08/30 08:44:47 jlam Exp $
#
-DISTNAME= wmakerconf-2.1
+DISTNAME= wmakerconf-2.2
CATEGORIES= x11
MASTER_SITES= http://www-info2.informatik.uni-wuerzburg.de/staff/ulli/wmakerconf/ \
ftp://ftp.ema.fr/pub/mirrors/windowmaker/wmakerconf/
EXTRACT_SUFX= .tar.bz2
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- wmakerconf-data-0.60.0${EXTRACT_SUFX}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www-info2.informatik.uni-wuerzburg.de/staff/ulli/wmakerconf/
@@ -17,9 +15,10 @@ DEPENDS+= imlib-1.9.4:../../graphics/imlib
DEPENDS+= libproplist-0.8.3:../../devel/libproplist
DEPENDS+= gtk+-1.2.4:../../x11/gtk
-USE_X11BASE= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+USE_X11BASE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -R${LOCALBASE}/lib # for libPropList.so.1.1
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmakerconf/files/md5 b/x11/wmakerconf/files/md5
index 26d28baefa8..28b355b76af 100644
--- a/x11/wmakerconf/files/md5
+++ b/x11/wmakerconf/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.3 1999/08/08 06:11:44 rh Exp $
+$NetBSD: md5,v 1.4 1999/08/30 08:44:47 jlam Exp $
-MD5 (wmakerconf-2.1.tar.bz2) = 326e8fcfd38a86fffabdb53962dcbffd
-MD5 (wmakerconf-data-0.60.0.tar.bz2) = 194d004992c226f9ec40ae04937dd903
+MD5 (wmakerconf-2.2.tar.bz2) = b3316a061e31438b0f7353607a6089a6
diff --git a/x11/wmakerconf/files/patch-sum b/x11/wmakerconf/files/patch-sum
deleted file mode 100644
index 8293219943e..00000000000
--- a/x11/wmakerconf/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:32 agc Exp $
-
-MD5 (patch-aa) = 77c01fc4235d5687304238b13247359c
diff --git a/x11/wmakerconf/patches/patch-aa b/x11/wmakerconf/patches/patch-aa
deleted file mode 100644
index 1b60135ae1a..00000000000
--- a/x11/wmakerconf/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/03 17:28:23 rh Exp $
-
---- configure.orig Wed Mar 17 16:12:49 1999
-+++ configure Mon Mar 22 18:38:16 1999
-@@ -5189,10 +5189,12 @@
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
-+if false; then
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
-+fi
-
- echo creating "$ac_file"
- rm -f "$ac_file"
-@@ -5462,10 +5464,13 @@
- *) # Relative path.
- ac_sub_cache_file="$ac_dots$cache_file" ;;
- esac
-+
-+if false; then
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
-+fi
-
- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
- # The eval makes quoting arguments work.