ports/133263: Unbroken x11-toolkits/plib on CURRENT

[Kuan-Chung Chiu]

>Number:         133263
>Category:       ports
>Synopsis:       Unbroken x11-toolkits/plib on CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 01 04:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Kuan-Chung Chiu
>Release:        8.0-CURRENT
>Organization:
N/A
>Environment:
FreeBSD Zeta.twbbs.org 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sat Mar 28 14:37:19 UTC 2009     root at Zeta.twbbs.org:/usr/obj/usr/src/sys/ZETA  i386
>Description:
Only disable the JS (joystick) part.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN plib.orig/Makefile plib/Makefile
--- plib.orig/Makefile	2009-04-01 12:13:49.948177094 +0800
+++ plib/Makefile	2009-04-01 12:43:10.191491816 +0800
@@ -27,13 +27,19 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 800064
-BROKEN=		does not compile with new usb stack
+CONFIGURE_ARGS+=--disable-js
+PLIST_SUB+=     JS="@comment "
+.else
+PLIST_SUB+=     JS=""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread||g ; \
 		 s|-ldl||g ; \
 		 s|-lc_r||g' ${WRKSRC}/configure
+.if ${OSVERSION} >= 800064
+	@${ECHO} "JS component is not compiled with new usb stack"
+.endif
 
 post-build:
 	${CC} ${CFLAGS} -o ${WRKDIR}/plib-jscal ${FILESDIR}/jsBSDCal.c
diff -ruN plib.orig/pkg-plist plib/pkg-plist
--- plib.orig/pkg-plist	2009-04-01 12:13:49.921177293 +0800
+++ plib/pkg-plist	2009-04-01 12:12:33.061167991 +0800
@@ -1,6 +1,6 @@
 bin/plib-jscal
 include/plib/fnt.h
-include/plib/js.h
+%%JS%%include/plib/js.h
 include/plib/net.h
 include/plib/netBuffer.h
 include/plib/netChannel.h
@@ -40,7 +40,7 @@
 include/plib/ul.h
 include/plib/ulRTTI.h
 lib/libplibfnt.a
-lib/libplibjs.a
+%%JS%%lib/libplibjs.a
 lib/libplibnet.a
 lib/libplibpsl.a
 lib/libplibpu.a


>Release-Note:
>Audit-Trail:
>Unformatted: