From a11a549da5feb6b64343dcdc871fafe12324c406 Mon Sep 17 00:00:00 2001 From: Trevor Johnson Date: Mon, 8 Sep 2003 00:45:18 +0000 Subject: [PATCH] Update to 3.0-beta1. --- x11-wm/openbox/Makefile | 86 +++++++++------ x11-wm/openbox/distinfo | 3 +- x11-wm/openbox/files/patch-util::Makefile.am | 30 ------ x11-wm/openbox/files/patch-util::Makefile.in | 85 --------------- x11-wm/openbox/files/patch-util::osetbg | 68 ------------ x11-wm/openbox/pkg-descr | 10 +- x11-wm/openbox/pkg-message | 2 - x11-wm/openbox/pkg-plist | 108 ------------------- 8 files changed, 59 insertions(+), 333 deletions(-) delete mode 100644 x11-wm/openbox/files/patch-util::Makefile.am delete mode 100644 x11-wm/openbox/files/patch-util::Makefile.in delete mode 100644 x11-wm/openbox/files/patch-util::osetbg delete mode 100644 x11-wm/openbox/pkg-message delete mode 100644 x11-wm/openbox/pkg-plist diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile index 8c52c8385752..3dff2b732fc4 100644 --- a/x11-wm/openbox/Makefile +++ b/x11-wm/openbox/Makefile @@ -7,49 +7,75 @@ # PORTNAME= openbox -PORTVERSION= 2.2.3 +PORTVERSION= 0.3.0.1 CATEGORIES= x11-wm MASTER_SITES= http://icculus.org/openbox/releases/ +DISTNAME= openbox-3.0-beta1 MAINTAINER= trevor@FreeBSD.org COMMENT= Derived from, and similar to, Blackbox -FORBIDDEN= "source code for this version has not been reviewed" - LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft -RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage - -MAN1= openbox.1 osetroot.1 osetbg.1 +DOCS= ABOUT-NLS AUTHORS COPYING ChangeLog README TODO +THEMES= allegro artwiz blah41 om4ob thebear +PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes -USE_REINPLACE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes +#USE_AUTOMAKE= yes -.if defined(WITH_XINERAMA) -CONFIGURE_ARGS= --enable-xinerama -.endif +do-patch: + ${CP} -P ${WRKSRC}/data/rc.xml ${WRKSRC}/data/rc.xml.orig + ${CP} -P ${WRKSRC}/data/menu.xml ${WRKSRC}/data/openbox-menu.xml + ${SED} -E "s:/etc/X11/openbox/:${PREFIX}/share/openbox/:g" \ + < ${WRKSRC}/data/rc.xml.orig > ${WRKSRC}/data/rc.xml + ${RM} ${WRKSRC}/data/rc.xml.orig -pre-everything: -.if !defined(WITH_XINERAMA) - @${ECHO_MSG} "" - @${ECHO_MSG} "You may specify the following on the command line:" - @${ECHO_MSG} "" - @${ECHO_MSG} "WITH_XINERAMA=yes for enable support of the Xinerama extension" - @${ECHO_MSG} "" -.endif - -post-extract: - @${MV} ${WRKSRC}/doc/bsetbg.1 ${WRKSRC}/doc/osetbg.1 - @${MV} ${WRKSRC}/doc/bsetroot.1 ${WRKSRC}/doc/osetroot.1 - @${MV} ${WRKSRC}/util/bsetbg ${WRKSRC}/util/osetbg - -post-patch: - @${REINPLACE_CMD} -e 's|bsetbg|osetbg|g ; s|bsetroot|osetroot|g ; \ - s|Bsetroot|Osetroot|g' ${WRKSRC}/data/README.style \ - ${WRKSRC}/data/styles/* ${WRKSRC}/doc/* - -post-install: +pre-configure: + ${MKDIR} ${WRKDIR} + ${ECHO_CMD} \ + "Warning: source code for this version has not been reviewed!" \ + > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD}  + @${ECHO_CMD} Waiting ten seconds--press control-C to cancel build. + @sleep 10 + +pre-install: + ${RM} -f ${PLIST} +.for ii in openbox kdetrayproxy obconf + ${ECHO_CMD} bin/${ii} >> ${PLIST} +.endfor + cd ${WRKSRC} && ${FIND} -s data themes -type f \ + | ${SED} -e 's:^:share/openbox/:' >> ${PLIST} \ + && ${FIND} data themes -type d | sort -r \ + | ${SED} -e 's:^:@dirrm share/openbox/:' >> ${PLIST} + cd ${WRKSRC}/data && ${FIND} -s * -type f \ + | ${SED} -e 's:^:share/openbox/:' >> ${PLIST} +.if !defined(NOPORTDOCS) +.for ii in ${DOCS} + ${ECHO_CMD} share/doc/openbox/${ii} >> ${PLIST} +.endfor + ${ECHO_CMD} @dirrm share/doc/openbox >> ${PLIST} +.endif + +do-install: + ${MKDIR} ${PREFIX}/share/openbox +.for ii in openbox/.libs/openbox tools/kdetrayproxy/kdetrayproxy \ + tools/obconf/.libs/obconf + ${INSTALL_PROGRAM} ${WRKSRC}/${ii} ${PREFIX}/bin +.endfor + ${INSTALL_SCRIPT} ${WRKSRC}/tools/themeupdate/themeupdate.py \ + ${PREFIX}/bin + cd ${WRKSRC} && pax -r -w data themes ${PREFIX}/share/openbox/ + cd ${WRKSRC} && ${INSTALL_DATA} data/* ${PREFIX}/share/openbox/ +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for ii in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR} +.endfor +.endif .include diff --git a/x11-wm/openbox/distinfo b/x11-wm/openbox/distinfo index e9f9f17743ed..2ed28947c73d 100644 --- a/x11-wm/openbox/distinfo +++ b/x11-wm/openbox/distinfo @@ -1 +1,2 @@ -MD5 (openbox-2.2.3.tar.gz) = e0d9510d187f3edb76038c87a93afed7 +$FreeBSD$ +MD5 (openbox-3.0-beta1.tar.gz) = 35e9cd19505069764f7cebc1a1ed6fc6 diff --git a/x11-wm/openbox/files/patch-util::Makefile.am b/x11-wm/openbox/files/patch-util::Makefile.am deleted file mode 100644 index fd43aceb5632..000000000000 --- a/x11-wm/openbox/files/patch-util::Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ ---- util/Makefile.am.orig Sat Apr 12 19:03:23 2003 -+++ util/Makefile.am Sat Apr 12 19:10:36 2003 -@@ -3,7 +3,7 @@ - CPPFLAGS= @CPPFLAGS@ @DEBUG@ - - SUBDIRS = epist --bin_SCRIPTS = bsetbg -+bin_SCRIPTS = osetbg - - if XFT - if XFT2 -@@ -15,14 +15,14 @@ - endif - endif - --bin_PROGRAMS = bsetroot $(TMP_PROGS) -+bin_PROGRAMS = osetroot $(TMP_PROGS) - --bsetroot_SOURCES = bsetroot.cc --bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o -+osetroot_SOURCES = bsetroot.cc -+osetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o - - MAINTAINERCLEANFILES = Makefile.in - --EXTRA_DIST = bsetroot.hh bsetbg xftlsfonts.cc -+EXTRA_DIST = bsetroot.hh osetbg xftlsfonts.cc - - distclean-local: - rm -f *\~ .\#* diff --git a/x11-wm/openbox/files/patch-util::Makefile.in b/x11-wm/openbox/files/patch-util::Makefile.in deleted file mode 100644 index 476b70e3f0e0..000000000000 --- a/x11-wm/openbox/files/patch-util::Makefile.in +++ /dev/null @@ -1,85 +0,0 @@ ---- util/Makefile.in.orig Sat Apr 12 19:03:34 2003 -+++ util/Makefile.in Sat Apr 12 19:10:17 2003 -@@ -130,38 +130,38 @@ - target_alias = @target_alias@ - - SUBDIRS = epist --bin_SCRIPTS = bsetbg -+bin_SCRIPTS = osetbg - - @XFT2_FALSE@@XFT_TRUE@TMP_PROGS = xftlsfonts - @XFT2_FALSE@@XFT_TRUE@xftlsfonts_SOURCES = xftlsfonts.cc - @XFT2_FALSE@@XFT_TRUE@xftlsfonts_CPPFLAGS = @CPPFLAGS@ @DEBUG@ @XFT_CFLAGS@ - @XFT2_FALSE@@XFT_TRUE@xftlsfonts_LDFLAGS = @XFT_LIBS@ - --bin_PROGRAMS = bsetroot $(TMP_PROGS) -+bin_PROGRAMS = osetroot $(TMP_PROGS) - --bsetroot_SOURCES = bsetroot.cc --bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o -+osetroot_SOURCES = bsetroot.cc -+osetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o - - MAINTAINERCLEANFILES = Makefile.in - --EXTRA_DIST = bsetroot.hh bsetbg xftlsfonts.cc -+EXTRA_DIST = bsetroot.hh osetbg xftlsfonts.cc - subdir = util - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = --@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT) \ -+@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS = osetroot$(EXEEXT) \ - @XFT2_FALSE@@XFT_TRUE@ xftlsfonts$(EXEEXT) --@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT) --@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT) --@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT) -+@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = osetroot$(EXEEXT) -+@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = osetroot$(EXEEXT) -+@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = osetroot$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_bsetroot_OBJECTS = bsetroot.$(OBJEXT) --bsetroot_OBJECTS = $(am_bsetroot_OBJECTS) --bsetroot_DEPENDENCIES = ../src/BaseDisplay.o ../src/Color.o \ -+am_osetroot_OBJECTS = bsetroot.$(OBJEXT) -+osetroot_OBJECTS = $(am_osetroot_OBJECTS) -+osetroot_DEPENDENCIES = ../src/BaseDisplay.o ../src/Color.o \ - ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o \ - ../src/ImageControl.o ../src/i18n.o ../src/Util.o --bsetroot_LDFLAGS = -+osetroot_LDFLAGS = - am__xftlsfonts_SOURCES_DIST = xftlsfonts.cc - @XFT2_FALSE@@XFT_TRUE@am_xftlsfonts_OBJECTS = \ - @XFT2_FALSE@@XFT_TRUE@ xftlsfonts-xftlsfonts.$(OBJEXT) -@@ -181,7 +181,7 @@ - CXXLD = $(CXX) - CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ --DIST_SOURCES = $(bsetroot_SOURCES) $(am__xftlsfonts_SOURCES_DIST) -+DIST_SOURCES = $(osetroot_SOURCES) $(am__xftlsfonts_SOURCES_DIST) - - RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ -@@ -190,7 +190,7 @@ - check-recursive installcheck-recursive - DIST_COMMON = Makefile.am Makefile.in - DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(bsetroot_SOURCES) $(xftlsfonts_SOURCES) -+SOURCES = $(osetroot_SOURCES) $(xftlsfonts_SOURCES) - - all: all-recursive - -@@ -225,9 +225,9 @@ - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) --bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES) -- @rm -f bsetroot$(EXEEXT) -- $(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS) -+osetroot$(EXEEXT): $(osetroot_OBJECTS) $(osetroot_DEPENDENCIES) -+ @rm -f osetroot$(EXEEXT) -+ $(CXXLINK) $(osetroot_LDFLAGS) $(osetroot_OBJECTS) $(osetroot_LDADD) $(LIBS) - xftlsfonts$(EXEEXT): $(xftlsfonts_OBJECTS) $(xftlsfonts_DEPENDENCIES) - @rm -f xftlsfonts$(EXEEXT) - $(CXXLINK) $(xftlsfonts_LDFLAGS) $(xftlsfonts_OBJECTS) $(xftlsfonts_LDADD) $(LIBS) diff --git a/x11-wm/openbox/files/patch-util::osetbg b/x11-wm/openbox/files/patch-util::osetbg deleted file mode 100644 index 603b6024ac63..000000000000 --- a/x11-wm/openbox/files/patch-util::osetbg +++ /dev/null @@ -1,68 +0,0 @@ ---- util/osetbg.orig Sat Apr 12 19:03:10 2003 -+++ util/osetbg Sat Apr 12 19:04:57 2003 -@@ -204,20 +204,20 @@ - quit 0 - } - --do_bsetroot() -+do_osetroot() - { -- if check_exe_in_path bsetroot; then -+ if check_exe_in_path osetroot; then - read_config - -- $debug bsetroot $* 2>/dev/null; rc=$? -+ $debug osetroot $* 2>/dev/null; rc=$? - - if [ "$rc" -gt 0 ]; then - help_msg $rc - else -- log_cmd bsetroot $*; $refresh_cmd 2>/dev/null -+ log_cmd osetroot $*; $refresh_cmd 2>/dev/null - fi - else -- quit 1 "couldn't find bsetroot in $PATH" -+ quit 1 "couldn't find osetroot in $PATH" - fi - } - -@@ -429,7 +429,7 @@ - add_post_arg ${1} - elif [ "$command" = do_exec ]; then - do_exec=1 -- elif [ "$command" != do_bsetroot ]; then -+ elif [ "$command" != do_osetroot ]; then - finished=1 - fi - } -@@ -445,7 +445,7 @@ - - -c|*-center|c|-t|*-tile*|t|-f|*-full|f) - case $command in -- do_standard|do_generate|do_bsetroot) -+ do_standard|do_generate|do_osetroot) - finished=1 ;; - do_exec) - if ! bool $got_fcmd; then -@@ -461,7 +461,7 @@ - command=do_exec; check_cmd ;; - - -mod|-gradient|-solid|-display) -- check_cmd "do_bsetroot" && add_arg $1 ;; -+ check_cmd "do_osetroot" && add_arg $1 ;; - - -g|*-generate*|g) - check_cmd $1 "do_generate" ;; -@@ -476,10 +476,10 @@ - bool $finished && return 1 - - case $1 in -*) -- bool $do_exec || bool $do_bsetroot || bool $do_post || help_msg 1 -+ bool $do_exec || bool $do_osetroot || bool $do_post || help_msg 1 - esac - -- if bool $do_standard || bool $do_exec || bool $do_bsetroot || bool $do_generate; then -+ if bool $do_standard || bool $do_exec || bool $do_osetroot || bool $do_generate; then - add_arg $1 - elif bool $do_post; then - add_post_arg $1 diff --git a/x11-wm/openbox/pkg-descr b/x11-wm/openbox/pkg-descr index 52e7819d1a0c..00f8b2e8888c 100644 --- a/x11-wm/openbox/pkg-descr +++ b/x11-wm/openbox/pkg-descr @@ -1,11 +1,3 @@ -Openbox is a window manager for the X11 windowing system. It currently runs -on a large list of platforms. It was originally based on Blackbox and currently -remains very similar, even using Blackbox styles (with available extensions) -for its themeing. - --Why does Openbox exist? -Openbox is the spawn of a number of previous Blackbox users/hackers. Being -overall pleased with the window manager, but feeling left unable to contribute, -this project was born. It aims to be open for all to contribute to. +Openbox is based on, and similar to, blackbox. WWW: http://icculus.org/openbox/ diff --git a/x11-wm/openbox/pkg-message b/x11-wm/openbox/pkg-message deleted file mode 100644 index 7d1f8a03b969..000000000000 --- a/x11-wm/openbox/pkg-message +++ /dev/null @@ -1,2 +0,0 @@ -In this port/package, bsetbg and bsetroot are renamed to osetbg and osetroot in -order to avoid conflict with blackbox. diff --git a/x11-wm/openbox/pkg-plist b/x11-wm/openbox/pkg-plist deleted file mode 100644 index cdb5d707e7e9..000000000000 --- a/x11-wm/openbox/pkg-plist +++ /dev/null @@ -1,108 +0,0 @@ -bin/epist -bin/openbox -bin/osetbg -bin/osetroot -share/openbox/buttons/close.xbm -share/openbox/buttons/fieron-bullet.xbm -share/openbox/buttons/fieron-bulletl.xbm -share/openbox/buttons/fieron-close.xbm -share/openbox/buttons/fieron-icon.xbm -share/openbox/buttons/fieron-max.xbm -share/openbox/buttons/fieron-stick.xbm -share/openbox/buttons/icon.xbm -share/openbox/buttons/max.xbm -share/openbox/buttons/stick.xbm -share/openbox/epistrc -share/openbox/menu -share/openbox/nls/C/openbox.cat -share/openbox/nls/da_DK/openbox.cat -share/openbox/nls/de -share/openbox/nls/de_DE/openbox.cat -share/openbox/nls/en -share/openbox/nls/es -share/openbox/nls/es_AR/openbox.cat -share/openbox/nls/es_ES/openbox.cat -share/openbox/nls/et_ET/openbox.cat -share/openbox/nls/fr -share/openbox/nls/fr_FR/openbox.cat -share/openbox/nls/hu_HU/openbox.cat -share/openbox/nls/it -share/openbox/nls/it_IT/openbox.cat -share/openbox/nls/ja_JP/openbox.cat -share/openbox/nls/ko -share/openbox/nls/ko_KO/openbox.cat -share/openbox/nls/nl -share/openbox/nls/nl_NL/openbox.cat -share/openbox/nls/no -share/openbox/nls/no_NO/openbox.cat -share/openbox/nls/pl -share/openbox/nls/pl_PL/openbox.cat -share/openbox/nls/pt -share/openbox/nls/pt_BR/openbox.cat -share/openbox/nls/ro -share/openbox/nls/ro_RO/openbox.cat -share/openbox/nls/ru_RU/openbox.cat -share/openbox/nls/sl_SI/openbox.cat -share/openbox/nls/sv_SE/openbox.cat -share/openbox/nls/tr_TR/openbox.cat -share/openbox/nls/uk_UA/openbox.cat -share/openbox/nls/zh_CN/openbox.cat -share/openbox/nls/zh_TW/openbox.cat -share/openbox/styles/artwiz -share/openbox/styles/bbs -share/openbox/styles/bluebox -share/openbox/styles/cthulhain -share/openbox/styles/deep -share/openbox/styles/fieron -share/openbox/styles/fieron2 -share/openbox/styles/flux -share/openbox/styles/frobozz -share/openbox/styles/frobust -share/openbox/styles/mbdtex -share/openbox/styles/miklos -share/openbox/styles/nyz -share/openbox/styles/nyzclone -share/openbox/styles/ob20 -share/openbox/styles/operation -share/openbox/styles/outcomes -share/openbox/styles/paper -share/openbox/styles/purplehaaze -share/openbox/styles/shade -share/openbox/styles/steelblue -share/openbox/styles/steelblue2 -share/openbox/styles/steelblue3 -share/openbox/styles/the_orange -share/openbox/styles/trisb -share/openbox/styles/twice -share/openbox/styles/warp-xp -@dirrm share/openbox/styles -@dirrm share/openbox/nls/zh_TW -@dirrm share/openbox/nls/zh_CN -@dirrm share/openbox/nls/uk_UA -@dirrm share/openbox/nls/tr_TR -@dirrm share/openbox/nls/sv_SE -@dirrm share/openbox/nls/sl_SI -@dirrm share/openbox/nls/ru_RU -@dirrm share/openbox/nls/ro_RO -@dirrm share/openbox/nls/pt_BR -@dirrm share/openbox/nls/pl_PL -@dirrm share/openbox/nls/no_NO -@dirrm share/openbox/nls/nl_NL -@dirrm share/openbox/nls/ko_KO -@dirrm share/openbox/nls/ja_JP -@dirrm share/openbox/nls/it_IT -@dirrm share/openbox/nls/hu_HU -@dirrm share/openbox/nls/fr_FR -@dirrm share/openbox/nls/et_ET -@dirrm share/openbox/nls/es_ES -@dirrm share/openbox/nls/es_AR -@dirrm share/openbox/nls/en_US -@dirrm share/openbox/nls/en_GB -@dirrm share/openbox/nls/de_DE -@dirrm share/openbox/nls/da_DK -@dirrm share/openbox/nls/US_ASCII -@dirrm share/openbox/nls/POSIX -@dirrm share/openbox/nls/C -@dirrm share/openbox/nls -@dirrm share/openbox/buttons -@dirrm share/openbox