From owner-freebsd-ports Sat Dec 15 0:12: 4 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 956DC37B421 for ; Sat, 15 Dec 2001 00:10:08 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fBF8A3G94367; Sat, 15 Dec 2001 00:10:03 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5CD4437B41A for ; Sat, 15 Dec 2001 00:09:15 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fBF89Fi94131; Sat, 15 Dec 2001 00:09:15 -0800 (PST) (envelope-from nobody) Message-Id: <200112150809.fBF89Fi94131@freefall.freebsd.org> Date: Sat, 15 Dec 2001 00:09:15 -0800 (PST) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/32864: Update port: x11-wm/swm to 1.3.2 (fix ports/31303) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 32864 >Category: ports >Synopsis: Update port: x11-wm/swm to 1.3.2 (fix ports/31303) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 15 00:10:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.3.2 New file: files/swm.conf Remove file: files/patch-Makefile This PR supersedes ports/31303. >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/swm/Makefile x11-wm/swm/Makefile --- /usr/ports/x11-wm/swm/Makefile Thu May 3 16:15:40 2001 +++ x11-wm/swm/Makefile Sat Dec 15 14:05:17 2001 @@ -6,66 +6,73 @@ # PORTNAME= swm -PORTVERSION= 1.2.5 +PORTVERSION= 1.3.2 CATEGORIES= x11-wm MASTER_SITES= http://www.informatik.hu-berlin.de/~sperling/prog/ EXTRACT_SUFX= -src.tgz MAINTAINER= trevor@FreeBSD.org -BINS= swm swmbg swmpanel swmswitch +BINS= swm swmbg swmswitch DOCDIR= share/doc/${PORTNAME} -DOCS= AUTHORS COMPILE_PARAMS COPYING ChangeLog LIESMICH README \ - README.iPaq swm.lsm -EXAMPLES= startswm.kde1 startswm.kde2 -MAN1= swm.1 swmbg.1 +DOCS= AUTHORS FEATURES FOR_MINIMALISTS LIESMICH README SWM-FAQ \ + X-SPEEDUP-FAQ updated +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${X11BASE}" +MAKEFILE= Makefile-xpm +MAN1= swm.1 swmbg.1 swmswitch.1 PLIST= ${WRKDIR}/pkg-plist SCRIPTS= startswm USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src + +post-patch: + ${CP} ${FILESDIR}/swm.conf ${WRKSRC} + +post-build: + cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \ + -o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${X11BASE}/lib + cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \ + -o ${WRKSRC}/swmswitch -lX11 -L${X11BASE}/lib pre-install: ${RM} -f ${PLIST} - for i in ${BINS} ${SCRIPTS}; \ - do ${ECHO} bin/$${i} >> ${PLIST}; \ - done +.for i in ${BINS} ${SCRIPTS} + ${ECHO} bin/${i} >> ${PLIST} +.endfor .if !defined(NOPORTDOCS) - for i in ${DOCS}; \ - do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \ - done - for i in 1 2 3; \ - do ${ECHO} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \ - done - for i in ${EXAMPLES}; \ - do ${ECHO} ${DOCDIR}/examples/$${i} >> ${PLIST}; \ - done +.for i in ${DOCS} + ${ECHO} ${DOCDIR}/${i} >> ${PLIST} +.endfor +.for i in 1 2 3 + ${ECHO} ${DOCDIR}/examples/.swm/button${i} >> ${PLIST} +.endfor ${ECHO} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST} ${ECHO} @dirrm ${DOCDIR}/examples >> ${PLIST} ${ECHO} @dirrm ${DOCDIR} >> ${PLIST} .endif do-install: - for i in ${BINS}; \ - do ${INSTALL_PROGRAM} ${WRKSRC}/$${i} ${PREFIX}/bin; \ - done +.for i in ${BINS} + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin +.endfor ${INSTALL_SCRIPT} ${WRKSRC}/${SCRIPTS} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/swm.1x ${PREFIX}/man/man1/swm.1 - ${INSTALL_MAN} ${WRKSRC}/swmbg.1x ${PREFIX}/man/man1/swmbg.1 -# ${INSTALL_MAN} ${WRKSRC}/swm-de.1x \ -# ${PREFIX}/man/de_DE.ISO_8859-1/man1/swm.1x + ${INSTALL_MAN} ${WRKSRC}/swm.1x ${MANPREFIX}/man/man1/swm.1 + ${INSTALL_MAN} ${WRKSRC}/../swmbg/swmbg.1x \ + ${MANPREFIX}/man/man1/swmbg.1 + ${INSTALL_MAN} ${WRKSRC}/../swmswitch/swmswitch.1x \ + ${MANPREFIX}/man/man1/swmswitch.1 .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/${DOCDIR} - cd ${WRKSRC}/../ && \ - ${CHMOD} -R 755 examples && \ - pax -r -w examples ${PREFIX}/${DOCDIR} -.for i in ${EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}/examples/ -.endfor - for i in ${DOCS}; \ - do ${INSTALL_DATA} ${WRKSRC}/../$${i} ${PREFIX}/${DOCDIR}; \ - done +.for i in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/../doc/${i} ${PREFIX}/${DOCDIR} +.endfor + ${MKDIR} ${PREFIX}/${DOCDIR}/examples/.swm +.for i in 1 2 3 + ${INSTALL_SCRIPT} ${WRKSRC}/../examples/.swm/button${i} \ + ${PREFIX}/${DOCDIR}/examples/.swm +.endfor .endif .include diff -urN /usr/ports/x11-wm/swm/distinfo x11-wm/swm/distinfo --- /usr/ports/x11-wm/swm/distinfo Thu May 3 16:15:40 2001 +++ x11-wm/swm/distinfo Sat Dec 15 14:07:05 2001 @@ -1 +1 @@ -MD5 (swm-1.2.5-src.tgz) = 586c3d467347c9f5066d9275085cf358 +MD5 (swm-1.3.2-src.tgz) = 7ebcb650493e276fdcf18109378f9865 diff -urN /usr/ports/x11-wm/swm/files/patch-Makefile x11-wm/swm/files/patch-Makefile --- /usr/ports/x11-wm/swm/files/patch-Makefile Fri Mar 30 18:18:30 2001 +++ x11-wm/swm/files/patch-Makefile Thu Jan 1 09:00:00 1970 @@ -1,21 +0,0 @@ ---- Makefile.orig Tue Mar 20 08:41:39 2001 -+++ Makefile Fri Mar 30 01:06:27 2001 -@@ -2,16 +2,15 @@ - # the swm.conf file. Normally, you should not have to edit this Makefile. - - # Only for testing & devellopment --CFLAGS = -O0 -Wall -g3 -ggdb -p -H - - # There should be nothing to edit below this line - # ----------------------------------------------------------------------------- --CC = gcc -+CC ?= gcc - - #LDPATH = -L$(XROOT)/lib -L/skiff/local/arm-linux/lib -L/skiff/local/lib/gcc-lib/arm-linux/2.95.2 - #INCLPATH = -I$(XROOT)/include -I/skiff/local/include -I/usr/include - --XROOT = /usr/X11R6 -+XROOT = ${X11BASE} - INCLPATH = -I$(XROOT)/include - LDPATH = -L$(XROOT)/lib - diff -urN /usr/ports/x11-wm/swm/files/swm.conf x11-wm/swm/files/swm.conf --- /usr/ports/x11-wm/swm/files/swm.conf Thu Jan 1 09:00:00 1970 +++ x11-wm/swm/files/swm.conf Fri Oct 12 05:50:28 2001 @@ -0,0 +1,24 @@ +#define SIGNALS +#define CURSORS +#define WINDOWCURSOR XC_left_ptr +#define BODYCURSOR XC_X_cursor +#define GNOME +#define KEYS +#define MWM +#define FONTS +#define DRAWTITLE +#define STD_IO +#define NUMBEROFDESKTOPS 4 +#define FONTS +#define TITLEBARFONT "*monotype-*-12*" +#define MAXIMIZE +#define SHADE +#define FOCUSNEW +#define PIXMAPS +#define CONFDIR "$HOME" +#define FOREGROUND "gold" +#define BACKGROUND "blue" +#define BORDERCOLOR "black" +#define TITLEBARHEIGHT 17 +#define MINWINDOWWIDTH 20 + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message