Update to 2.8.1. New since 2.7:

* Added new Window Maker texture style "interwoven gradients" and
  attributes WorkspaceBorder/WorkspaceBorderSize
* New translations: pt_BR.po, es_ES.po

4 files changed, 45 insertions, 45 deletions

diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 83df28ffd76..5d204abd66e 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,27 +1,24 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/03 17:49:40 wiz Exp $
 #
 
-DISTNAME=	wmakerconf-2.7
+DISTNAME=	wmakerconf-2.8.1
 CATEGORIES=	x11 wm
-MASTER_SITES=	http://ulli.linuxave.net/wmakerconf/
+MASTER_SITES=	http://ulli.on.openave.net/wmakerconf/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wiz@netbsd.org
-HOMEPAGE=	http://ulli.linuxave.net/wmakerconf/
+HOMEPAGE=	http://ulli.on.openave.net/wmakerconf/
 COMMENT=	Gtk+ based configuration tool for Window Maker
 
-DEPENDS+=	imlib-*:../../graphics/imlib
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	windowmaker-*:../../wm/windowmaker
-
-USE_X11BASE=	yes
-USE_PERL5=	yes
-USE_LIBINTL=	yes
-
-GNU_CONFIGURE=	yes
-
-# for libProplist
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK_X11=	yes
+USE_X11BASE=		yes
+USE_PERL5=		yes
+#USE_LIBINTL=		yes
+GNU_CONFIGURE=		yes
 
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
+.include "../../wm/windowmaker/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmakerconf/distinfo b/wm/wmakerconf/distinfo
index 913255b7633..8689a269885 100644
--- a/wm/wmakerconf/distinfo
+++ b/wm/wmakerconf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:49 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/03 17:49:40 wiz Exp $
 
-SHA1 (wmakerconf-2.7.tar.bz2) = 97b37f281387bbea1bd6c9b3be5fb6d3fdc67e02
-Size (wmakerconf-2.7.tar.bz2) = 463308 bytes
-SHA1 (patch-aa) = e197a31117197608c09ee6ff1276b24392641b86
+SHA1 (wmakerconf-2.8.1.tar.bz2) = 570021015265f3d44a144981e93ee6755ba9b943
+Size (wmakerconf-2.8.1.tar.bz2) = 446073 bytes
+SHA1 (patch-aa) = 5c7a45201acd8630e19ab186f8cf7ee532458310
 SHA1 (patch-ab) = 5b65a4eb480eeec18d5ee8357d1741480c5a193b
diff --git a/wm/wmakerconf/patches/patch-aa b/wm/wmakerconf/patches/patch-aa
index 1666235f28a..78c645cf6bf 100644
--- a/wm/wmakerconf/patches/patch-aa
+++ b/wm/wmakerconf/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/15 23:25:17 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/03 17:49:40 wiz Exp $
 
 --- configure.orig	Fri Dec  3 16:34:48 1999
 +++ configure	Sun Jan  2 01:48:50 2000
@@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/15 23:25:17 wiz Exp $
  # Add some common include and library path's
 -CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/X11/include/ -I/usr/X11R6/include/ -I/usr/X11R6/include/X11 -I/usr/openwin/include -I$wprefix/include"
 -LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib -L$wprefix/lib"
-+CPPFLAGS="$CPPFLAGS -I$wprefix/include"
-+LDFLAGS="$LDFLAGS -L$wprefix/lib"
++CPPFLAGS="$CPPFLAGS"
++LDFLAGS="$LDFLAGS"
  
  # Checks for socket and nsl library, required on Solaris systems
  # (reported by Peter da Silva <peter@baileynm.com>)
diff --git a/wm/wmakerconf/pkg/PLIST b/wm/wmakerconf/pkg/PLIST
index 7af70fcd881..0365d8c51d1 100644
--- a/wm/wmakerconf/pkg/PLIST
+++ b/wm/wmakerconf/pkg/PLIST
@@ -1,26 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/15 23:25:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/08/03 17:49:40 wiz Exp $
 bin/mkpreview
 bin/wmakerconf
-share/locale/ca/LC_MESSAGES/wmakerconf.mo
-share/locale/da/LC_MESSAGES/wmakerconf.mo
-share/locale/de/LC_MESSAGES/wmakerconf.mo
-share/locale/de/LC_MESSAGES/wmakerconf-data.mo
-share/locale/fi/LC_MESSAGES/wmakerconf.mo
-share/locale/fr/LC_MESSAGES/wmakerconf.mo
-share/locale/hu/LC_MESSAGES/wmakerconf.mo
-share/locale/it/LC_MESSAGES/wmakerconf.mo
-share/locale/ja/LC_MESSAGES/wmakerconf.mo
-share/locale/ja/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ko/LC_MESSAGES/wmakerconf.mo
-share/locale/ko/LC_MESSAGES/wmakerconf-data.mo
-share/locale/no/LC_MESSAGES/wmakerconf.mo
-share/locale/pl/LC_MESSAGES/wmakerconf.mo
-share/locale/pl/LC_MESSAGES/wmakerconf-data.mo
-share/locale/pt_BR/LC_MESSAGES/wmakerconf.mo
-share/locale/ru/LC_MESSAGES/wmakerconf.mo
-share/locale/ru/LC_MESSAGES/wmakerconf-data.mo
-share/locale/sv/LC_MESSAGES/wmakerconf.mo
-share/locale/tr/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wmakerconf-data.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/wmakerconf-data.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wmakerconf-data.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/wmakerconf-data.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/wmakerconf-data.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/wmakerconf-data.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wmakerconf-data.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/wmakerconf.mo
 share/wmakerconf/black.xpm
 share/wmakerconf/appearance.xpm
 share/wmakerconf/effects.xpm