Attachment 46414 Details for Bug 71264 – fluxbox-devel.diff

[patch] fluxbox-devel.diff

fluxbox-devel.diff (text/plain), 9.36 KB, created by Jeremy Messenger on 2004-09-02 00:30:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Messenger

Created: 2004-09-02 00:30:27 UTC

Size: 9.36 KB

patch

obsolete

>diff -ur fluxbox-devel.orig/Makefile fluxbox-devel/Makefile
>--- fluxbox-devel.orig/Makefile	Fri Jul 30 16:28:27 2004
>+++ fluxbox-devel/Makefile	Thu Sep  2 06:05:48 2004
>@@ -6,17 +6,13 @@
> #
> 
> PORTNAME=	fluxbox
>-PORTVERSION=	0.9.9
>-PORTREVISION=	1
>+PORTVERSION=	0.9.10
> CATEGORIES=	x11-wm
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	fluxbox
> PKGNAMESUFFIX=	-devel
> DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
> EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
>-
>-PATCH_SITES=	http://fluxbox.org/download/
>-PATCHFILES=	fluxbox-0.9.9-gcc3.4.patch
> 
> MAINTAINER=	mezz@FreeBSD.org
> COMMENT=	A small and fast window manager based on BlackBox
>diff -ur fluxbox-devel.orig/distinfo fluxbox-devel/distinfo
>--- fluxbox-devel.orig/distinfo	Tue Jun  1 23:51:57 2004
>+++ fluxbox-devel/distinfo	Thu Sep  2 05:09:23 2004
>@@ -1,8 +1,6 @@
>-MD5 (fluxbox-0.9.9.tar.gz) = b0c637b1b6baa646f99877321b5d9e53
>-SIZE (fluxbox-0.9.9.tar.gz) = 723342
>-MD5 (fluxbook.pdf) = 44ac2a2291d739cd72acfafced2baafe
>-SIZE (fluxbook.pdf) = 202652
>-MD5 (fb-doc-mfhtml.tgz) = ce0f9171b7b497eb08a93e035cf879b4
>-SIZE (fb-doc-mfhtml.tgz) = 61972
>-MD5 (fluxbox-0.9.9-gcc3.4.patch) = 8d626eb9d87864d51db64832dcc6a023
>-SIZE (fluxbox-0.9.9-gcc3.4.patch) = 847
>+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
>diff -ur fluxbox-devel.orig/files/patch-doc::Makefile.in fluxbox-devel/files/patch-doc::Makefile.in
>--- fluxbox-devel.orig/files/patch-doc::Makefile.in	Sat May  1 01:36:40 2004
>+++ fluxbox-devel/files/patch-doc::Makefile.in	Thu Sep  2 05:42:08 2004
>@@ -1,15 +1,15 @@
>---- doc/Makefile.in.orig	Fri Apr 30 01:32:42 2004
>-+++ doc/Makefile.in	Fri Apr 30 01:33:50 2004
>-@@ -93,10 +93,10 @@
>- 
>- CLEANFILES = fluxbox.1
>+--- 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 @@
>+ SUBDIRS = ru
>+ CLEANFILES = fluxbox.1 fluxstyle.1
>  MAINTAINERCLEANFILES = Makefile.in
> -man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \
> +man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 \
>- 	startfluxbox.1 fluxstyle.1 fbrun.1
>+ 	startfluxbox.1 fluxstyle.1 fbrun.1 
>  
> -EXTRA_DIST = fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \
> +EXTRA_DIST = fluxbox.1.in fbrun.1 startfluxbox.1 fbsetbg.1 \
>- 	fluxstyle.1 Coding_style
>+ 	fluxstyle.1.in Coding_style
>  
>  subdir = doc
>diff -ur fluxbox-devel.orig/files/patch-util::Makefile.in fluxbox-devel/files/patch-util::Makefile.in
>--- fluxbox-devel.orig/files/patch-util::Makefile.in	Sat May  1 01:36:40 2004
>+++ fluxbox-devel/files/patch-util::Makefile.in	Thu Sep  2 04:53:54 2004
>@@ -1,5 +1,5 @@
>---- util/Makefile.in.orig	Fri Apr 30 01:35:18 2004
>-+++ util/Makefile.in	Fri Apr 30 01:36:19 2004
>+--- 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 @@
>  SUBDIRS = fbrun
>  INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
>@@ -7,8 +7,8 @@
> -bin_PROGRAMS = bsetroot
> +bin_PROGRAMS = 
>  bsetroot_SOURCES = bsetroot.cc bsetroot.hh
>- bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
>- 			../src/FbAtoms.o ../src/FbTk/libFbTk.a
>+ bsetroot_LDADD = ../src/FbRootWindow.o ../src/FbAtoms.o \
>+ 			../src/FbTk/libFbTk.a
> @@ -108,7 +108,7 @@
>  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>  CONFIG_HEADER = $(top_builddir)/config.h
>diff -ur fluxbox-devel.orig/files/patch-util::fluxbox-generate_menu.in fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
>--- fluxbox-devel.orig/files/patch-util::fluxbox-generate_menu.in	Sat May  1 01:36:40 2004
>+++ fluxbox-devel/files/patch-util::fluxbox-generate_menu.in	Thu Sep  2 05:43:45 2004
>@@ -1,5 +1,5 @@
>---- util/fluxbox-generate_menu.in.orig	Sun Apr 25 12:15:49 2004
>-+++ util/fluxbox-generate_menu.in	Fri Apr 30 03:29:05 2004
>+--- 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
> @@ -45,7 +45,7 @@
>  
>  
>@@ -29,7 +29,7 @@
>          }
>  
>          find_it_options() {
>-@@ -796,19 +796,19 @@
>+@@ -800,19 +800,19 @@
>  # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
>  
>  # --- PREFIX'es
>@@ -56,7 +56,7 @@
>  
>  
>  # --- Boolean variables.
>-@@ -931,7 +931,7 @@
>+@@ -935,7 +935,7 @@
>  
>  
>  # gnome prefix
>@@ -65,7 +65,7 @@
>      if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
>          break;
>      fi
>-@@ -939,7 +939,7 @@
>+@@ -943,7 +943,7 @@
>  # Will remain $PREFIX if all else fails
>  
>  # kde prefix
>@@ -74,16 +74,16 @@
>      if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
>          break;
>      fi
>-@@ -984,7 +984,7 @@
>+@@ -988,7 +988,7 @@
>  else
>      [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
>      #The precise order is up for debate.
>--    for browser in firefox mozilla-firebird MozillaFirebird opera skipstone mozilla galeon konqueror dillo netscape w3m links lynx; do
>-+    for browser in firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla galeon konqueror dillo netscape w3m links lynx; do
>+-    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla galeon konqueror dillo netscape w3m links lynx; do
>++    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla galeon konqueror dillo netscape w3m links lynx; do
>          if find_it $browser; then
>              DEFAULT_BROWSER=$browser
>              break
>-@@ -1024,7 +1024,8 @@
>+@@ -1028,7 +1028,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,17 +93,17 @@
>      MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
>      MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
>      *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
>-@@ -1041,7 +1042,8 @@
>- append_submenu "${NETMENU}"
>+@@ -1046,7 +1047,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}}"
> -        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 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}}"
>-@@ -1199,7 +1201,6 @@
>+@@ -1203,7 +1205,6 @@
>  
>      append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
>          append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
>diff -ur fluxbox-devel.orig/pkg-plist fluxbox-devel/pkg-plist
>--- fluxbox-devel.orig/pkg-plist	Wed Jun 30 16:39:55 2004
>+++ fluxbox-devel/pkg-plist	Thu Sep  2 05:37:01 2004
>@@ -18,7 +18,9 @@
> %%DOCHTML:%%%%DOCSDIR%%/html/c152.html
> %%DOCHTML:%%%%DOCSDIR%%/html/c28.html
> %%DOCHTML:%%%%DOCSDIR%%/html/c287.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/c289.html
> %%DOCHTML:%%%%DOCSDIR%%/html/c722.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/c724.html
> %%DOCHTML:%%%%DOCSDIR%%/html/c740.html
> %%DOCHTML:%%%%DOCSDIR%%/html/c98.html
> %%DOCHTML:%%%%DOCSDIR%%/html/chap-bg.html
>@@ -40,13 +42,19 @@
> %%DOCHTML:%%%%DOCSDIR%%/html/sect-wmctrl.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x160.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x231.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/x233.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x315.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/x317.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x346.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/x348.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x47.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x739.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/x741.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x757.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x795.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/x812.html
> %%DOCHTML:%%%%DOCSDIR%%/html/x813.html
>+%%DOCHTML:%%%%DOCSDIR%%/html/x814.html
> %%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook.pdf
> share/fluxbox/init
> share/fluxbox/keys
>@@ -130,20 +138,6 @@
> share/fluxbox/styles/Spiff
> share/fluxbox/styles/Twice
> share/fluxbox/styles/qnx-photon
>-%%NLS:%%@unexec rm %D/share/fluxbox/nls/lv 2>&1 >/dev/null || true
>-%%NLS:%%@unexec rm %D/share/fluxbox/nls/fr 2>&1 >/dev/null || true
>-%%NLS:%%@unexec rm %D/share/fluxbox/nls/es 2>&1 >/dev/null || true
>-%%NLS:%%@unexec rm %D/share/fluxbox/nls/en_US 2>&1 >/dev/null || true
>-%%NLS:%%@unexec rm %D/share/fluxbox/nls/en 2>&1 >/dev/null || true
>-%%NLS:%%@unexec rm %D/share/fluxbox/nls/US_ASCII 2>&1 >/dev/null || true
>-%%NLS:%%@unexec rm %D/share/fluxbox/nls/POSIX 2>&1 >/dev/null || true
>-%%NLS:%%@exec ln -s lv_LV %D/share/fluxbox/nls/lv
>-%%NLS:%%@exec ln -s fr_FR %D/share/fluxbox/nls/fr
>-%%NLS:%%@exec ln -s es_ES %D/share/fluxbox/nls/es
>-%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/en_US
>-%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/en
>-%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/US_ASCII
>-%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/POSIX
> @dirrm share/fluxbox/styles/Emerge/pixmaps
> @dirrm share/fluxbox/styles/Emerge
> @dirrm share/fluxbox/styles/BlueFlux/pixmaps

Actions: View | Diff

Attachments on bug 71264: 46414