From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 14 07:40:20 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79B3D16A4E0 for ; Mon, 14 Aug 2006 07:40:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7B9E43D68 for ; Mon, 14 Aug 2006 07:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k7E7eFoo043596 for ; Mon, 14 Aug 2006 07:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7E7eFAr043595; Mon, 14 Aug 2006 07:40:15 GMT (envelope-from gnats) Resent-Date: Mon, 14 Aug 2006 07:40:15 GMT Resent-Message-Id: <200608140740.k7E7eFAr043595@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Babak Farrokhi" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 144BF16A4DD for ; Mon, 14 Aug 2006 07:34:54 +0000 (UTC) (envelope-from babak@farrokhi.net) Received: from Plesk.datak.net (plesk.datak-telecom.net [81.91.129.96]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5C6643D73 for ; Mon, 14 Aug 2006 07:34:52 +0000 (GMT) (envelope-from babak@farrokhi.net) Received: (qmail 24735 invoked from network); 14 Aug 2006 11:04:47 +0330 Received: from unknown (HELO starfish.datak.net) (81.91.130.217) by 81.91.129.125 with (DHE-RSA-AES256-SHA encrypted) SMTP; 14 Aug 2006 11:04:46 +0330 Message-Id: <1155540889.56926@starfish.datak.net> Date: Mon, 14 Aug 2006 11:04:49 +0330 From: "Babak Farrokhi" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/101997: [Maintainer Update] x11-wm/jwm - UnBROKEN on 4.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 07:40:20 -0000 >Number: 101997 >Category: ports >Synopsis: [Maintainer Update] x11-wm/jwm - UnBROKEN on 4.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Aug 14 07:40:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Babak Farrokhi >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD 6.1-STABLE #0: Mon Jul 24 11:42:49 IRST 2006 root@starfish.datak.net:/usr/obj/usr/src/sys/STARFISH >Description: - Add new MASTERSITES - Respect DESTDIR - Fix build on 4.x (now builds fine on 4,5,6 and 7, tested on tinderbox) >How-To-Repeat: >Fix: --- jwm.patch begins here --- diff -ruN jwm.orig/Makefile jwm/Makefile --- jwm.orig/Makefile Mon Aug 14 10:20:08 2006 +++ jwm/Makefile Mon Aug 14 10:31:12 2006 @@ -8,8 +8,9 @@ PORTNAME= jwm PORTVERSION= 1.7 CATEGORIES= x11-wm -MASTER_SITES= http://joewing.net/programs/jwm/ \ - http://www.unixified.net/distfiles/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + http://joewing.net/programs/ +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= babak@farrokhi.net COMMENT= Joe's Window Manager @@ -20,6 +21,7 @@ USE_XPM= yes GNU_CONFIGURE= yes USE_BZIP2= yes +USE_GCC= 3.4+ CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -28,19 +30,15 @@ .include -.if ${OSVERSION} < 500000 -BROKEN= Does not compile -.endif - post-patch: @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${TARGETDIR}|' ${WRKSRC}/example.jwmrc do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc.sample - if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \ - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${TARGETDIR}/bin + ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${TARGETDIR}/etc/system.jwmrc.sample + if ! [ -f ${TARGETDIR}/etc/system.jwmrc ]; then \ + ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${TARGETDIR}/etc/system.jwmrc; \ fi ${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1/ --- jwm.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: