Date: Mon, 02 Sep 2002 19:06:46 -0500 From: Andrew Hesford <jester@core.usrlib.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/42347: Patch to bring x11-wm/openbox port up to sync with openbox 2.0.0 Message-ID: <E17m1DS-0005Ri-00@core.usrlib.org>
next in thread | raw e-mail | index | archive | help
>Number: 42347 >Category: ports >Synopsis: Patch to bring x11-wm/openbox port up to sync with openbox 2.0.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 02 17:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Andrew Hesford >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD core.usrlib.org 4.6-STABLE FreeBSD 4.6-STABLE #19: Tue Aug 20 18:06:21 CDT 2002 root@core.usrlib.org:/usr/obj/usr/src/sys/CORE i386 /usr/ports updated 2002-09-02 >Description: The x11-wm/openbox port was updated to build openbox 1.2.4 when the openbox author classified 1.2.4 as a "testing" build. Recently, openbox 1.2.4 was moved into the "stable" tree, and 2.0.0 was classified as "testing". To keep the port in sync with the "testing" branch (which has a lot of new features, most notably Xft and Xinerama support), I have enclosed a patch. >How-To-Repeat: N/A >Fix: Apply the following patch by saving the text in a file called openbox.patch, change working directory to /usr/ports/x11-wm, and issue the command patch -p < /path/to/openbox.patch ====== BEGIN PATCH ====== diff -U 3 openbox-stable/Makefile openbox/Makefile --- openbox-stable/Makefile Tue Jul 16 11:52:45 2002 +++ openbox/Makefile Sun Aug 25 18:13:15 2002 @@ -7,28 +7,37 @@ # PORTNAME= openbox -PORTVERSION= 1.2.4 +PORTVERSION= 2.0.0 CATEGORIES= x11-wm MASTER_SITES= ftp://sunsite.dk/projects/openbox/ MAINTAINER= trevor@FreeBSD.org -MAN1= openbox.1 osetroot.1 osetbg.1 +MAN1= openbox.1 osetroot.1 osetbg.1 epist.1 xftlsfonts.1 +MAN5= epistrc.5 RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage -DOCS= AUTHORS BUGS CHANGELOG CHANGELOG.Blackbox CHANGELOG.bsetbg \ - CodingStyle INSTALL LICENSE README README.bbtools \ +DOCS= AUTHORS CHANGELOG CHANGELOG.Blackbox CHANGELOG.bsetbg \ + 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 +I10L= C da_DK de_DE es_AR es_ES et_EE fr_FR hu_HU it_IT ja_JP ko_KR \ + nl_NL no_NO pt_BR ro_RO ru_RU sl_SI sv_SE tr_TR uk_UA \ + zh_CN zh_TW +STYLES= artwiz bbs bluebox cthulhain deep flux frobozz frobust mbdtex \ + miklos nyz nyzclone ob20 operation outcomes paper \ + purplehaaze shade steelblue steelblue2 the_orange trisb \ + twice warp-xp PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= + +.include <bsd.port.pre.mk> +.if ${XFREE86_VERSION} == 4 +CONFIGURE_ARGS+= --enable-xinerama +.endif do-patch: ${PERL} -pi -e \ @@ -37,15 +46,16 @@ pre-install: ${RM} -f ${PLIST} -.for ii in osetbg osetroot openbox +.for ii in osetbg osetroot openbox epist xftlsfonts ${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor ${ECHO_CMD} share/openbox/menu >> ${PLIST} + ${ECHO_CMD} share/openbox/epistrc >> ${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 +.for ii in POSIX US_ASCII de en en_GB en_US es fr it ko nl no pt ro ${ECHO_CMD} share/openbox/nls/${ii} >> ${PLIST} .endfor .for ii in ${STYLES} @@ -64,9 +74,12 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/util/bsetbg ${PREFIX}/bin/osetbg ${INSTALL_PROGRAM} ${WRKSRC}/util/bsetroot ${PREFIX}/bin/osetroot + ${INSTALL_PROGRAM} ${WRKSRC}/util/xftlsfonts ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/util/epist/epist ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/src/openbox ${PREFIX}/bin/ ${MKDIR} ${DATADIR}/styles ${INSTALL_DATA} ${WRKSRC}/data/menu ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/util/epist/epistrc ${DATADIR} .for ii in ${I10L} ${MKDIR} ${PREFIX}/share/openbox/nls/${ii}/ ${INSTALL_DATA} ${WRKSRC}/nls/${ii}/openbox.cat \ @@ -77,10 +90,15 @@ ${LN} -s C US_ASCII && \ ${LN} -s C en && \ ${LN} -s C en_US && \ + ${LN} -s C en_GB && \ ${LN} -s de_DE de && \ ${LN} -s es_ES es && \ ${LN} -s fr_FR fr && \ ${LN} -s it_IT it && \ + ${LN} -s ko_KO ko && \ + ${LN} -s no_NO no && \ + ${LN} -s pt_BR pt && \ + ${LN} -s ro_RO ro && \ ${LN} -s nl_NL nl .for ii in ${STYLES} ${INSTALL_DATA} ${WRKSRC}/data/styles/${ii} \ @@ -89,9 +107,15 @@ .for ii in setroot setbg ${CP} -p ${WRKSRC}/doc/b${ii}.1 ${WRKSRC}/doc/o${ii}.1 .endfor +.for ii in epist.1 epistrc.5 + ${CP} -p ${WRKSRC}/util/epist/${ii} ${WRKSRC}/doc/${ii} +.endfor .for ii in ${MAN1} ${INSTALL_MAN} ${WRKSRC}/doc/${ii} ${PREFIX}/man/man1/ .endfor +.for ii in ${MAN5} + ${INSTALL_MAN} ${WRKSRC}/doc/${ii} ${PREFIX}/man/man5/ +.endfor .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for ii in ${DOCS} @@ -99,4 +123,4 @@ .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -U 3 openbox-stable/distinfo openbox/distinfo --- openbox-stable/distinfo Tue Jul 16 11:52:45 2002 +++ openbox/distinfo Sun Aug 25 17:05:13 2002 @@ -1 +1 @@ -MD5 (openbox-1.2.4.tar.gz) = b41bba4f5a343e9e12ba5873a13328f6 +MD5 (openbox-2.0.0.tar.gz) = 67df5c943f5a06a57190c74baba731f4 ====== END PATCH ====== >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E17m1DS-0005Ri-00>