ports/120118: [patch] devel/linux-js: fix for 7.x ABI breakage

[Teemu Korhonen]

>Number:         120118
>Category:       ports
>Synopsis:       [patch] devel/linux-js: fix for 7.x ABI breakage
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 29 14:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Teemu Korhonen
>Release:        FreeBSD 7.0-RC1 i386
>Organization:
>Environment:
System: FreeBSD veneficus.koti.lan 7.0-RC1 FreeBSD 7.0-RC1 #0: Tue Jan 8 22:55:09 EET 2008 teemu at veneficus.koti.lan:/usr/obj/usr/src/sys/VENEFICUS i386


	
>Description:
This patch fixes the module loading error in RELENG_7.
Also removes the IGNORE-mark.

In more detail: FILEDESC_UNLOCK and FILEDESC_LOCK is
replaced with FILEDESC_SUNLOCK and FILEDESC_SLOCK
as have been done in sys_generic.c when moving to RELENG_7.
	
>How-To-Repeat:
	
>Fix:

	

--- linux-js-patch.diff begins here ---
diff -ruN /usr/ports/devel/linux-js/Makefile linux-js/Makefile
--- /usr/ports/devel/linux-js/Makefile	2008-01-27 00:24:58.000000000 +0200
+++ linux-js/Makefile	2008-01-29 10:58:58.000000000 +0200
@@ -33,10 +33,6 @@
 IGNORE=		requires FreeBSD 5.3 or superior
 .endif
 
-.if ${OSVERSION} >= 700000
-IGNORE=		module cannot be loaded on FreeBSD 7.x 
-.endif
-
 .if !exists(/usr/src/sys/Makefile)
 IGNORE=		requires kernel source files
 .endif
@@ -55,6 +51,10 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/linux_js.4
+.if ${OSVERSION} >= 700000
+	@${REINPLACE_CMD} -e 's|FILEDESC_UNLOCK|FILEDESC_SUNLOCK|' ${WRKSRC}/linux_js.c
+	@${REINPLACE_CMD} -e 's|FILEDESC_LOCK|FILEDESC_SLOCK|' ${WRKSRC}/linux_js.c
+.endif
 
 post-install:
 	${MKDIR} ${PREFIX}/include/linux
--- linux-js-patch.diff ends here ---


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