Attachment #30193 for bug #50960

View | Details | Raw Unified | Return to bug 50960
Collapse All | Expand All




#

PORTNAME=	openbox
PORTVERSION=	2.2.3
CATEGORIES=	x11-wm
MASTER_SITES=	http://icculus.org/openbox/releases/

MAINTAINER=	trevor@FreeBSD.org
COMMENT=	Derived from, and similar to, Blackbox

LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft

RUN_DEPENDS=	xsetbg:${PORTSDIR}/x11/xloadimage

MAN1=		openbox.1 osetroot.1 osetbg.1

			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
USE_GMAKE=	yes
USE_REINPLACE=	yes
USE_X_PREFIX=	yes
GNU_CONFIGURE=	yes

.if defined(WITH_XINERAMA)
CONFIGURE_ARGS=	--enable-xinerama
	"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}
.endif

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} ""
	${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
.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>

Line 1 Link Here

(-)openbox/distinfo (-1 / +1 lines)
1	MD5 (openbox-1.2.4.tar.gz) = b41bba4f5a343e9e12ba5873a13328f6	1	MD5 (openbox-2.2.3.tar.gz) = e0d9510d187f3edb76038c87a93afed7




--- 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 *\~ .\#*




--- 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)




--- 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

Lines 1-7 Link Here

(-)openbox/pkg-descr (-5 / +9 lines)
1	Openbox is based on, and similar to, blackbox. In this port/package,	1	Openbox is a window manager for the X11 windowing system. It currently runs
2	bsetbg and bsetroot are renamed to osetbg and osetroot in order to	2	on a large list of platforms. It was originally based on Blackbox and currently
3	avoid conflict with blackbox.	3	remains very similar, even using Blackbox styles (with available extensions)
		4	for its themeing.
4		5
5	Internationalization/localization does not work in this port.	6	-Why does Openbox exist?
		7	Openbox is the spawn of a number of previous Blackbox users/hackers. Being
		8	overall pleased with the window manager, but feeling left unable to contribute,
		9	this project was born. It aims to be open for all to contribute to.
6		10
7	WWW: http://openbox.sunsite.dk/	11	WWW: http://icculus.org/openbox/

Line 0 Link Here

(-)openbox/pkg-message (+2 lines)
	1	In this port/package, bsetbg and bsetroot are renamed to osetbg and osetroot in
	2	order to avoid conflict with blackbox.




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

Return to bug 50960

Lines 7-103 Link Here

(-)openbox/Makefile (-78 / +28 lines)
7	#	7	#
8		8
9	PORTNAME= openbox	9	PORTNAME= openbox
10	PORTVERSION= 1.2.4	10	PORTVERSION= 2.2.3
11	CATEGORIES= x11-wm	11	CATEGORIES= x11-wm
12	MASTER_SITES= ftp://sunsite.dk/projects/openbox/	12	MASTER_SITES= http://icculus.org/openbox/releases/
13		13
14	MAINTAINER= trevor@FreeBSD.org	14	MAINTAINER= trevor@FreeBSD.org
15	COMMENT= Derived from, and similar to, Blackbox	15	COMMENT= Derived from, and similar to, Blackbox
16		16
17	MAN1= openbox.1 osetroot.1 osetbg.1	17	LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft
18
19	RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage	18	RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage
20		19
21	DOCS= AUTHORS BUGS CHANGELOG CHANGELOG.Blackbox CHANGELOG.bsetbg \	20	MAN1= openbox.1 osetroot.1 osetbg.1
22	CodingStyle INSTALL LICENSE README README.bbtools \	21
23	README.bsetbg TODO
24	I10L= C da_DK de_DE es_ES et_EE fr_FR it_IT ja_JP nl_NL pt_BR ru_RU \
25	sl_SI sv_SE tr_TR zh_CN
26	STYLES= artwiz bluebox cthulhain deep flux frobozz frobust nyz \
27	nyzclone operation outcomes shade steelblue steelblue2 \
28	the_orange trisb twice
29	PLIST= ${WRKDIR}/pkg-plist
30	USE_GMAKE= yes	22	USE_GMAKE= yes
		23	USE_REINPLACE= yes
31	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
32	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
33		26
34	do-patch:	27	.if defined(WITH_XINERAMA)
35	${PERL} -pi -e \	28	CONFIGURE_ARGS= --enable-xinerama
36	"s:bsetbg:osetbg:g; s:bsetroot:osetroot:g; s:Bsetroot:Osetroot:g" \
37	${WRKSRC}/data/styles/* ${WRKSRC}/doc/*.1
38
39	pre-install:
40	${RM} -f ${PLIST}
41	.for ii in osetbg osetroot openbox
42	${ECHO_CMD} bin/${ii} >> ${PLIST}
43	.endfor
44	${ECHO_CMD} share/openbox/menu >> ${PLIST}
45	.for ii in ${I10L}
46	${ECHO_CMD} share/openbox/nls/${ii}/openbox.cat >> ${PLIST}
47	${ECHO_CMD} @dirrm share/openbox/nls/${ii} >> ${PLIST}
48	.endfor
49	.for ii in POSIX US_ASCII de en en_US es fr it nl
50	${ECHO_CMD} share/openbox/nls/${ii} >> ${PLIST}
51	.endfor
52	.for ii in ${STYLES}
53	${ECHO_CMD} share/openbox/styles/${ii} >> ${PLIST}
54	.endfor
55	.for ii in /styles /nls /
56	${ECHO_CMD} @dirrm share/openbox${ii} >> ${PLIST}
57	.endfor
58	.if !defined(NOPORTDOCS)
59	.for ii in ${DOCS}
60	${ECHO_CMD} share/doc/openbox/${ii} >> ${PLIST}
61	.endfor
62	${ECHO_CMD} @dirrm share/doc/openbox >> ${PLIST}
63	.endif	29	.endif
64		30
65	do-install:	31	pre-everything:
66	${INSTALL_SCRIPT} ${WRKSRC}/util/bsetbg ${PREFIX}/bin/osetbg	32	.if !defined(WITH_XINERAMA)
67	${INSTALL_PROGRAM} ${WRKSRC}/util/bsetroot ${PREFIX}/bin/osetroot	33	@${ECHO_MSG} ""
68	${INSTALL_PROGRAM} ${WRKSRC}/src/openbox ${PREFIX}/bin/	34	@${ECHO_MSG} "You may specify the following on the command line:"
69	${MKDIR} ${DATADIR}/styles	35	@${ECHO_MSG} ""
70	${INSTALL_DATA} ${WRKSRC}/data/menu ${DATADIR}	36	@${ECHO_MSG} "WITH_XINERAMA=yes for enable support of the Xinerama extension"
71	.for ii in ${I10L}	37	@${ECHO_MSG} ""
72	${MKDIR} ${PREFIX}/share/openbox/nls/${ii}/
73	${INSTALL_DATA} ${WRKSRC}/nls/${ii}/openbox.cat \
74	${PREFIX}/share/openbox/nls/${ii}/
75	.endfor
76	cd ${PREFIX}/share/openbox/nls/ && \
77	${LN} -s C POSIX && \
78	${LN} -s C US_ASCII && \
79	${LN} -s C en && \
80	${LN} -s C en_US && \
81	${LN} -s de_DE de && \
82	${LN} -s es_ES es && \
83	${LN} -s fr_FR fr && \
84	${LN} -s it_IT it && \
85	${LN} -s nl_NL nl
86	.for ii in ${STYLES}
87	${INSTALL_DATA} ${WRKSRC}/data/styles/${ii} \
88	${PREFIX}/share/openbox/styles/
89	.endfor
90	.for ii in setroot setbg
91	${CP} -p ${WRKSRC}/doc/b${ii}.1 ${WRKSRC}/doc/o${ii}.1
92	.endfor
93	.for ii in ${MAN1}
94	${INSTALL_MAN} ${WRKSRC}/doc/${ii} ${PREFIX}/man/man1/
95	.endfor
96	.if !defined(NOPORTDOCS)
97	${MKDIR} ${DOCSDIR}
98	.for ii in ${DOCS}
99	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
100	.endfor
101	.endif	38	.endif
		39
		40	post-extract:
		41	@${MV} ${WRKSRC}/doc/bsetbg.1 ${WRKSRC}/doc/osetbg.1
		42	@${MV} ${WRKSRC}/doc/bsetroot.1 ${WRKSRC}/doc/osetroot.1
		43	@${MV} ${WRKSRC}/util/bsetbg ${WRKSRC}/util/osetbg
		44
		45	post-patch:
		46	@${REINPLACE_CMD} -e 's\|bsetbg\|osetbg\|g ; s\|bsetroot\|osetroot\|g ; \
		47	s\|Bsetroot\|Osetroot\|g' ${WRKSRC}/data/README.style \
		48	${WRKSRC}/data/styles/* ${WRKSRC}/doc/*
		49
		50	post-install:
		51	@${CAT} ${PKGMESSAGE}
102		52
103	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Line 0 Link Here

(-)openbox/files/patch-util::Makefile.am (+30 lines)
	1	--- util/Makefile.am.orig Sat Apr 12 19:03:23 2003
	2	+++ util/Makefile.am Sat Apr 12 19:10:36 2003
	3	@@ -3,7 +3,7 @@
	4	CPPFLAGS= @CPPFLAGS@ @DEBUG@
	5
	6	SUBDIRS = epist
	7	-bin_SCRIPTS = bsetbg
	8	+bin_SCRIPTS = osetbg
	9
	10	if XFT
	11	if XFT2
	12	@@ -15,14 +15,14 @@
	13	endif
	14	endif
	15
	16	-bin_PROGRAMS = bsetroot $(TMP_PROGS)
	17	+bin_PROGRAMS = osetroot $(TMP_PROGS)
	18
	19	-bsetroot_SOURCES = bsetroot.cc
	20	-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
	21	+osetroot_SOURCES = bsetroot.cc
	22	+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
	23
	24	MAINTAINERCLEANFILES = Makefile.in
	25
	26	-EXTRA_DIST = bsetroot.hh bsetbg xftlsfonts.cc
	27	+EXTRA_DIST = bsetroot.hh osetbg xftlsfonts.cc
	28
	29	distclean-local:
	30	rm -f \~ .\#

Line 0 Link Here

(-)openbox/files/patch-util::Makefile.in (+85 lines)
		1	--- util/Makefile.in.orig Sat Apr 12 19:03:34 2003
		2	+++ util/Makefile.in Sat Apr 12 19:10:17 2003
		3	@@ -130,38 +130,38 @@
		4	target_alias = @target_alias@
		5
		6	SUBDIRS = epist
		7	-bin_SCRIPTS = bsetbg
		8	+bin_SCRIPTS = osetbg
		9
		10	@XFT2_FALSE@@XFT_TRUE@TMP_PROGS = xftlsfonts
		11	@XFT2_FALSE@@XFT_TRUE@xftlsfonts_SOURCES = xftlsfonts.cc
		12	@XFT2_FALSE@@XFT_TRUE@xftlsfonts_CPPFLAGS = @CPPFLAGS@ @DEBUG@ @XFT_CFLAGS@
		13	@XFT2_FALSE@@XFT_TRUE@xftlsfonts_LDFLAGS = @XFT_LIBS@
		14
		15	-bin_PROGRAMS = bsetroot $(TMP_PROGS)
		16	+bin_PROGRAMS = osetroot $(TMP_PROGS)
		17
		18	-bsetroot_SOURCES = bsetroot.cc
		19	-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
		20	+osetroot_SOURCES = bsetroot.cc
		21	+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
		22
		23	MAINTAINERCLEANFILES = Makefile.in
		24
		25	-EXTRA_DIST = bsetroot.hh bsetbg xftlsfonts.cc
		26	+EXTRA_DIST = bsetroot.hh osetbg xftlsfonts.cc
		27	subdir = util
		28	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
		29	CONFIG_HEADER = $(top_builddir)/config.h
		30	CONFIG_CLEAN_FILES =
		31	-@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT) \
		32	+@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS = osetroot$(EXEEXT) \
		33	@XFT2_FALSE@@XFT_TRUE@ xftlsfonts$(EXEEXT)
		34	-@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT)
		35	-@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT)
		36	-@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT)
		37	+@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = osetroot$(EXEEXT)
		38	+@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = osetroot$(EXEEXT)
		39	+@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = osetroot$(EXEEXT)
		40	PROGRAMS = $(bin_PROGRAMS)
		41
		42	-am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
		43	-bsetroot_OBJECTS = $(am_bsetroot_OBJECTS)
		44	-bsetroot_DEPENDENCIES = ../src/BaseDisplay.o ../src/Color.o \
		45	+am_osetroot_OBJECTS = bsetroot.$(OBJEXT)
		46	+osetroot_OBJECTS = $(am_osetroot_OBJECTS)
		47	+osetroot_DEPENDENCIES = ../src/BaseDisplay.o ../src/Color.o \
		48	../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o \
		49	../src/ImageControl.o ../src/i18n.o ../src/Util.o
		50	-bsetroot_LDFLAGS =
		51	+osetroot_LDFLAGS =
		52	am__xftlsfonts_SOURCES_DIST = xftlsfonts.cc
		53	@XFT2_FALSE@@XFT_TRUE@am_xftlsfonts_OBJECTS = \
		54	@XFT2_FALSE@@XFT_TRUE@ xftlsfonts-xftlsfonts.$(OBJEXT)
		55	@@ -181,7 +181,7 @@
		56	CXXLD = $(CXX)
		57	CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
		58	-o $@
		59	-DIST_SOURCES = $(bsetroot_SOURCES) $(am__xftlsfonts_SOURCES_DIST)
		60	+DIST_SOURCES = $(osetroot_SOURCES) $(am__xftlsfonts_SOURCES_DIST)
		61
		62	RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
		63	ps-recursive install-info-recursive uninstall-info-recursive \
		64	@@ -190,7 +190,7 @@
65	check-recursive installcheck-recursive
66	DIST_COMMON = Makefile.am Makefile.in
67	DIST_SUBDIRS = $(SUBDIRS)
68	-SOURCES = $(bsetroot_SOURCES) $(xftlsfonts_SOURCES)
69	+SOURCES = $(osetroot_SOURCES) $(xftlsfonts_SOURCES)
70
71	all: all-recursive
72
73	@@ -225,9 +225,9 @@
74
75	clean-binPROGRAMS:
76	-test -z "$(bin_PROGRAMS)" \|\| rm -f $(bin_PROGRAMS)
77	-bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES)
78	- @rm -f bsetroot$(EXEEXT)
79	- $(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS)
80	+osetroot$(EXEEXT): $(osetroot_OBJECTS) $(osetroot_DEPENDENCIES)
81	+ @rm -f osetroot$(EXEEXT)
82	+ $(CXXLINK) $(osetroot_LDFLAGS) $(osetroot_OBJECTS) $(osetroot_LDADD) $(LIBS)
83	xftlsfonts$(EXEEXT): $(xftlsfonts_OBJECTS) $(xftlsfonts_DEPENDENCIES)
84	@rm -f xftlsfonts$(EXEEXT)
85	$(CXXLINK) $(xftlsfonts_LDFLAGS) $(xftlsfonts_OBJECTS) $(xftlsfonts_LDADD) $(LIBS)

Line 0 Link Here

(-)openbox/files/patch-util::osetbg (+68 lines)
		1	--- util/osetbg.orig Sat Apr 12 19:03:10 2003
		2	+++ util/osetbg Sat Apr 12 19:04:57 2003
		3	@@ -204,20 +204,20 @@
		4	quit 0
		5	}
		6
		7	-do_bsetroot()
		8	+do_osetroot()
		9	{
		10	- if check_exe_in_path bsetroot; then
		11	+ if check_exe_in_path osetroot; then
		12	read_config
		13
		14	- $debug bsetroot $* 2>/dev/null; rc=$?
		15	+ $debug osetroot $* 2>/dev/null; rc=$?
		16
		17	if [ "$rc" -gt 0 ]; then
		18	help_msg $rc
		19	else
		20	- log_cmd bsetroot $*; $refresh_cmd 2>/dev/null
		21	+ log_cmd osetroot $*; $refresh_cmd 2>/dev/null
		22	fi
		23	else
		24	- quit 1 "couldn't find bsetroot in $PATH"
		25	+ quit 1 "couldn't find osetroot in $PATH"
		26	fi
		27	}
		28
		29	@@ -429,7 +429,7 @@
		30	add_post_arg ${1}
		31	elif [ "$command" = do_exec ]; then
		32	do_exec=1
		33	- elif [ "$command" != do_bsetroot ]; then
		34	+ elif [ "$command" != do_osetroot ]; then
		35	finished=1
		36	fi
		37	}
		38	@@ -445,7 +445,7 @@
		39
		40	-c\|-center\|c\|-t\|-tile\|t\|-f\|-full\|f)
		41	case $command in
		42	- do_standard\|do_generate\|do_bsetroot)
		43	+ do_standard\|do_generate\|do_osetroot)
		44	finished=1 ;;
		45	do_exec)
		46	if ! bool $got_fcmd; then
		47	@@ -461,7 +461,7 @@
		48	command=do_exec; check_cmd ;;
		49
		50	-mod\|-gradient\|-solid\|-display)
		51	- check_cmd "do_bsetroot" && add_arg $1 ;;
		52	+ check_cmd "do_osetroot" && add_arg $1 ;;
		53
		54	-g\|-generate\|g)
		55	check_cmd $1 "do_generate" ;;
		56	@@ -476,10 +476,10 @@
		57	bool $finished && return 1
		58
		59	case $1 in -*)
		60	- bool $do_exec \|\| bool $do_bsetroot \|\| bool $do_post \|\| help_msg 1
		61	+ bool $do_exec \|\| bool $do_osetroot \|\| bool $do_post \|\| help_msg 1
		62	esac
		63
		64	- if bool $do_standard \|\| bool $do_exec \|\| bool $do_bsetroot \|\| bool $do_generate; then
65	+ if bool $do_standard \|\| bool $do_exec \|\| bool $do_osetroot \|\| bool $do_generate; then
66	add_arg $1
67	elif bool $do_post; then
68	add_post_arg $1

Line 0 Link Here

(-)openbox/pkg-plist (+108 lines)
		1	bin/epist
		2	bin/openbox
		3	bin/osetbg
		4	bin/osetroot
		5	share/openbox/buttons/close.xbm
		6	share/openbox/buttons/fieron-bullet.xbm
		7	share/openbox/buttons/fieron-bulletl.xbm
		8	share/openbox/buttons/fieron-close.xbm
		9	share/openbox/buttons/fieron-icon.xbm
		10	share/openbox/buttons/fieron-max.xbm
		11	share/openbox/buttons/fieron-stick.xbm
		12	share/openbox/buttons/icon.xbm
		13	share/openbox/buttons/max.xbm
		14	share/openbox/buttons/stick.xbm
		15	share/openbox/epistrc
		16	share/openbox/menu
		17	share/openbox/nls/C/openbox.cat
		18	share/openbox/nls/da_DK/openbox.cat
		19	share/openbox/nls/de
		20	share/openbox/nls/de_DE/openbox.cat
		21	share/openbox/nls/en
		22	share/openbox/nls/es
		23	share/openbox/nls/es_AR/openbox.cat
		24	share/openbox/nls/es_ES/openbox.cat
		25	share/openbox/nls/et_ET/openbox.cat
		26	share/openbox/nls/fr
		27	share/openbox/nls/fr_FR/openbox.cat
		28	share/openbox/nls/hu_HU/openbox.cat
		29	share/openbox/nls/it
		30	share/openbox/nls/it_IT/openbox.cat
		31	share/openbox/nls/ja_JP/openbox.cat
		32	share/openbox/nls/ko
		33	share/openbox/nls/ko_KO/openbox.cat
		34	share/openbox/nls/nl
		35	share/openbox/nls/nl_NL/openbox.cat
		36	share/openbox/nls/no
		37	share/openbox/nls/no_NO/openbox.cat
		38	share/openbox/nls/pl
		39	share/openbox/nls/pl_PL/openbox.cat
		40	share/openbox/nls/pt
		41	share/openbox/nls/pt_BR/openbox.cat
		42	share/openbox/nls/ro
		43	share/openbox/nls/ro_RO/openbox.cat
		44	share/openbox/nls/ru_RU/openbox.cat
		45	share/openbox/nls/sl_SI/openbox.cat
		46	share/openbox/nls/sv_SE/openbox.cat
		47	share/openbox/nls/tr_TR/openbox.cat
		48	share/openbox/nls/uk_UA/openbox.cat
		49	share/openbox/nls/zh_CN/openbox.cat
		50	share/openbox/nls/zh_TW/openbox.cat
		51	share/openbox/styles/artwiz
		52	share/openbox/styles/bbs
		53	share/openbox/styles/bluebox
		54	share/openbox/styles/cthulhain
		55	share/openbox/styles/deep
		56	share/openbox/styles/fieron
		57	share/openbox/styles/fieron2
		58	share/openbox/styles/flux
		59	share/openbox/styles/frobozz
		60	share/openbox/styles/frobust
		61	share/openbox/styles/mbdtex
		62	share/openbox/styles/miklos
		63	share/openbox/styles/nyz
		64	share/openbox/styles/nyzclone
65	share/openbox/styles/ob20
66	share/openbox/styles/operation
67	share/openbox/styles/outcomes
68	share/openbox/styles/paper
69	share/openbox/styles/purplehaaze
70	share/openbox/styles/shade
71	share/openbox/styles/steelblue
72	share/openbox/styles/steelblue2
73	share/openbox/styles/steelblue3
74	share/openbox/styles/the_orange
75	share/openbox/styles/trisb
76	share/openbox/styles/twice
77	share/openbox/styles/warp-xp
78	@dirrm share/openbox/styles
79	@dirrm share/openbox/nls/zh_TW
80	@dirrm share/openbox/nls/zh_CN
81	@dirrm share/openbox/nls/uk_UA
82	@dirrm share/openbox/nls/tr_TR
83	@dirrm share/openbox/nls/sv_SE
84	@dirrm share/openbox/nls/sl_SI
85	@dirrm share/openbox/nls/ru_RU
86	@dirrm share/openbox/nls/ro_RO
87	@dirrm share/openbox/nls/pt_BR
88	@dirrm share/openbox/nls/pl_PL
89	@dirrm share/openbox/nls/no_NO
90	@dirrm share/openbox/nls/nl_NL
91	@dirrm share/openbox/nls/ko_KO
92	@dirrm share/openbox/nls/ja_JP
93	@dirrm share/openbox/nls/it_IT
94	@dirrm share/openbox/nls/hu_HU
95	@dirrm share/openbox/nls/fr_FR
96	@dirrm share/openbox/nls/et_ET
97	@dirrm share/openbox/nls/es_ES
98	@dirrm share/openbox/nls/es_AR
99	@dirrm share/openbox/nls/en_US
100	@dirrm share/openbox/nls/en_GB
101	@dirrm share/openbox/nls/de_DE
102	@dirrm share/openbox/nls/da_DK
103	@dirrm share/openbox/nls/US_ASCII
104	@dirrm share/openbox/nls/POSIX
105	@dirrm share/openbox/nls/C
106	@dirrm share/openbox/nls
107	@dirrm share/openbox/buttons
108	@dirrm share/openbox