From 0372327245432ff62c36744553203d1fefc95e96 Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 16 Dec 2002 23:28:41 +0000 Subject: [PATCH] Update whitebox to 0.5. Changes in this version: * Removed gettext support. * All new keybinding tool (bbkeys and fluxbox). * Visual/internal improvements to the menu editor. * Internal improvements to pre-existing plugins. * Style editor 99.9% blackbox (0.65.0) compliant (missing globals/parent-relative). * Enhanced fluxbox support. * Bug fixes. * Documentation (man file). --- wm/whiteBOX/Makefile | 11 +++++----- wm/whiteBOX/PLIST | 40 +++++++++++++++++++++++------------- wm/whiteBOX/distinfo | 10 ++++----- wm/whiteBOX/patches/patch-ab | 12 +++++------ 4 files changed, 43 insertions(+), 30 deletions(-) diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile index 415d5156057a..861560575839 100644 --- a/wm/whiteBOX/Makefile +++ b/wm/whiteBOX/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/11/20 21:39:37 jschauma Exp $ +# $NetBSD: Makefile,v 1.2 2002/12/16 23:28:41 jmmv Exp $ # -DISTNAME= whiteBOX-0.4.2 +DISTNAME= whiteBOX-0.5 CATEGORIES= wm x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=whitebox/} +MASTER_SITES= http://whitebox.sourceforge.net/dist/ -MAINTAINER= jmmv@hispabsd.org +MAINTAINER= jmmv@netbsd.org HOMEPAGE= http://whitebox.sourceforge.net/ COMMENT= Multi-purpose configuration tool for Blackbox USE_BUILDLINK2= yes USE_GMAKE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes # this prevents us from build-depending on autoconf and automake @@ -25,6 +25,7 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/whiteBOX/pixmaps ${INSTALL_DATA_DIR} ${PREFIX}/share/whiteBOX/plugins +.include "../../converters/libiconv/buildlink2.mk" .include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/whiteBOX/PLIST b/wm/whiteBOX/PLIST index c22ea8f90b52..b96446bcf9d4 100644 --- a/wm/whiteBOX/PLIST +++ b/wm/whiteBOX/PLIST @@ -1,23 +1,35 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/20 21:39:37 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/12/16 23:28:41 jmmv Exp $ bin/whiteBOX bin/whiteBOX-config -share/whiteBOX/pixmaps/arrowdn.xpm -share/whiteBOX/pixmaps/arrowup.xpm -share/whiteBOX/pixmaps/del2.xpm -share/whiteBOX/pixmaps/doc1.xpm -share/whiteBOX/pixmaps/doccopy.xpm -share/whiteBOX/pixmaps/down.xpm -share/whiteBOX/pixmaps/down2.xpm +man/man1/whiteBOX.1 share/whiteBOX/pixmaps/exclaim1.xpm -share/whiteBOX/pixmaps/new1.xpm -share/whiteBOX/pixmaps/open1.xpm -share/whiteBOX/pixmaps/save4.xpm -share/whiteBOX/pixmaps/up.xpm -share/whiteBOX/pixmaps/up2.xpm -share/whiteBOX/pixmaps/wb2.xpm +share/whiteBOX/pixmaps/smallicon1.xpm +share/whiteBOX/pixmaps/stock_bottom-16.xpm +share/whiteBOX/pixmaps/stock_broken_image-16.xpm +share/whiteBOX/pixmaps/stock_convert-16.xpm +share/whiteBOX/pixmaps/stock_delete-16.xpm +share/whiteBOX/pixmaps/stock_down-16.xpm +share/whiteBOX/pixmaps/stock_edit-16.xpm +share/whiteBOX/pixmaps/stock_exec-16.xpm +share/whiteBOX/pixmaps/stock_exit-16.xpm +share/whiteBOX/pixmaps/stock_import-16.xpm +share/whiteBOX/pixmaps/stock_insert-image-16.xpm +share/whiteBOX/pixmaps/stock_new-16.xpm +share/whiteBOX/pixmaps/stock_open-16.xpm +share/whiteBOX/pixmaps/stock_preferences-16.xpm +share/whiteBOX/pixmaps/stock_refresh-16.xpm +share/whiteBOX/pixmaps/stock_save-16.xpm +share/whiteBOX/pixmaps/stock_save_as-16.xpm +share/whiteBOX/pixmaps/stock_style-dir-16.xpm +share/whiteBOX/pixmaps/stock_top-16.xpm +share/whiteBOX/pixmaps/stock_up-16.xpm +share/whiteBOX/pixmaps/title1e.xpm share/whiteBOX/plugins/libwbbgset.a share/whiteBOX/plugins/libwbbgset.la share/whiteBOX/plugins/libwbbgset.so +share/whiteBOX/plugins/libwbkeybind.a +share/whiteBOX/plugins/libwbkeybind.la +share/whiteBOX/plugins/libwbkeybind.so share/whiteBOX/plugins/libwbmenu.a share/whiteBOX/plugins/libwbmenu.la share/whiteBOX/plugins/libwbmenu.so diff --git a/wm/whiteBOX/distinfo b/wm/whiteBOX/distinfo index aa608bd175f9..de356a3705ad 100644 --- a/wm/whiteBOX/distinfo +++ b/wm/whiteBOX/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/11/20 21:39:37 jschauma Exp $ +$NetBSD: distinfo,v 1.2 2002/12/16 23:28:41 jmmv Exp $ -SHA1 (whiteBOX-0.4.2.tar.gz) = d2a66f738af482e34ad14165862708e5d193eb1b -Size (whiteBOX-0.4.2.tar.gz) = 271823 bytes -SHA1 (patch-aa) = d40936263e7176cdfe91bc47f9053ce94bddde6d -SHA1 (patch-ab) = e59cdac0f8b2fd6ec5b87b6ca974f80fa0f40732 +SHA1 (whiteBOX-0.5.tar.gz) = 4bf73188cd2781a5cea6cf950438c6155e1059b3 +Size (whiteBOX-0.5.tar.gz) = 389934 bytes +SHA1 (patch-ab) = 2809ade224502b97252af35ccae269163b7b90a7 SHA1 (patch-ac) = a97f77b3a8aed2aae3d14c35bcf847d5ef355fc4 SHA1 (patch-ad) = 9becf38e5af3a42c99a7d836a315f3ac6814459b +SHA1 (patch-ae) = 1da2b2dab1d03143b7450a93f1e3b8f9062ebe5b diff --git a/wm/whiteBOX/patches/patch-ab b/wm/whiteBOX/patches/patch-ab index 0ecdf69f4f64..2b1ba0ba89f6 100644 --- a/wm/whiteBOX/patches/patch-ab +++ b/wm/whiteBOX/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/11/20 21:39:37 jschauma Exp $ +$NetBSD: patch-ab,v 1.2 2002/12/16 23:28:42 jmmv Exp $ ---- src/Makefile.in.orig Sun Sep 8 12:29:52 2002 -+++ src/Makefile.in Sun Sep 8 12:30:04 2002 -@@ -107,7 +107,7 @@ +--- src/Makefile.in.orig Sat Dec 14 04:50:17 2002 ++++ src/Makefile.in +@@ -106,7 +106,7 @@ whiteBOX_SOURCES = \ SUBDIRS = plugins --whiteBOX_LDADD = @GTK_LIBS@ $(INTLLIBS) -+whiteBOX_LDADD = @GTK_LIBS@ $(INTLLIBS) -export-dynamic +-whiteBOX_LDADD = @GTK_LIBS@ ++whiteBOX_LDADD = @GTK_LIBS@ -export-dynamic mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES =