From 559f5db1e30f7c0ded23ba19ce673c55aa95f599 Mon Sep 17 00:00:00 2001 From: brad Date: Fri, 11 Aug 2000 03:45:03 +0000 Subject: [PATCH] upgrade to blackbox 0.60.3 --- x11/blackbox/Makefile | 31 +++++------ x11/blackbox/files/md5 | 6 +-- x11/blackbox/patches/patch-data_Makefile.in | 13 +++++ x11/blackbox/patches/patch-nls_C_Makefile.in | 15 ++++++ x11/blackbox/patches/patch-nls_Makefile.in | 18 +++++++ .../patches/patch-nls_es_ES_Makefile.in | 17 ++++++ .../patches/patch-nls_pt_BR_Makefile.in | 15 ++++++ .../patches/patch-nls_ru_RU_Makefile.in | 15 ++++++ .../patches/patch-nls_sv_SE_Makefile.in | 15 ++++++ .../patches/patch-nls_tr_TR_Makefile.in | 15 ++++++ x11/blackbox/pkg/DESCR | 4 +- x11/blackbox/pkg/PLIST | 54 ++++++++++++------- 12 files changed, 178 insertions(+), 40 deletions(-) create mode 100644 x11/blackbox/patches/patch-data_Makefile.in create mode 100644 x11/blackbox/patches/patch-nls_C_Makefile.in create mode 100644 x11/blackbox/patches/patch-nls_Makefile.in create mode 100644 x11/blackbox/patches/patch-nls_es_ES_Makefile.in create mode 100644 x11/blackbox/patches/patch-nls_pt_BR_Makefile.in create mode 100644 x11/blackbox/patches/patch-nls_ru_RU_Makefile.in create mode 100644 x11/blackbox/patches/patch-nls_sv_SE_Makefile.in create mode 100644 x11/blackbox/patches/patch-nls_tr_TR_Makefile.in diff --git a/x11/blackbox/Makefile b/x11/blackbox/Makefile index 11c7bc430c5..6efefc4d7bc 100644 --- a/x11/blackbox/Makefile +++ b/x11/blackbox/Makefile @@ -1,33 +1,28 @@ -# $OpenBSD: Makefile,v 1.22 2000/06/28 01:00:09 fgsch Exp $ +# $OpenBSD: Makefile,v 1.23 2000/08/11 03:45:03 brad Exp $ -DISTNAME= blackbox-0.51.3.1 -CATEGORIES= x11 -NEED_VERSION= 1.308 -MASTER_SITES= ftp://portal.alug.org/pub/blackbox/0.5x.x/ \ - ftp://ftp.dti.ad.jp/pub/X/blackbox/0.5x.x/ +DISTNAME= blackbox-0.60.3 +CATEGORIES= x11 +NEED_VERSION= 1.310 +MASTER_SITES= ftp://portal.alug.org/pub/blackbox/0.6x.x/ \ + ftp://ftp.dti.ad.jp/pub/X/blackbox/0.6x.x/ -MAINTAINER= rohee@OpenBSD.ORG +HOMEPAGE= http://blackbox.alug.org/ -HOMEPAGE= http://blackbox.alug.org/ +MAINTAINER= rohee@openbsd.org PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -USE_X11= Yes -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= --disable-styled-frames -FLAVORS=kde -FLAVOR?= - -.if ${FLAVOR:L} == "kde" -CONFIGURE_ARGS+= --enable-kde -.endif +DOCS= AUTHORS ChangeLog ChangeLog-0.40.x ChangeLog-0.50.x \ + ChangeLog-0.51.x README post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/blackbox - cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING ChangeLog README \ - ${PREFIX}/share/doc/blackbox + cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/blackbox .include diff --git a/x11/blackbox/files/md5 b/x11/blackbox/files/md5 index b450658b94a..7fede773cb2 100644 --- a/x11/blackbox/files/md5 +++ b/x11/blackbox/files/md5 @@ -1,3 +1,3 @@ -MD5 (blackbox-0.51.3.1.tar.gz) = c05185c6ce3225efbd35b25f86bd9aea -SHA1 (blackbox-0.51.3.1.tar.gz) = 687303093791a31ca2c03f02cdb3044219764c7a -RMD160 (blackbox-0.51.3.1.tar.gz) = 789cb2a84ab1259a8a59134a3382dd40aee9ad5f +MD5 (blackbox-0.60.3.tar.gz) = b8b7a830a9eb79488e6b44ca4a6a531e +RMD160 (blackbox-0.60.3.tar.gz) = 554156e16463ce8aa6e46693b64e6a28ad09df34 +SHA1 (blackbox-0.60.3.tar.gz) = 3085ec897477ac6c2c0009a4e53d2b3532efc1ab diff --git a/x11/blackbox/patches/patch-data_Makefile.in b/x11/blackbox/patches/patch-data_Makefile.in new file mode 100644 index 00000000000..c8ce921a9a6 --- /dev/null +++ b/x11/blackbox/patches/patch-data_Makefile.in @@ -0,0 +1,13 @@ +--- data/Makefile.in.orig Tue Aug 8 11:48:59 2000 ++++ data/Makefile.in Tue Aug 8 11:49:17 2000 +@@ -312,8 +312,8 @@ + + all-local: menu + +-menu: menu.in +- @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.in > menu ++menu: $(srcdir)/menu.in ++ @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/menu.in > menu + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11/blackbox/patches/patch-nls_C_Makefile.in b/x11/blackbox/patches/patch-nls_C_Makefile.in new file mode 100644 index 00000000000..aab1c861b83 --- /dev/null +++ b/x11/blackbox/patches/patch-nls_C_Makefile.in @@ -0,0 +1,15 @@ +--- nls/C/Makefile.in.orig Tue Aug 8 11:23:33 2000 ++++ nls/C/Makefile.in Tue Aug 8 10:55:05 2000 +@@ -184,9 +184,9 @@ + all-local: blackbox.cat + install-data-local: blackbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ +- echo "Installing catalog in $(pkgdatadir)/nls/C"; \ +- $(mkinstalldirs) $(pkgdatadir)/nls/C; \ +- $(INSTALL_DATA) blackbox.cat $(pkgdatadir)/nls/C; \ ++ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \ ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \ ++ $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \ + fi + + # note... when adding new catalogs... you do not need the diff --git a/x11/blackbox/patches/patch-nls_Makefile.in b/x11/blackbox/patches/patch-nls_Makefile.in new file mode 100644 index 00000000000..98201d4a55d --- /dev/null +++ b/x11/blackbox/patches/patch-nls_Makefile.in @@ -0,0 +1,18 @@ +--- nls/Makefile.in.orig Tue Aug 8 10:44:46 2000 ++++ nls/Makefile.in Tue Aug 8 11:18:11 2000 +@@ -290,10 +290,11 @@ + + install-data-hook: + @if test x$(NLSTEST) = "x-DNLS"; then \ +- ln -fs $(pkgdatadir)/nls/C $(pkgdatadir)/nls/US_ASCII; \ +- ln -fs $(pkgdatadir)/nls/C $(pkgdatadir)/nls/POSIX; \ +- ln -fs $(pkgdatadir)/nls/C $(pkgdatadir)/nls/en_US; \ +- ln -fs $(pkgdatadir)/nls/C $(pkgdatadir)/nls/en; \ ++ cd $(DESTDIR)$(pkgdatadir)/nls && \ ++ ln -fs C US_ASCII && \ ++ ln -fs C POSIX && \ ++ ln -fs C en_US && \ ++ ln -fs C en; \ + fi + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/blackbox/patches/patch-nls_es_ES_Makefile.in b/x11/blackbox/patches/patch-nls_es_ES_Makefile.in new file mode 100644 index 00000000000..90473c98bbe --- /dev/null +++ b/x11/blackbox/patches/patch-nls_es_ES_Makefile.in @@ -0,0 +1,17 @@ +--- nls/es_ES/Makefile.in.orig Tue Aug 8 11:26:08 2000 ++++ nls/es_ES/Makefile.in Tue Aug 8 11:28:15 2000 +@@ -184,10 +184,10 @@ + all-local: blackbox.cat + install-data-local: blackbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ +- echo "Installing catalog in $(pkgdatadir)/nls/es_ES"; \ +- $(mkinstalldirs) $(pkgdatadir)/nls/es_ES ; \ +- $(INSTALL_DATA) blackbox.cat $(pkgdatadir)/nls/es_ES; \ +- ln -sf $(pkgdatadir)/nls/es_ES $(pkgdatadir)/nls/es; \ ++ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/es_ES"; \ ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/es_ES ; \ ++ $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/es_ES; \ ++ cd $(DESTDIR)$(pkgdatadir)/nls && ln -sf es_ES es; \ + fi + + Translation.m: $(MFILES) diff --git a/x11/blackbox/patches/patch-nls_pt_BR_Makefile.in b/x11/blackbox/patches/patch-nls_pt_BR_Makefile.in new file mode 100644 index 00000000000..5d782899c33 --- /dev/null +++ b/x11/blackbox/patches/patch-nls_pt_BR_Makefile.in @@ -0,0 +1,15 @@ +--- nls/pt_BR/Makefile.in.orig Tue Aug 8 11:29:51 2000 ++++ nls/pt_BR/Makefile.in Tue Aug 8 11:30:37 2000 +@@ -184,9 +184,9 @@ + all-local: blackbox.cat + install-data-local: blackbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ +- echo "Installing catalog in $(pkgdatadir)/nls/pr_BR"; \ +- $(mkinstalldirs) $(pkgdatadir)/nls/pt_BR; \ +- $(INSTALL_DATA) blackbox.cat $(pkgdatadir)/nls/pt_BR; \ ++ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/pr_BR"; \ ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \ ++ $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \ + fi + + Translation.m: $(MFILES) diff --git a/x11/blackbox/patches/patch-nls_ru_RU_Makefile.in b/x11/blackbox/patches/patch-nls_ru_RU_Makefile.in new file mode 100644 index 00000000000..22ad7e205f0 --- /dev/null +++ b/x11/blackbox/patches/patch-nls_ru_RU_Makefile.in @@ -0,0 +1,15 @@ +--- nls/ru_RU/Makefile.in.orig Tue Aug 8 11:30:52 2000 ++++ nls/ru_RU/Makefile.in Tue Aug 8 11:31:24 2000 +@@ -184,9 +184,9 @@ + all-local: blackbox.cat + install-data-local: blackbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ +- echo "Installing catalog in $(pkgdatadir)/nls/ru_RU"; \ +- $(mkinstalldirs) $(pkgdatadir)/nls/ru_RU; \ +- $(INSTALL_DATA) blackbox.cat $(pkgdatadir)/nls/ru_RU; \ ++ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/ru_RU"; \ ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \ ++ $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \ + fi + + Translation.m: $(MFILES) diff --git a/x11/blackbox/patches/patch-nls_sv_SE_Makefile.in b/x11/blackbox/patches/patch-nls_sv_SE_Makefile.in new file mode 100644 index 00000000000..d7378439ab7 --- /dev/null +++ b/x11/blackbox/patches/patch-nls_sv_SE_Makefile.in @@ -0,0 +1,15 @@ +--- nls/sv_SE/Makefile.in.orig Tue Aug 8 11:31:42 2000 ++++ nls/sv_SE/Makefile.in Tue Aug 8 11:32:08 2000 +@@ -184,9 +184,9 @@ + all-local: blackbox.cat + install-data-local: blackbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ +- echo "Installing catalog in $(pkgdatadir)/nls/sv_SE"; \ +- $(mkinstalldirs) $(pkgdatadir)/nls/sv_SE; \ +- $(INSTALL_DATA) blackbox.cat $(pkgdatadir)/nls/sv_SE; \ ++ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/sv_SE"; \ ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \ ++ $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \ + fi + + Translation.m: $(MFILES) diff --git a/x11/blackbox/patches/patch-nls_tr_TR_Makefile.in b/x11/blackbox/patches/patch-nls_tr_TR_Makefile.in new file mode 100644 index 00000000000..41b1bc9789b --- /dev/null +++ b/x11/blackbox/patches/patch-nls_tr_TR_Makefile.in @@ -0,0 +1,15 @@ +--- nls/tr_TR/Makefile.in.orig Tue Aug 8 11:32:17 2000 ++++ nls/tr_TR/Makefile.in Tue Aug 8 11:32:36 2000 +@@ -188,9 +188,9 @@ + all-local: blackbox.cat + install-data-local: blackbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ +- echo "Installing catalog in $(pkgdatadir)/nls/tr_TR"; \ +- $(mkinstalldirs) $(pkgdatadir)/nls/tr_TR; \ +- $(INSTALL_DATA) blackbox.cat $(pkgdatadir)/nls/tr_TR; \ ++ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/tr_TR"; \ ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \ ++ $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \ + fi + + Translation.m: $(MFILES) diff --git a/x11/blackbox/pkg/DESCR b/x11/blackbox/pkg/DESCR index e6ef683e871..a81cf68c08b 100644 --- a/x11/blackbox/pkg/DESCR +++ b/x11/blackbox/pkg/DESCR @@ -4,4 +4,6 @@ with C++, sharing no common code with any other window manager (even though the graphics implementation is similar to that of WindowMaker). It features small code size, a fast interface with simple menus, multiple workspaces, and decorated windows , built-in graphics code to render solids, gradients -and bevels on the fly when needed, and more. +and bevels on the fly when needed, and more. + +WWW: ${HOMEPAGE} diff --git a/x11/blackbox/pkg/PLIST b/x11/blackbox/pkg/PLIST index 13934f3bf4f..487d206f0e1 100644 --- a/x11/blackbox/pkg/PLIST +++ b/x11/blackbox/pkg/PLIST @@ -1,26 +1,44 @@ -@comment $OpenBSD: PLIST,v 1.8 2000/06/11 08:42:38 fgsch Exp $ +@comment $OpenBSD: PLIST,v 1.9 2000/08/11 03:45:05 brad Exp $ bin/blackbox bin/bsetroot share/Blackbox/menu -share/Blackbox/styles/blackmagic -share/Blackbox/styles/coldsteel -share/Blackbox/styles/colorpurple -share/Blackbox/styles/darkgreen -share/Blackbox/styles/default -share/Blackbox/styles/gnoid -share/Blackbox/styles/green -share/Blackbox/styles/onoid -share/Blackbox/styles/pnoid -share/Blackbox/styles/previous -share/Blackbox/styles/results -share/Blackbox/styles/slatebox -share/Blackbox/styles/steelblue -share/Blackbox/styles/steelbox -share/Blackbox/styles/stylesmenu +share/Blackbox/nls/POSIX +share/Blackbox/nls/US_ASCII +share/Blackbox/nls/en +share/Blackbox/nls/en_US +share/Blackbox/nls/es +share/Blackbox/nls/C/blackbox.cat +share/Blackbox/nls/es_ES/blackbox.cat +share/Blackbox/nls/pt_BR/blackbox.cat +share/Blackbox/nls/ru_RU/blackbox.cat +share/Blackbox/nls/sv_SE/blackbox.cat +share/Blackbox/nls/tr_TR/blackbox.cat +share/Blackbox/styles/Artwiz +share/Blackbox/styles/Flux +share/Blackbox/styles/Minimal +share/Blackbox/styles/Nyz +share/Blackbox/styles/Operation +share/Blackbox/styles/Outcomes +share/Blackbox/styles/Rampage +share/Blackbox/styles/Rancor +share/Blackbox/styles/Results +share/Blackbox/styles/Shade +share/Blackbox/styles/Spiff +share/Blackbox/styles/TDF +share/Blackbox/styles/Twice share/doc/blackbox/AUTHORS -share/doc/blackbox/COPYING share/doc/blackbox/ChangeLog +share/doc/blackbox/ChangeLog-0.40.x +share/doc/blackbox/ChangeLog-0.50.x +share/doc/blackbox/ChangeLog-0.51.x share/doc/blackbox/README -@dirrm share/doc/blackbox +@dirrm share/Blackbox/nls/C +@dirrm share/Blackbox/nls/es_ES +@dirrm share/Blackbox/nls/pt_BR +@dirrm share/Blackbox/nls/ru_RU +@dirrm share/Blackbox/nls/sv_SE +@dirrm share/Blackbox/nls/tr_TR +@dirrm share/Blackbox/nls @dirrm share/Blackbox/styles @dirrm share/Blackbox +@dirrm share/doc/blackbox