From e4acdfe6e5ab8b695c81406959feb90affc4af7f Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 8 Dec 2004 05:27:28 +0000 Subject: -Update to 0.9.11. -Some clean up such as: o Teach about the target. o GNU_CONFIGURE -> USE_LIBTOOL_VER=15 o Remove the un-need -NLS patch; it works by default. o Teach about ${LOCALBASE}/include and ${LOCALBASE}/lib, now it will find pkg-config, libiconv and etc correct. o Use better WWW for fluxbox-devel: http://fluxbox.org/version-0.9.php As for -CURRENT and malloc.conf->AJ users should be happy with this release now, because it fixed the memory leaks and etc. Fluxbox should run without get any crash. See more details about this release: http://svn.berlios.de/viewcvs/fluxbox/trunk/NEWS?rev=3751&view=markup --- x11-wm/fluxbox-devel/Makefile | 19 ++++++++++--------- x11-wm/fluxbox-devel/distinfo | 12 ++++++------ x11-wm/fluxbox-devel/files/patch-doc::Makefile.in | 6 +++--- x11-wm/fluxbox-devel/files/patch-util::Makefile.in | 8 ++++---- .../files/patch-util::fluxbox-generate_menu.in | 18 +++++++++--------- x11-wm/fluxbox-devel/pkg-descr | 5 +---- x11-wm/fluxbox-devel/pkg-plist | 3 +++ 7 files changed, 36 insertions(+), 35 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile index 0f42d56129e6..a47249b420ee 100644 --- a/x11-wm/fluxbox-devel/Makefile +++ b/x11-wm/fluxbox-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fluxbox -PORTVERSION= 0.9.10 +PORTVERSION= 0.9.11 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fluxbox @@ -22,16 +22,14 @@ RUN_DEPENDS= bsetroot:${PORTSDIR}/x11-wm/boxtools CONFLICTS= fluxbox-0.1.* +USE_GNOME= gnometarget WANT_GNOME= yes USE_X_PREFIX= yes USE_REINPLACE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO MAN1= fbrun.1 fbsetbg.1 fluxbox.1 fluxstyle.1 startfluxbox.1 -NLSMAKEFILES= nls nls/C nls/bg_BG nls/da_DK nls/de_DE nls/es_ES nls/et_EE \ - nls/fr_FR nls/it_IT nls/ja_JP nls/lv_LV nls/nl_NL nls/pl_PL \ - nls/pt_BR nls/pt_PT nls/ru_RU nls/sl_SI nls/sv_SE nls/tr_TR .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug @@ -66,9 +64,13 @@ CONFIGURE_ARGS+= --enable-xinerama .if !defined(WITHOUT_NLS) USE_GETTEXT= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -liconv" CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS:="" .else +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS:="@comment " .endif @@ -128,10 +130,9 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/util/fluxbox-generate_menu.in -.if !defined(WITHOUT_NLS) -.for i in ${NLSMAKEFILES} - @${REINPLACE_CMD} -e 's|@NLS@|-DNLS|' ${WRKSRC}/${i}/Makefile.in -.endfor +.if defined(WITHOUT_NLS) + @${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \ + ${WRKSRC}/configure .endif post-install: diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo index de68b5f0f1e0..bdbe7d141714 100644 --- a/x11-wm/fluxbox-devel/distinfo +++ b/x11-wm/fluxbox-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (fluxbox-0.9.10.tar.gz) = a17dd00ffc2637554539ada36a0ae31d -SIZE (fluxbox-0.9.10.tar.gz) = 745845 -MD5 (fb-doc-mfhtml.tgz) = 36e70967c1d3a48b3ca9772703b1e3c6 -SIZE (fb-doc-mfhtml.tgz) = 66950 -MD5 (fluxbook.pdf) = 8931cc314b80740a522dd02704801277 -SIZE (fluxbook.pdf) = 208078 +MD5 (fluxbox-0.9.11.tar.gz) = 453e9170a6ab0a4df91ffaccd1604465 +SIZE (fluxbox-0.9.11.tar.gz) = 851770 +MD5 (fb-doc-mfhtml.tgz) = e081dcea99483b538be9465cf3ab14c3 +SIZE (fb-doc-mfhtml.tgz) = 70736 +MD5 (fluxbook.pdf) = bcf3cb99a7d5b9ef16181d29d99a189b +SIZE (fluxbook.pdf) = 211324 diff --git a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in index 4e322c9d988d..a30abf4a4a53 100644 --- a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in +++ b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig Thu Sep 2 04:51:01 2004 -+++ doc/Makefile.in Thu Sep 2 04:51:30 2004 -@@ -95,10 +95,10 @@ +--- doc/Makefile.in.orig Mon Dec 6 18:30:25 2004 ++++ doc/Makefile.in Mon Dec 6 18:31:00 2004 +@@ -102,10 +102,10 @@ SUBDIRS = ru CLEANFILES = fluxbox.1 fluxstyle.1 MAINTAINERCLEANFILES = Makefile.in diff --git a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in index f75058c2fff6..6710fdee19e8 100644 --- a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in +++ b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in @@ -1,6 +1,6 @@ ---- util/Makefile.in.orig Thu Sep 2 04:53:00 2004 -+++ util/Makefile.in Thu Sep 2 04:53:32 2004 -@@ -94,7 +94,7 @@ +--- util/Makefile.in.orig Mon Dec 6 18:31:56 2004 ++++ util/Makefile.in Mon Dec 6 18:32:21 2004 +@@ -101,7 +101,7 @@ SUBDIRS = fbrun INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox @@ -9,7 +9,7 @@ bsetroot_SOURCES = bsetroot.cc bsetroot.hh bsetroot_LDADD = ../src/FbRootWindow.o ../src/FbAtoms.o \ ../src/FbTk/libFbTk.a -@@ -108,7 +108,7 @@ +@@ -115,7 +115,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = diff --git a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in index 04e61674b847..05f5c633280c 100644 --- a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in +++ b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in @@ -1,5 +1,5 @@ ---- util/fluxbox-generate_menu.in.orig Mon Aug 23 18:23:41 2004 -+++ util/fluxbox-generate_menu.in Thu Sep 2 05:43:40 2004 +--- util/fluxbox-generate_menu.in.orig Mon Dec 6 18:33:02 2004 ++++ util/fluxbox-generate_menu.in Mon Dec 6 18:43:47 2004 @@ -45,7 +45,7 @@ @@ -29,7 +29,7 @@ } find_it_options() { -@@ -800,19 +800,19 @@ +@@ -802,19 +802,19 @@ # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run' # --- PREFIX'es @@ -56,7 +56,7 @@ # --- Boolean variables. -@@ -935,7 +935,7 @@ +@@ -939,7 +939,7 @@ # gnome prefix @@ -65,7 +65,7 @@ if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then break; fi -@@ -943,7 +943,7 @@ +@@ -947,7 +947,7 @@ # Will remain $PREFIX if all else fails # kde prefix @@ -74,7 +74,7 @@ if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then break; fi -@@ -988,7 +988,7 @@ +@@ -992,7 +992,7 @@ else [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 #The precise order is up for debate. @@ -83,7 +83,7 @@ if find_it $browser; then DEFAULT_BROWSER=$browser break -@@ -1028,7 +1028,8 @@ +@@ -1032,7 +1032,8 @@ links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; firefox|firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; @@ -93,7 +93,7 @@ MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;; *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; -@@ -1046,7 +1047,8 @@ +@@ -1050,7 +1051,8 @@ append_submenu "${BROWSERMENU}" normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}" @@ -103,7 +103,7 @@ find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}" find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}" -@@ -1203,7 +1205,6 @@ +@@ -1210,7 +1212,6 @@ append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" diff --git a/x11-wm/fluxbox-devel/pkg-descr b/x11-wm/fluxbox-devel/pkg-descr index 2865c0253842..d9d37833dbaf 100644 --- a/x11-wm/fluxbox-devel/pkg-descr +++ b/x11-wm/fluxbox-devel/pkg-descr @@ -10,7 +10,4 @@ Fluxbox is a window manager based on BlackBox with some new features: o Wheel scroll changes workspace o KDE and partial Gnome support -WWW: http://fluxbox.sourceforge.net/ - -- Hendrik Scholz -hendrik@scholz.net +WWW: http://fluxbox.org/version-0.9.php diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist index 6e1e1ed5b642..9fcb4c6d2f67 100644 --- a/x11-wm/fluxbox-devel/pkg-plist +++ b/x11-wm/fluxbox-devel/pkg-plist @@ -14,6 +14,7 @@ bin/startfluxbox %%DOCHTML:%%%%DOCSDIR%%/html/app-debugging.html %%DOCHTML:%%%%DOCSDIR%%/html/app-setup.html %%DOCHTML:%%%%DOCSDIR%%/html/app-themeref.html +%%DOCHTML:%%%%DOCSDIR%%/html/book1.html %%DOCHTML:%%%%DOCSDIR%%/html/bsetroot-man.html %%DOCHTML:%%%%DOCSDIR%%/html/c152.html %%DOCHTML:%%%%DOCSDIR%%/html/c28.html @@ -55,6 +56,8 @@ bin/startfluxbox %%DOCHTML:%%%%DOCSDIR%%/html/x812.html %%DOCHTML:%%%%DOCSDIR%%/html/x813.html %%DOCHTML:%%%%DOCSDIR%%/html/x814.html +%%DOCHTML:%%%%DOCSDIR%%/html/x817.html +%%DOCHTML:%%%%DOCSDIR%%/html/x820.html %%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook.pdf share/fluxbox/init share/fluxbox/keys -- cgit