diff options
| -rw-r--r-- | wm/fluxbox/Makefile | 8 | ||||
| -rw-r--r-- | wm/fluxbox/PLIST | 34 | ||||
| -rw-r--r-- | wm/fluxbox/distinfo | 8 | ||||
| -rw-r--r-- | wm/fluxbox/patches/patch-aa | 15 | ||||
| -rw-r--r-- | wm/fluxbox/patches/patch-ab | 27 |
5 files changed, 69 insertions, 23 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index eec4b11328a..b10f5e8b978 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -1,21 +1,23 @@ -# $NetBSD: Makefile,v 1.5 2002/11/10 19:36:57 jmcneill Exp $ +# $NetBSD: Makefile,v 1.6 2002/12/10 20:39:08 jschauma Exp $ # -DISTNAME= fluxbox-0.1.12 +DISTNAME= fluxbox-0.1.14 CATEGORIES= wm x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmcneill@netbsd.org HOMEPAGE= http://fluxbox.sourceforge.net/ COMMENT= Window Manager for X based on Blackbox +DEPENDS+= bsetroot>=0.1:../../wm/bsetroot + USE_BUILDLINK2= YES USE_X11BASE= YES USE_CXX= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-kde -CONFLICTS= blackbox-* .include "../../lang/gcc/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST index 3c7f53fb9f0..d3235ec9e8b 100644 --- a/wm/fluxbox/PLIST +++ b/wm/fluxbox/PLIST @@ -1,33 +1,32 @@ -@comment $NetBSD: PLIST,v 1.3 2002/11/10 19:36:58 jmcneill Exp $ -bin/bsetbg -bin/bsetroot +@comment $NetBSD: PLIST,v 1.4 2002/12/10 20:39:08 jschauma Exp $ bin/fbrun bin/fluxbox bin/fluxbox-generate_menu -man/man1/bsetroot.1 man/man1/fluxbox.1 share/fluxbox/init share/fluxbox/keys share/fluxbox/menu -share/fluxbox/nls/C/blackbox.cat +share/fluxbox/nls/C/fluxbox.cat share/fluxbox/nls/POSIX share/fluxbox/nls/US_ASCII -share/fluxbox/nls/bg_BG/blackbox.cat -share/fluxbox/nls/da_DK/blackbox.cat +share/fluxbox/nls/bg_BG/fluxbox.cat +share/fluxbox/nls/da_DK/fluxbox.cat share/fluxbox/nls/en share/fluxbox/nls/en_US share/fluxbox/nls/es -share/fluxbox/nls/es_ES/blackbox.cat -share/fluxbox/nls/et_EE/blackbox.cat +share/fluxbox/nls/es_ES/fluxbox.cat +share/fluxbox/nls/et_EE/fluxbox.cat share/fluxbox/nls/fr -share/fluxbox/nls/fr_FR/blackbox.cat -share/fluxbox/nls/it_IT/blackbox.cat -share/fluxbox/nls/ja_JP/blackbox.cat -share/fluxbox/nls/pt_BR/blackbox.cat -share/fluxbox/nls/pt_PT/blackbox.cat -share/fluxbox/nls/ru_RU/blackbox.cat -share/fluxbox/nls/sv_SE/blackbox.cat -share/fluxbox/nls/tr_TR/blackbox.cat +share/fluxbox/nls/fr_FR/fluxbox.cat +share/fluxbox/nls/it_IT/fluxbox.cat +share/fluxbox/nls/ja_JP/fluxbox.cat +share/fluxbox/nls/lv +share/fluxbox/nls/lv_LV/fluxbox.cat +share/fluxbox/nls/pt_BR/fluxbox.cat +share/fluxbox/nls/pt_PT/fluxbox.cat +share/fluxbox/nls/ru_RU/fluxbox.cat +share/fluxbox/nls/sv_SE/fluxbox.cat +share/fluxbox/nls/tr_TR/fluxbox.cat share/fluxbox/styles/Artwiz share/fluxbox/styles/Blue share/fluxbox/styles/BlueNight @@ -56,6 +55,7 @@ share/fluxbox/styles/qnx-photon @dirrm share/fluxbox/nls/ru_RU @dirrm share/fluxbox/nls/pt_PT @dirrm share/fluxbox/nls/pt_BR +@dirrm share/fluxbox/nls/lv_LV @dirrm share/fluxbox/nls/ja_JP @dirrm share/fluxbox/nls/it_IT @dirrm share/fluxbox/nls/fr_FR diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo index d722dcb8334..88bec591a5f 100644 --- a/wm/fluxbox/distinfo +++ b/wm/fluxbox/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/11/10 19:36:58 jmcneill Exp $ +$NetBSD: distinfo,v 1.6 2002/12/10 20:39:08 jschauma Exp $ -SHA1 (fluxbox-0.1.12.tar.gz) = 53c21899f108abc9b6504404119fc82b808c390b -Size (fluxbox-0.1.12.tar.gz) = 417680 bytes +SHA1 (fluxbox-0.1.14.tar.bz2) = 9c543bc6e68f9b4491183cbe16d79a191dec8e67 +Size (fluxbox-0.1.14.tar.bz2) = 375499 bytes +SHA1 (patch-aa) = 3d28a16dc3131b0b723f9c5a0ed86be7d7aadd31 +SHA1 (patch-ab) = 7f3ceca7b5f110fee05d6f6eb4e2191d142b8561 diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa new file mode 100644 index 00000000000..97d756a5a36 --- /dev/null +++ b/wm/fluxbox/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.4 2002/12/10 20:39:09 jschauma Exp $ + +--- doc/Makefile.in.orig Tue Dec 10 15:17:17 2002 ++++ doc/Makefile.in Tue Dec 10 15:17:30 2002 +@@ -94,8 +94,8 @@ + + CLEANFILES = fluxbox.1 + MAINTAINERCLEANFILES = Makefile.in +-man_MANS = fluxbox.1 bsetroot.1 +-EXTRA_DIST = fluxbox.1.in bsetroot.1 Coding_style ++man_MANS = fluxbox.1 ++EXTRA_DIST = fluxbox.1.in Coding_style + subdir = doc + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab new file mode 100644 index 00000000000..c30fc690d8e --- /dev/null +++ b/wm/fluxbox/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD: patch-ab,v 1.6 2002/12/10 20:39:09 jschauma Exp $ + +--- util/Makefile.in.orig Tue Dec 10 15:06:19 2002 ++++ util/Makefile.in Tue Dec 10 15:08:09 2002 +@@ -94,20 +94,18 @@ + + SUBDIRS = fbrun + INCLUDES = -I../src/FbTk/ +-bin_SCRIPTS = bsetbg fluxbox-generate_menu +-bin_PROGRAMS = bsetroot ++bin_SCRIPTS = fluxbox-generate_menu + bsetroot_SOURCES = bsetroot.cc bsetroot.hh + bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \ + ../src/StringUtil.o ../src/FbTk/libFbTk.a + + + MAINTAINERCLEANFILES = Makefile.in +-EXTRA_DIST = bsetbg fluxbox-generate_menu ++EXTRA_DIST = fluxbox-generate_menu + subdir = util + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-bin_PROGRAMS = bsetroot$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + + am_bsetroot_OBJECTS = bsetroot.$(OBJEXT) |