Update to 2.2.3

Drive-by commit (MAINTAINER timeout)

PR:		50960
Submitted by:	Stijn Hoop <stijn@win.tue.nl>
This commit is contained in:
Ade Lovett 2003-05-21 15:48:48 +00:00
parent ad6456c4be
commit 8598982508
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=81628
8 changed files with 331 additions and 84 deletions

View file

@ -7,97 +7,47 @@
#
PORTNAME= openbox
PORTVERSION= 1.2.4
PORTVERSION= 2.2.3
CATEGORIES= x11-wm
MASTER_SITES= ftp://sunsite.dk/projects/openbox/
MASTER_SITES= http://icculus.org/openbox/releases/
MAINTAINER= trevor@FreeBSD.org
COMMENT= Derived from, and similar to, Blackbox
MAN1= openbox.1 osetroot.1 osetbg.1
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft
RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage
DOCS= AUTHORS BUGS CHANGELOG CHANGELOG.Blackbox CHANGELOG.bsetbg \
CodingStyle INSTALL LICENSE README README.bbtools \
README.bsetbg TODO
I10L= C da_DK de_DE es_ES et_EE fr_FR it_IT ja_JP nl_NL pt_BR ru_RU \
sl_SI sv_SE tr_TR zh_CN
STYLES= artwiz bluebox cthulhain deep flux frobozz frobust nyz \
nyzclone operation outcomes shade steelblue steelblue2 \
the_orange trisb twice
PLIST= ${WRKDIR}/pkg-plist
MAN1= openbox.1 osetroot.1 osetbg.1
USE_GMAKE= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
do-patch:
${PERL} -pi -e \
"s:bsetbg:osetbg:g; s:bsetroot:osetroot:g; s:Bsetroot:Osetroot:g" \
${WRKSRC}/data/styles/* ${WRKSRC}/doc/*.1
pre-install:
${RM} -f ${PLIST}
.for ii in osetbg osetroot openbox
${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
${ECHO_CMD} share/openbox/menu >> ${PLIST}
.for ii in ${I10L}
${ECHO_CMD} share/openbox/nls/${ii}/openbox.cat >> ${PLIST}
${ECHO_CMD} @dirrm share/openbox/nls/${ii} >> ${PLIST}
.endfor
.for ii in POSIX US_ASCII de en en_US es fr it nl
${ECHO_CMD} share/openbox/nls/${ii} >> ${PLIST}
.endfor
.for ii in ${STYLES}
${ECHO_CMD} share/openbox/styles/${ii} >> ${PLIST}
.endfor
.for ii in /styles /nls /
${ECHO_CMD} @dirrm share/openbox${ii} >> ${PLIST}
.endfor
.if !defined(NOPORTDOCS)
.for ii in ${DOCS}
${ECHO_CMD} share/doc/openbox/${ii} >> ${PLIST}
.endfor
${ECHO_CMD} @dirrm share/doc/openbox >> ${PLIST}
.if defined(WITH_XINERAMA)
CONFIGURE_ARGS= --enable-xinerama
.endif
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/util/bsetbg ${PREFIX}/bin/osetbg
${INSTALL_PROGRAM} ${WRKSRC}/util/bsetroot ${PREFIX}/bin/osetroot
${INSTALL_PROGRAM} ${WRKSRC}/src/openbox ${PREFIX}/bin/
${MKDIR} ${DATADIR}/styles
${INSTALL_DATA} ${WRKSRC}/data/menu ${DATADIR}
.for ii in ${I10L}
${MKDIR} ${PREFIX}/share/openbox/nls/${ii}/
${INSTALL_DATA} ${WRKSRC}/nls/${ii}/openbox.cat \
${PREFIX}/share/openbox/nls/${ii}/
.endfor
cd ${PREFIX}/share/openbox/nls/ && \
${LN} -s C POSIX && \
${LN} -s C US_ASCII && \
${LN} -s C en && \
${LN} -s C en_US && \
${LN} -s de_DE de && \
${LN} -s es_ES es && \
${LN} -s fr_FR fr && \
${LN} -s it_IT it && \
${LN} -s nl_NL nl
.for ii in ${STYLES}
${INSTALL_DATA} ${WRKSRC}/data/styles/${ii} \
${PREFIX}/share/openbox/styles/
.endfor
.for ii in setroot setbg
${CP} -p ${WRKSRC}/doc/b${ii}.1 ${WRKSRC}/doc/o${ii}.1
.endfor
.for ii in ${MAN1}
${INSTALL_MAN} ${WRKSRC}/doc/${ii} ${PREFIX}/man/man1/
.endfor
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for ii in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
.endfor
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:
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (openbox-1.2.4.tar.gz) = b41bba4f5a343e9e12ba5873a13328f6
MD5 (openbox-2.2.3.tar.gz) = e0d9510d187f3edb76038c87a93afed7

View file

@ -0,0 +1,30 @@
--- 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 *\~ .\#*

View file

@ -0,0 +1,85 @@
--- 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)

View file

@ -0,0 +1,68 @@
--- 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

View file

@ -1,7 +1,11 @@
Openbox is based on, and similar to, blackbox. In this port/package,
bsetbg and bsetroot are renamed to osetbg and osetroot in order to
avoid conflict with blackbox.
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.
Internationalization/localization does not work in this port.
-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.
WWW: http://openbox.sunsite.dk/
WWW: http://icculus.org/openbox/

View file

@ -0,0 +1,2 @@
In this port/package, bsetbg and bsetroot are renamed to osetbg and osetroot in
order to avoid conflict with blackbox.

108
x11-wm/openbox/pkg-plist Normal file
View file

@ -0,0 +1,108 @@
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