diff options
author | jmcneill <jmcneill@pkgsrc.org> | 2002-11-10 19:36:57 +0000 |
---|---|---|
committer | jmcneill <jmcneill@pkgsrc.org> | 2002-11-10 19:36:57 +0000 |
commit | ccf19b7f57245da12d38040720602a1aa8b584d0 (patch) | |
tree | 2e7def1f4bbf0fadfe15e77b1715871e13fef153 /wm | |
parent | d019306132f086324661f756ff63058be159edbd (diff) | |
download | pkgsrc-ccf19b7f57245da12d38040720602a1aa8b584d0.tar.gz |
Update fluxbox to 0.1.12; closes PR #18930
Diffstat (limited to 'wm')
-rw-r--r-- | wm/fluxbox/Makefile | 6 | ||||
-rw-r--r-- | wm/fluxbox/PLIST | 33 | ||||
-rw-r--r-- | wm/fluxbox/distinfo | 8 | ||||
-rw-r--r-- | wm/fluxbox/patches/patch-aa | 16 | ||||
-rw-r--r-- | wm/fluxbox/patches/patch-ab | 46 |
5 files changed, 24 insertions, 85 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index cdfa4ca5823..eec4b11328a 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2002/09/29 09:23:30 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/11/10 19:36:57 jmcneill Exp $ # -DISTNAME= fluxbox-0.1.8 +DISTNAME= fluxbox-0.1.12 CATEGORIES= wm x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} -MAINTAINER= jmcneill@invisible.yi.org +MAINTAINER= jmcneill@netbsd.org HOMEPAGE= http://fluxbox.sourceforge.net/ COMMENT= Window Manager for X based on Blackbox diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST index 56256ab9cdc..3c7f53fb9f0 100644 --- a/wm/fluxbox/PLIST +++ b/wm/fluxbox/PLIST @@ -1,17 +1,18 @@ -@comment $NetBSD: PLIST,v 1.2 2002/04/22 18:39:18 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/11/10 19:36:58 jmcneill Exp $ bin/bsetbg bin/bsetroot +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/titlebar share/fluxbox/nls/C/blackbox.cat share/fluxbox/nls/POSIX share/fluxbox/nls/US_ASCII -share/fluxbox/nls/bg_BG +share/fluxbox/nls/bg_BG/blackbox.cat share/fluxbox/nls/da_DK/blackbox.cat share/fluxbox/nls/en share/fluxbox/nls/en_US @@ -29,11 +30,13 @@ share/fluxbox/nls/sv_SE/blackbox.cat share/fluxbox/nls/tr_TR/blackbox.cat share/fluxbox/styles/Artwiz share/fluxbox/styles/Blue +share/fluxbox/styles/BlueNight share/fluxbox/styles/Carbondioxide share/fluxbox/styles/Clean share/fluxbox/styles/CleanColor share/fluxbox/styles/Cthulhain share/fluxbox/styles/Flux +share/fluxbox/styles/LemonSpace share/fluxbox/styles/Makro share/fluxbox/styles/MerleyKay share/fluxbox/styles/Minimal @@ -45,21 +48,21 @@ share/fluxbox/styles/Rancor share/fluxbox/styles/Results share/fluxbox/styles/Shade share/fluxbox/styles/Spiff -share/fluxbox/styles/TDF share/fluxbox/styles/Twice share/fluxbox/styles/qnx-photon @dirrm share/fluxbox/styles -@dirrm share/fluxbox/nls/C -@dirrm share/fluxbox/nls/da_DK -@dirrm share/fluxbox/nls/es_ES -@dirrm share/fluxbox/nls/et_EE -@dirrm share/fluxbox/nls/fr_FR -@dirrm share/fluxbox/nls/it_IT -@dirrm share/fluxbox/nls/ja_JP -@dirrm share/fluxbox/nls/pt_BR -@dirrm share/fluxbox/nls/pt_PT -@dirrm share/fluxbox/nls/ru_RU -@dirrm share/fluxbox/nls/sv_SE @dirrm share/fluxbox/nls/tr_TR +@dirrm share/fluxbox/nls/sv_SE +@dirrm share/fluxbox/nls/ru_RU +@dirrm share/fluxbox/nls/pt_PT +@dirrm share/fluxbox/nls/pt_BR +@dirrm share/fluxbox/nls/ja_JP +@dirrm share/fluxbox/nls/it_IT +@dirrm share/fluxbox/nls/fr_FR +@dirrm share/fluxbox/nls/et_EE +@dirrm share/fluxbox/nls/es_ES +@dirrm share/fluxbox/nls/da_DK +@dirrm share/fluxbox/nls/bg_BG +@dirrm share/fluxbox/nls/C @dirrm share/fluxbox/nls @dirrm share/fluxbox diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo index 07f7c667c42..d722dcb8334 100644 --- a/wm/fluxbox/distinfo +++ b/wm/fluxbox/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/08/25 21:51:31 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/11/10 19:36:58 jmcneill Exp $ -SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3 -Size (fluxbox-0.1.8.tar.gz) = 437047 bytes -SHA1 (patch-aa) = 4d2360c918e6df49ab306fad67d43b1cc9a1020e -SHA1 (patch-ab) = 6460c6170bef06511dcb8225869f9097fe4267f3 +SHA1 (fluxbox-0.1.12.tar.gz) = 53c21899f108abc9b6504404119fc82b808c390b +Size (fluxbox-0.1.12.tar.gz) = 417680 bytes diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa deleted file mode 100644 index b2dec0626b4..00000000000 --- a/wm/fluxbox/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/04/22 18:39:19 wiz Exp $ ---- src/i18n.hh.orig Sun Apr 21 12:36:45 2002 -+++ src/i18n.hh Sun Apr 21 12:37:23 2002 -@@ -51,7 +51,12 @@ - static I18n *instance(); - inline const char *getLocale(void) const { return m_locale.c_str(); } - inline bool multibyte(void) const { return m_multibyte; } -+#ifndef __NetBSD__ -+ /* -+ * Compilation dies here on NetBSD -- luckily, nothing uses this function -+ */ - inline const nl_catd &getCatalogFd(void) const { return m_catalog_fd; } -+#endif // __NetBSD__ - - const char *getMessage(int set_number, int message_number, const char *default_messsage = 0); - void openCatalog(const char *); diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab deleted file mode 100644 index 06ec5836dce..00000000000 --- a/wm/fluxbox/patches/patch-ab +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2002/08/25 21:51:32 jlam Exp $ - ---- src/Makefile.in.orig Sat Apr 20 06:11:45 2002 -+++ src/Makefile.in -@@ -152,6 +152,10 @@ fluxbox_LDADD = $(LDADD) - fluxbox_DEPENDENCIES = - fluxbox_LDFLAGS = - CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) -+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) -+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) -+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) - CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - CXXLD = $(CXX) -@@ -171,9 +175,12 @@ GZIP_ENV = --best - SOURCES = $(fluxbox_SOURCES) - OBJECTS = $(fluxbox_OBJECTS) - -+Image.o: Image.C -+Image.lo: Image.C -+ - all: all-redirect - .SUFFIXES: --.SUFFIXES: .S .c .cc .lo .o .obj .s -+.SUFFIXES: .S .c .cc .C .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile - -@@ -254,10 +261,16 @@ maintainer-clean-libtool: - fluxbox$(EXEEXT): $(fluxbox_OBJECTS) $(fluxbox_DEPENDENCIES) - @rm -f fluxbox$(EXEEXT) - $(CXXLINK) $(fluxbox_LDFLAGS) $(fluxbox_OBJECTS) $(fluxbox_LDADD) $(LIBS) -+.cc.C: -+ cp -f $< $@ -+.C.o: -+ $(CXXCOMPILE_NOOPT) -c $< - .cc.o: - $(CXXCOMPILE) -c $< - .cc.obj: - $(CXXCOMPILE) -c `cygpath -w $<` -+.C.lo: -+ $(LTCXXCOMPILE_NOOPT) -c $< - .cc.lo: - $(LTCXXCOMPILE) -c $< - |