From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 23 15:50:28 2004 Return-Path: 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 D115B16A4CE for ; Thu, 23 Dec 2004 15:50:28 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9348B43D5C for ; Thu, 23 Dec 2004 15:50:28 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNFoSpG010694 for ; Thu, 23 Dec 2004 15:50:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBNFoST3010693; Thu, 23 Dec 2004 15:50:28 GMT (envelope-from gnats) Resent-Date: Thu, 23 Dec 2004 15:50:28 GMT Resent-Message-Id: <200412231550.iBNFoST3010693@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, "Greg J." Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BB1E16A4CE for ; Thu, 23 Dec 2004 15:41:35 +0000 (GMT) Received: from fed1rmmtao05.cox.net (fed1rmmtao05.cox.net [68.230.241.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07E1643D5A for ; Thu, 23 Dec 2004 15:41:35 +0000 (GMT) (envelope-from xcas@cox.net) Received: from casper.bsd-unix.org ([68.2.128.106]) by fed1rmmtao05.cox.net (InterMail vM.6.01.04.00 201-2131-117-20041022) with ESMTP <20041223154129.EFVX16028.fed1rmmtao05.cox.net@casper.bsd-unix.org> for ; Thu, 23 Dec 2004 10:41:29 -0500 Message-Id: <1103816502.0@casper.bsd-unix.org> Date: Thu, 23 Dec 2004 08:41:42 -0700 From: "Greg J." To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.1 Subject: ports/75437: [maintainer] x11-wm/kahakai: fix python conflicts X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2004 15:50:29 -0000 >Number: 75437 >Category: ports >Synopsis: [maintainer] x11-wm/kahakai: fix python conflicts >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: Thu Dec 23 15:50:28 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Greg J. >Release: FreeBSD 5.3-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD 5.3-RELEASE-p2 #0: Mon Dec 6 15:24:47 MST 2004 root@casper.bsd-unix.org:/usr/obj/usr/src/sys/CASX32 >Description: Fix recent python conflicts so kahakai will actually start & work. >How-To-Repeat: >Fix: --- kahakai.diff begins here --- diff -u kahakai/Makefile.orig kahakai/Makefile --- kahakai/Makefile.orig Sun Dec 12 02:56:00 2004 +++ kahakai/Makefile Thu Dec 23 08:15:33 2004 @@ -7,7 +7,7 @@ PORTNAME= kahakai PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -49,5 +49,13 @@ post-patch: @${REINPLACE_CMD} -e 's|/tmp/ktest|${X11BASE}|' \ ${WRKSRC}/data/styles/Default.kastyle.in + @${REINPLACE_CMD} -e 's|bool max|bool wmax|' \ + ${WRKSRC}/src/Window.hh + @${REINPLACE_CMD} -e 's|flags.max|flags.wmax|g' \ + ${WRKSRC}/src/*.cc + +pre-install: + @${REINPLACE_CMD} -e 's|^None|globals()["None"]|' \ + ${WRKSRC}/src/kahakai.py .include diff -u kahakai/pkg-plist.orig kahakai/pkg-plist --- kahakai/pkg-plist.orig Sun Dec 12 02:56:00 2004 +++ kahakai/pkg-plist Thu Dec 23 07:58:54 2004 @@ -27,6 +27,8 @@ share/kahakai/scripts/events.pyo share/kahakai/scripts/filelist.pl share/kahakai/scripts/kahakai.py +share/kahakai/scripts/kahakai.pyc +share/kahakai/scripts/kahakai.pyo share/kahakai/scripts/macros.py share/kahakai/scripts/macros.pyc share/kahakai/scripts/macros.pyo --- kahakai.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: