summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wm/fluxbox/Makefile28
-rw-r--r--wm/fluxbox/PLIST6
-rw-r--r--wm/fluxbox/distinfo8
-rw-r--r--wm/fluxbox/options.mk34
4 files changed, 48 insertions, 28 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 4f86636b8c1..67a5a015be9 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/02/27 11:56:10 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/03/24 15:00:40 jmcneill Exp $
#
-DISTNAME= fluxbox-0.9.10
-PKGREVISION= 1
+DISTNAME= fluxbox-0.9.12
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
EXTRACT_SUFX= .tar.bz2
@@ -17,30 +16,13 @@ USE_BUILDLINK3= YES
USE_X11= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
+USE_GNU_TOOLS= make
+USE_LIBTOOL= YES
CONFIGURE_ARGS+= --enable-nls
CONFIGURE_ARGS+= --enable-xinerama
.include "../../mk/bsd.prefs.mk"
-
-FLUXBOX_USE_KDE?= NO
-.if !empty(FLUXBOX_USE_KDE:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --enable-kde
-.endif
-
-FLUXBOX_USE_GNOME?= NO
-.if !empty(FLUXBOX_USE_GNOME:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --enable-gnome
-.else
-CONFIGURE_ARGS+= --disable-gnome
-.endif
-
-FLUXBOX_USE_XFT?= YES
-.if !empty(FLUXBOX_USE_XFT:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --enable-xft
-.include "../../fonts/Xft2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-xft
-.endif
+.include "options.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index 09415883100..3c8207ab7d3 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/02 21:56:32 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/03/24 15:00:40 jmcneill Exp $
bin/fbrun
bin/fbsetbg
bin/fluxbox
@@ -21,6 +21,7 @@ share/fluxbox/nls/et_EE/fluxbox.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/ko_KR/fluxbox.cat
share/fluxbox/nls/lv_LV/fluxbox.cat
share/fluxbox/nls/nl_NL/fluxbox.cat
share/fluxbox/nls/pl_PL/fluxbox.cat
@@ -30,6 +31,7 @@ share/fluxbox/nls/ru_RU/fluxbox.cat
share/fluxbox/nls/sl_SI/fluxbox.cat
share/fluxbox/nls/sv_SE/fluxbox.cat
share/fluxbox/nls/tr_TR/fluxbox.cat
+share/fluxbox/nls/vi_VN/fluxbox.cat
share/fluxbox/styles/Artwiz
share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
@@ -96,6 +98,7 @@ share/fluxbox/styles/qnx-photon
@dirrm share/fluxbox/styles/BlueFlux/pixmaps
@dirrm share/fluxbox/styles/BlueFlux
@dirrm share/fluxbox/styles
+@dirrm share/fluxbox/nls/vi_VN
@dirrm share/fluxbox/nls/tr_TR
@dirrm share/fluxbox/nls/sv_SE
@dirrm share/fluxbox/nls/sl_SI
@@ -105,6 +108,7 @@ share/fluxbox/styles/qnx-photon
@dirrm share/fluxbox/nls/pl_PL
@dirrm share/fluxbox/nls/nl_NL
@dirrm share/fluxbox/nls/lv_LV
+@dirrm share/fluxbox/nls/ko_KR
@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 c1264fcbf83..a1f762283aa 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.16 2005/03/24 15:00:40 jmcneill Exp $
-SHA1 (fluxbox-0.9.10.tar.bz2) = 70bb65327b75c57082d812179e3ec37a9d3f8734
-RMD160 (fluxbox-0.9.10.tar.bz2) = 83a403e7840657ac6c18daaf7d5d33f55f0a8d5a
-Size (fluxbox-0.9.10.tar.bz2) = 556030 bytes
+SHA1 (fluxbox-0.9.12.tar.bz2) = 50651499c768ef4830e855c89bcd16dff660aa2a
+RMD160 (fluxbox-0.9.12.tar.bz2) = b549f4c2a9039757b1b8df62ab83eb8afd22bf29
+Size (fluxbox-0.9.12.tar.bz2) = 648685 bytes
SHA1 (patch-aa) = 4bb7da68b65c4c83900ef7491db724b3932ef052
SHA1 (patch-ab) = 23022e4a2cfdb347c294b7ee63c2ace1b32b7925
SHA1 (patch-ac) = f304326b795f96d59446f5a618331b15cdca7970
diff --git a/wm/fluxbox/options.mk b/wm/fluxbox/options.mk
new file mode 100644
index 00000000000..ea4f1e9cc08
--- /dev/null
+++ b/wm/fluxbox/options.mk
@@ -0,0 +1,34 @@
+# $NetBSD: options.mk,v 1.1 2005/03/24 15:00:40 jmcneill Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.fluxbox
+PKG_SUPPORTED_OPTIONS= gnome kde imlib2 xft
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+= --enable-gnome
+.include "../../devel/libgnome/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-gnome
+.endif
+
+.if !empty(PKG_OPTIONS:Mkde)
+CONFIGURE_ARGS+= --enable-kde
+.include "../../x11/kdelibs3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-kde
+.endif
+
+.if !empty(PKG_OPTIONS:Mimlib2)
+CONFIGURE_ARGS+= --enable-imlib2
+.include "../../graphics/imlib2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-imlib2
+.endif
+
+.if !empty(PKG_OPTIONS:Mxft)
+CONFIGURE_ARGS+= --enable-xft
+.include "../../fonts/Xft2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-xft
+.endif