From nobody@FreeBSD.org  Wed Apr  4 10:12:54 2001
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 5280437B719
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  4 Apr 2001 10:12:54 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f34HCsP22273;
	Wed, 4 Apr 2001 10:12:54 -0700 (PDT)
	(envelope-from nobody)
Message-Id: <200104041712.f34HCsP22273@freefall.freebsd.org>
Date: Wed, 4 Apr 2001 10:12:54 -0700 (PDT)
From: perky@python.or.kr
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: devel/py-kqueue
X-Send-Pr-Version: www-1.0

>Number:         26352
>Category:       ports
>Synopsis:       Update port: devel/py-kqueue
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dwhite
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 04 10:20:01 PDT 2001
>Closed-Date:    Thu Apr 5 10:29:25 PDT 2001
>Last-Modified:  Thu Apr 05 10:30:32 PDT 2001
>Originator:     Chang, Hye-Shik
>Release:        FreeBSD 4.2
>Organization:
Yonsei University
>Environment:
FreeBSD free.yonsei.ac.kr 4.3-RC FreeBSD 4.3-RC #0: Wed Apr  4 07:18:43 KST 2001     root@free.yonsei.ac.kr:/usr/src/sys/compile/RYOKO  i386

>Description:
adapt to python 2.0 & bsd.python.mk port style

* added files/patch-Makefile.pre.in

>How-To-Repeat:

>Fix:
diff -ruN py-kqueue.orig/Makefile py-kqueue/Makefile
--- py-kqueue.orig/Makefile	Fri Sep  8 21:23:57 2000
+++ py-kqueue/Makefile	Thu Apr  5 02:03:03 2001
@@ -7,6 +7,7 @@
 
 PORTNAME=		kqueue
 PORTVERSION=		1.2
+PORTREVISION=		1
 CATEGORIES=		devel python
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dwhite
@@ -15,30 +16,29 @@
 
 MAINTAINER=		dwhite@FreeBSD.org
 
-BUILD_DEPENDS=		python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS=		python1.5:${PORTSDIR}/lang/python15
+USE_PYTHON=		yes
+PLIST_SUB+=		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
 .include <bsd.port.pre.mk>
 
-.if ( ${OSVERSION} < 400018 || ${OSVERSION} < 500010 )
-#FORBIDDEN="requires new kqueue API"
+.if ${OSVERSION} < 400018
+FORBIDDEN="requires new kqueue API"
+.endif
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500010
+FORBIDDEN="requires new kqueue API"
 .endif
-
-# NO_WRKSUBDIR=		yes
-# MAKEFILE=		makefile
 
 do-configure:
 	@(cd ${WRKSRC} && \
 	make -f Makefile.pre.in boot)
 
+post-build:
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+
 do-install:
-	${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-	${INSTALL_DATA} ${WRKSRC}/kqsyscallmodule.so                   \
-		${PREFIX}/lib/python1.5/site-packages/
-	${INSTALL_DATA} ${WRKSRC}/KQueue.py				\
-		${PREFIX}/lib/python1.5/site-packages/
-# .if !defined(NOPORTDOCS)
-# 	${INSTALL_DATA} ${WRKSRC}/kjbuckets.html ${PREFIX}/share/doc/
-# .endif
+	${MKDIR} ${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/kqsyscallmodule.so ${PYTHON_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/KQueue.py ${PYTHON_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/KQueue.pyc ${PYTHON_SITELIBDIR}/
 
 .include <bsd.port.post.mk>
diff -ruN py-kqueue.orig/files/patch-Makefile.pre.in py-kqueue/files/patch-Makefile.pre.in
--- py-kqueue.orig/files/patch-Makefile.pre.in	Thu Jan  1 09:00:00 1970
+++ py-kqueue/files/patch-Makefile.pre.in	Thu Apr  5 00:52:59 2001
@@ -0,0 +1,11 @@
+--- Makefile.pre.in.orig	Wed May 24 11:40:24 2000
++++ Makefile.pre.in	Thu Apr  5 00:52:08 2001
+@@ -168,7 +168,7 @@
+ MAKEFILE=	$(LIBPL)/Makefile
+ CONFIGC=	$(LIBPL)/config.c
+ CONFIGCIN=	$(LIBPL)/config.c.in
+-SETUP=		$(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup
++SETUP=		$(LIBPL)/Setup.config $(LIBPL)/Setup.local $(LIBPL)/Setup
+ 
+ SYSLIBS=	$(LIBM) $(LIBC)
+ 
diff -ruN py-kqueue.orig/pkg-plist py-kqueue/pkg-plist
--- py-kqueue.orig/pkg-plist	Wed May 24 13:34:16 2000
+++ py-kqueue/pkg-plist	Thu Apr  5 02:02:18 2001
@@ -1,3 +1,3 @@
-@exec mkdir -p %D/lib/python1.5/site-packages
-lib/python1.5/site-packages/kqsyscallmodule.so
-lib/python1.5/site-packages/KQueue.py
+%%PYTHON_SITELIBDIR%%/kqsyscallmodule.so
+%%PYTHON_SITELIBDIR%%/KQueue.py
+%%PYTHON_SITELIBDIR%%/KQueue.pyc

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->dwhite 
Responsible-Changed-By: mharo 
Responsible-Changed-When: Thu Apr 5 03:08:41 PDT 2001 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=26352 
State-Changed-From-To: open->closed 
State-Changed-By: dwhite 
State-Changed-When: Thu Apr 5 10:29:25 PDT 2001 
State-Changed-Why:  
Committed, thanks! I amended the patch slightly by rolling a new version of 
PyKQueue with the patch to Makefile.pre.in instead of having the port do it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=26352 
>Unformatted:
