Date: Thu, 23 Dec 2004 08:41:42 -0700 From: "Greg J." <xcas@cox.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/75437: [maintainer] x11-wm/kahakai: fix python conflicts Message-ID: <1103816502.0@casper.bsd-unix.org> Resent-Message-ID: <200412231550.iBNFoST3010693@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.post.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1103816502.0>