6 files changed, 62 insertions, 40 deletions

diff --git a/devel/lightning/Makefile b/devel/lightning/Makefile
index 56e7c875b408..d11a6b834443 100644
--- a/devel/lightning/Makefile
+++ b/devel/lightning/Makefile
@@ -1,25 +1,38 @@
-# ex:ts=8
-# Ports collection makefile for:	lightning
-# Date created:			May 9, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	lightning
-PORTVERSION=	1.2
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates assembly language code at run-time
 
-ONLY_FOR_ARCHS=	i386 sparc64 powerpc
+OPTIONS_DEFINE=	ASSERTIONS
+ASSERTIONS_DESC=Enable runtime code generation assertions
 
+ONLY_FOR_ARCHS=	i386 amd64 arm ia64 powerpc sparc64 mips
+
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-disassembler=no
+
+PLIST_SUB+=	JIT_ARCH=${ARCH:S/i386/x86/:S/amd64/x86/:S/sparc64/sparc/:S/powerpc/ppc/}
 
-MAN1=		lightningize.1
 INFO=		lightning
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MASSERTIONS}
+CONFIGURE_ARGS+=--enable-assertions=yes
+.else
+CONFIGURE_ARGS+=--enable-assertions=no
+.endif
+
+regression-test: build
+	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+
 .include <bsd.port.mk>
diff --git a/devel/lightning/distinfo b/devel/lightning/distinfo
index 2687b11c486a..640a56d9b581 100644
--- a/devel/lightning/distinfo
+++ b/devel/lightning/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lightning-1.2.tar.gz) = d16a9f12441f297f7524917bfc97501a8600a93eb9c46d2a7e2a16e5caf11511
-SIZE (lightning-1.2.tar.gz) = 403274
+SHA256 (lightning-2.0.0.tar.gz) = e41736c5c6c40eeb194e3f9fec3209e86f07f9471d0aacc5d35c1c8e55621054
+SIZE (lightning-2.0.0.tar.gz) = 852571
diff --git a/devel/lightning/files/patch-configure b/devel/lightning/files/patch-configure
new file mode 100644
index 000000000000..dc9bf7b6ca60
--- /dev/null
+++ b/devel/lightning/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	2013-08-23 21:12:43.000000000 +0300
++++ configure	2013-08-25 15:53:56.000000000 +0300
+@@ -11650,6 +11650,7 @@
+ fi
+ 
+ case "$host_os" in
++    *freebsd*)	SHLIB=""	    ;;
+     *hpux*)		SHLIB="-ldld"	;;
+     *)			SHLIB="-ldl"	;;
+ esac
+@@ -11657,7 +11658,7 @@
+ 
+ cpu=
+ case "$target_cpu" in
+-    i?86|x86_64)	cpu=x86		;;
++    i?86|x86_64|amd64)	cpu=x86		;;
+     *arm*)		cpu=arm		;;
+     *mips*)		cpu=mips	;;
+     *powerpc*)		cpu=ppc		;;
diff --git a/devel/lightning/files/patch-include-lightning.h b/devel/lightning/files/patch-include-lightning.h
new file mode 100644
index 000000000000..27031030ccae
--- /dev/null
+++ b/devel/lightning/files/patch-include-lightning.h
@@ -0,0 +1,11 @@
+--- include/lightning.h.orig	2013-09-02 13:38:10.000000000 +0300
++++ include/lightning.h	2013-09-02 14:57:27.000000000 +0300
+@@ -38,7 +38,7 @@
+ #    define __WORDSIZE		WORDSIZE
+ #  elif defined(__SIZEOF_POINTER__)		/* ppc aix */
+ #    define __WORDSIZE		(__SIZEOF_POINTER__ << 3)
+-#  elif defined(_ILP32)				/* hppa hp-ux */
++#  elif defined(_ILP32) || defined(__i386__)	/* hppa hp-ux, i386 gcc 4.2 */
+ #    define __WORDSIZE		32
+ #  elif defined(_LP64)				/* ia64 hp-ux (with cc +DD64) */
+ #    define __WORDSIZE		64
diff --git a/devel/lightning/pkg-descr b/devel/lightning/pkg-descr
index 0aa7e9d1dbd8..1cfdb7fea02b 100644
--- a/devel/lightning/pkg-descr
+++ b/devel/lightning/pkg-descr
@@ -3,4 +3,4 @@ it is very fast, making it ideal for Just-In-Time compilers, and it abstracts
 over the target CPU, as it exposes to the clients a standardized RISC
 instruction set inspired by the MIPS and SPARC chips.
 
-WWW: http://www.gnu.org/software/lightning/ 
+WWW: http://www.gnu.org/software/lightning/
diff --git a/devel/lightning/pkg-plist b/devel/lightning/pkg-plist
index 6915e5c07022..5a0abf8930db 100644
--- a/devel/lightning/pkg-plist
+++ b/devel/lightning/pkg-plist
@@ -1,28 +1,7 @@
-bin/lightningize
-include/lightning/asm-common.h
-include/lightning/asm.h
-include/lightning/core-common.h
-include/lightning/core.h
-include/lightning/fp-common.h
-include/lightning/fp.h
-include/lightning/funcs-common.h
-include/lightning/funcs.h
-include/lightning/i386/asm.h
-include/lightning/i386/core.h
-include/lightning/i386/fp.h
-include/lightning/i386/funcs.h
-include/lightning/ppc/asm.h
-include/lightning/ppc/core.h
-include/lightning/ppc/fp.h
-include/lightning/ppc/funcs.h
-include/lightning/sparc/asm.h
-include/lightning/sparc/core.h
-include/lightning/sparc/fp.h
-include/lightning/sparc/funcs.h
-share/aclocal/lightning.m4
-%%DATADIR%%/Makefile.am
-@dirrm %%DATADIR%%
-@dirrm include/lightning/sparc
-@dirrm include/lightning/ppc
-@dirrm include/lightning/i386
+include/lightning.h
+include/lightning/jit_%%JIT_ARCH%%.h
+lib/liblightning.a
+lib/liblightning.la
+lib/liblightning.so
+lib/liblightning.so.0
 @dirrm include/lightning