Index: head/x11-wm/fluxbox/Makefile =================================================================== --- head/x11-wm/fluxbox/Makefile (revision 379105) +++ head/x11-wm/fluxbox/Makefile (revision 379106) @@ -1,157 +1,156 @@ # Created by: spn # $FreeBSD$ PORTNAME= fluxbox -PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTVERSION= 1.3.7 CATEGORIES= x11-wm MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= beat@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Small and fast window manager based on BlackBox LICENSE= MIT RUN_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi USE_XORG= xextproto xft xpm xrandr USES= gmake pkgconfig WANT_GNOME= yes GNU_CONFIGURE= yes PORTDOCS= AUTHORS ChangeLog NEWS README TODO DOCSVERSION= 20060629 OPTIONS_DEFINE= DOCS DOCHTML PDFDOCS DEBUG GNOME IMLIB2 XINERAMA \ XRENDER NLS SLIT SYSTRAY REMEMBER TOOLBAR OPTIONS_DEFAULT= XRENDER SLIT SYSTRAY REMEMBER TOOLBAR DOCHTML_DESC= Install html documentation PDFDOCS_DESC= Build and install PDF documentation REMEMBER_DESC= Enable remember feature SLIT_DESC= Enable slit feature SYSTRAY_DESC= Enable systray feature TOOLBAR_DESC= Enable toolbar feature XRENDER_DESC= Enable xrender support .include .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif .if ${PORT_OPTIONS:MDOCHTML} # http://fluxbox.org/docbook/en/tarballs/ MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \ http://people.freebsd.org/~mezz/distfiles/:html DISTFILES+= fb-doc-mfhtml-${DOCSVERSION}.tgz:html EXTRACT_ONLY+= fb-doc-mfhtml-${DOCSVERSION}.tgz PLIST_SUB+= DOCHTML="" .else PLIST_SUB+= DOCHTML="@comment " .endif .if ${PORT_OPTIONS:MPDFDOCS} # http://fluxbox.org/docbook/en/pdf/ MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \ http://people.freebsd.org/~mezz/distfiles/:pdf DISTFILES+= fluxbook-${DOCSVERSION}.pdf:pdf PLIST_SUB+= DOCPDF="" .else PLIST_SUB+= DOCPDF="@comment " .endif .if ${PORT_OPTIONS:MIMLIB2} LIB_DEPENDS+= libImlib2.so:${PORTSDIR}/graphics/imlib2 CONFIGURE_ARGS+= --enable-imlib2 .else CONFIGURE_ARGS+= --disable-imlib2 .endif .if ${PORT_OPTIONS:MXINERAMA} || defined(PACKAGE_BUILDING) USE_XORG+= xinerama CONFIGURE_ARGS+= --enable-xinerama .endif .if ${PORT_OPTIONS:MNLS} USES+= iconv CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .else CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MREMEMBER} CONFIGURE_ARGS+= --enable-remember .else CONFIGURE_ARGS+= --disable-remember .endif .if ${PORT_OPTIONS:MSLIT} CONFIGURE_ARGS+= --enable-slit .else CONFIGURE_ARGS+= --disable-slit .endif .if ${PORT_OPTIONS:MSYSTRAY} CONFIGURE_ARGS+= --enable-systray .else CONFIGURE_ARGS+= --disable-systray .endif .if ${PORT_OPTIONS:MTOOLBAR} CONFIGURE_ARGS+= --enable-toolbar .else CONFIGURE_ARGS+= --disable-toolbar .endif .if ${PORT_OPTIONS:MXRENDER} USE_XORG+= xrender CONFIGURE_ARGS+= --enable-xrender .else CONFIGURE_ARGS+= --disable-xrender .endif .include .if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-gnome .else CONFIGURE_ARGS+= --disable-gnome .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/util/fluxbox-generate_menu.in ${WRKSRC}/util/fbsetbg .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \ ${WRKSRC}/configure .endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MPDFDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf ${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \ ${STAGEDIR}${DOCSDIR}/pdf/ .endif .if ${PORT_OPTIONS:MDOCHTML} @${MKDIR} ${STAGEDIR}${DOCSDIR}/html . for h in *.css *.html (cd ${WRKDIR}/html && ${INSTALL_DATA} ${h} ${STAGEDIR}${DOCSDIR}/html) . endfor .endif .include Index: head/x11-wm/fluxbox/distinfo =================================================================== --- head/x11-wm/fluxbox/distinfo (revision 379105) +++ head/x11-wm/fluxbox/distinfo (revision 379106) @@ -1,6 +1,6 @@ -SHA256 (fluxbox-1.3.6.tar.gz) = cb54eb62d3dba2f282a50fbdd077d26a2c9f555c12b5bf664b1192ece7669527 -SIZE (fluxbox-1.3.6.tar.gz) = 1312141 +SHA256 (fluxbox-1.3.7.tar.gz) = c99e2baa06fff1e96342b20415059d12ff1fa2917ade0173c75b2fa570295b9f +SIZE (fluxbox-1.3.7.tar.gz) = 1267833 SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec SIZE (fb-doc-mfhtml-20060629.tgz) = 115560 SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde SIZE (fluxbook-20060629.pdf) = 430351 Index: head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.cc =================================================================== --- head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.cc (revision 379105) +++ head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.cc (nonexistent) @@ -1,21 +0,0 @@ ---- src/FbTk/TextButton.cc 2015-01-28 11:12:27.000000000 +0200 -+++ src/FbTk/TextButton.cc 2015-01-28 11:14:03.000000000 +0200 -@@ -143,11 +143,17 @@ - unsigned int textlen = visual.size(); - unsigned int button_width = width(); - unsigned int button_height = height(); -+ const int max_width = static_cast(button_width) - x_offset - -+ m_left_padding - m_right_padding; -+ -+ if (max_width <= bevel()) { -+ return; -+ } - - translateSize(m_orientation, button_width, button_height); - - // horizontal alignment, cut off text if needed -- int align_x = FbTk::doAlignment(button_width - x_offset - m_left_padding - m_right_padding, -+ int align_x = FbTk::doAlignment(max_width, - bevel(), justify(), font(), - visual.data(), visual.size(), - textlen); // return new text len Property changes on: head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/fluxbox/files/patch-src__fluxbox.cc =================================================================== --- head/x11-wm/fluxbox/files/patch-src__fluxbox.cc (revision 379105) +++ head/x11-wm/fluxbox/files/patch-src__fluxbox.cc (revision 379106) @@ -1,11 +1,11 @@ ---- ./src/fluxbox.cc.orig 2013-02-13 10:04:05.899812000 +0000 -+++ ./src/fluxbox.cc 2013-09-20 15:41:23.584087389 +0000 -@@ -1355,7 +1355,7 @@ +--- src/fluxbox.cc.orig 2015-02-08 10:44:45 UTC ++++ src/fluxbox.cc +@@ -1316,7 +1316,7 @@ void Fluxbox::revertFocus() { FocusControl::setFocusedWindow(0); } -bool Fluxbox::validateClient(const WinClient *client) const { +bool Fluxbox::validateClient(WinClient *client) const { WinClientMap::const_iterator it = find_if(m_window_search.begin(), m_window_search.end(), Index: head/x11-wm/fluxbox/files/patch-src__fluxbox.hh =================================================================== --- head/x11-wm/fluxbox/files/patch-src__fluxbox.hh (revision 379105) +++ head/x11-wm/fluxbox/files/patch-src__fluxbox.hh (revision 379106) @@ -1,11 +1,11 @@ ---- ./src/fluxbox.hh.orig 2013-02-13 10:04:05.899812000 +0000 -+++ ./src/fluxbox.hh 2013-09-20 15:41:23.585087645 +0000 -@@ -88,7 +88,7 @@ - /// main event loop - void eventLoop(); +--- src/fluxbox.hh.orig 2015-02-08 10:44:45 UTC ++++ src/fluxbox.hh +@@ -103,7 +103,7 @@ public: + WinClient *searchWindow(Window); + BScreen *searchScreen(Window w); bool validateWindow(Window win) const; - bool validateClient(const WinClient *client) const; + bool validateClient(WinClient *client) const; - void grab(); - void ungrab(); + // Not currently implemented until we decide how it'll be used + //WinClient *searchGroup(Window); Index: head/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in =================================================================== --- head/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in (revision 379105) +++ head/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in (revision 379106) @@ -1,219 +1,209 @@ ---- util/fluxbox-generate_menu.in.orig 2012-12-10 18:26:53.000000000 +0100 -+++ util/fluxbox-generate_menu.in 2013-01-02 14:22:14.000000000 +0100 -@@ -68,7 +68,7 @@ +--- util/fluxbox-generate_menu.in.orig 2015-02-08 10:44:45 UTC ++++ util/fluxbox-generate_menu.in +@@ -68,7 +68,7 @@ Options: -d Other path(s) to recursively search for *.desktop files -ds Wider search for *.desktop files (takes more time) -i Other path(s) to search for icons - e.g., "/usr/kde/3.3/share/icons/crystalsvg/16x16/*" + e.g., "%%LOCALBASE%%/share/icons/crystalsvg/16x16/*" -is Wider search for icons (worth the extra time) -in Skip icon search -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ Options: Only for packagers: -p Prefix; default is @PREFIX@ - -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected + -n Gnome-prefix; %%LOCALBASE%% autodetected -q KDE-prefix; idem dito -@@ -145,13 +145,42 @@ +@@ -145,13 +145,42 @@ testoption() { esac } -find_it() { - [ -n "$1" ] && hash $1 2> /dev/null && shift && "$@" -} +# some which's have a reliable return code, some don't +# Lets figure out which which we have. +if which this_program_does_not_exist-no_really-aA1zZ9 2> /dev/null 1> /dev/null; then + # can't rely on return value + find_it() { + file=`which $1 2> /dev/null` + if [ -x "$file" ]; then + if [ $# -gt 1 ]; then + shift + "$@" + fi + return 0 + else + return 1 + fi + } -find_it_options() { - [ -n "$1" ] && hash $1 2> /dev/null -} + find_it_options() { + file=`which $1 2> /dev/null` + if [ -x "$file" ]; then + return 0 + else + return 1 + fi + } + +else + # can rely on return value + find_it() { + which $1 > /dev/null 2>&1 && shift && "$@" + } + + find_it_options() { + which $1 > /dev/null 2>&1 + } +fi #echo "replaceWithinString: $1, $2, $3" >&2 #echo ${1//$2/$3} # causes error in BSD even though not used -@@ -203,7 +232,7 @@ +@@ -203,7 +232,7 @@ convertIcon(){ if [ -f "${entry_icon}" ]; then : echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2 else - if hash convert 2> /dev/null; then + if which convert &> /dev/null; then convert "$1" "$entry_icon" # echo convert "$1" , "$entry_icon" >> $ICONMAPPING else -@@ -275,7 +304,7 @@ +@@ -275,7 +304,7 @@ doSearch(){ # echo -n "for $temp_icon" eval doSearchLoop $USER_ICONPATHS \ "$FB_ICONDIR" \ - "/usr/share/${execname%% *}" \ + "%%LOCALBASE%%/share/${execname%% *}" \ ${OTHER_ICONPATHS} \ -@@ -558,7 +587,7 @@ +@@ -558,7 +587,7 @@ rm -f ${MENUFILENAME}.tmp WHOAMI=`whoami` -[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin +[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin # Check for Imlib2-support if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then -@@ -1271,16 +1300,16 @@ +@@ -1271,16 +1300,16 @@ if [ ! "${INSTALL}" = Yes ]; then # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox # your prefix is: @PREFIX@ -# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so +# fluxbox-generate already looks in %%LOCALBASE%% so # there should be no need to specify them. # # PREFIX=@PREFIX@ -# GNOME_PREFIX=/opt/gnome -# KDE_PREFIX=/opt/kde +# GNOME_PREFIX=%%LOCALBASE%% +# KDE_PREFIX=%%LOCALBASE%% # Separate the list of background dirs with colons ':' -# BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers" +# BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%LOCALBASE%%/share/wallpapers" # --- Boolean variables. -@@ -1327,29 +1356,21 @@ +@@ -1327,29 +1356,21 @@ while [ $# -gt 0 ]; do -g) GNOMEMENU=yes; shift;; -in) NO_ICON=yes; shift;; -is) OTHER_ICONPATHS=" - /usr/share/icons - /usr/share/icons/mini - /usr/share/pixmaps - /usr/local/share/icons - /usr/local/share/icons/mini - /usr/local/share/pixmaps - /usr/share/xclass/icons - /usr/share/xclass/pixmaps - /usr/local/share/xclass/icons - /usr/local/share/xclass/pixmaps - /usr/X11R6/share/icons/default/16x16 - /usr/X11R6/share/icons/kde/16x16 - /usr/X11R6/share/icons/hicolor/16x16 - /usr/local/X11R6/share/icons/default/16x16 - /usr/local/X11R6/share/icons/kde/16x16 - /usr/local/X11R6/share/icons/hicolor/16x16 + %%LOCALBASE%%/share/icons + %%LOCALBASE%%/share/icons/mini + %%LOCALBASE%%/share/pixmaps + %%LOCALBASE%%/share/xclass/icons + %%LOCALBASE%%/share/xclass/pixmaps + %%LOCALBASE%%/share/icons/default/16x16 + %%LOCALBASE%%/share/icons/kde/16x16 + %%LOCALBASE%%/share/icons/hicolor/16x16 " shift;; -ds) OTHER_DESKTOP_PATHS=" - /usr/share/mimelnk - /usr/share/applications - /usr/share/xsessions - /usr/share/services + %%LOCALBASE%%/share/mimelnk + %%LOCALBASE%%/share/applications + %%LOCALBASE%%/share/xsessions + %%LOCALBASE%%/share/services " # /usr/share/apps \ shift;; -@@ -1420,13 +1441,12 @@ +@@ -1420,13 +1441,12 @@ fi # prefix PREFIX="${PREFIX:=@PREFIX@}" if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then - hash @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ - PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@$,,'` + PREFIX=`which fluxbox | sed 's,/bin/fluxbox$,,'` fi # gnome prefix -for GNOME_PREFIX in "${GNOME_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do +for GNOME_PREFIX in "${GNOME_PREFIX}" %%LOCALBASE%% "${PREFIX}"; do if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then break; fi -@@ -1434,7 +1454,7 @@ +@@ -1434,7 +1454,7 @@ done # Will remain $PREFIX if all else fails # kde prefix -for KDE_PREFIX in "${KDE_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do +for KDE_PREFIX in "${KDE_PREFIX}" %%LOCALBASE%% "${PREFIX}"; do if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then break; fi -@@ -1522,7 +1542,7 @@ +@@ -1522,7 +1542,7 @@ if find_it_options $MY_BROWSER; then else [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 #The precise order is up for debate. -- for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do -+ for browser in chrome firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do +- for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do ++ for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do if find_it_options $browser; then DEFAULT_BROWSER=$browser break -@@ -1581,9 +1601,10 @@ - - case "$DEFAULT_BROWSERNAME" in - links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; -- firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; -+ chrome|firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; +@@ -1589,6 +1609,7 @@ case "$DEFAULT_BROWSERNAME" in + chrome|chromium) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; + google-chrome) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; -- opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; -+ linux-opera) append "[exec] (linux-opera) {linux-opera}" ;; -+ opera) append "[exec] (opera) {opera}" ;; ++ linux-opera) append "[exec] (linux-opera) {env QT_XFT=true linux-opera}" ;; + opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;; - *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; -@@ -1600,9 +1621,10 @@ - - append_submenu "${NETMENU}" +@@ -1608,6 +1629,7 @@ append_submenu "${NETMENU}" append_submenu "${BROWSERMENU}" -- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer -+ normal_find chrome firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer + normal_find chrome chromium firefox google-chrome mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}" -- find_it opera append "[exec] (opera) {env QT_XFT=true opera}" -+ find_it linux-opera append "[exec] (linux-opera) {linux-opera}" -+ find_it opera append "[exec] (opera) {opera}" ++ find_it linux-opera append "[exec] (linux-opera) {env QT_XFT=true opera}" + find_it opera append "[exec] (opera) {env QT_XFT=true opera}" 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}}"