- Update to 7.5.240.

- Fix LICENSE.

3 files changed, 24 insertions, 13 deletions

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index bb837e4fcae5..c93084cd4fce 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -2,25 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	magic
-PORTVERSION=	7.5.233
+PORTVERSION=	7.5.240
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
 		http://fossies.org/linux/misc/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Interactive editor for VLSI layouts
 
-LICENSE=	BSD
+LICENSE=	MIT
+LICENSE_FILE=	${FILESDIR}/license.txt
 
 LIB_DEPENDS=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt
 
-CONFIGURE_WRKSRC=	${WRKSRC}/scripts
-
-USES+=		gmake tk:build tar:tgz
+USES=		gmake tk:build tar:tgz
 USE_XORG=	ice xext xi xmu
 USE_GL=		gl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
+		--with-opengl
+CONFIGURE_WRKSRC=	${WRKSRC}/scripts
 ALL_TARGET=	tcllibrary
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -30,8 +32,6 @@ DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" ""
 
 PORTSCOUT=	limit:^7\.
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^#!.*|#!${AWK} -f|' ${WRKSRC}/ext2spice/spice2sim
@@ -40,7 +40,8 @@ post-patch:
 		 s|TK_LIB_NAME=.*|TK_LIB_NAME="tk${TK_VER:S/.//}"|g ; \
 		 s|wish$${TK_VERSION}|${WISH:T}|g ; \
 		 s|tclsh$${TK_VERSION}|${TCLSH:T}|g ; \
-		 s|-l/usr/X11R6/include|-I${LOCALBASE}/include|g' ${CONFIGURE_WRKSRC}/configure
+		 s|-l/usr/X11R6/include|-I${LOCALBASE}/include|g' \
+	    ${CONFIGURE_WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/CFLAGS/s| -pg | |' ${WRKSRC}/tcltk/Makefile
 	@${REINPLACE_CMD} -e \
@@ -52,4 +53,4 @@ pre-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} database/database.h)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index 8d5e1d3dadfa..3b3989b0ea6f 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (magic-7.5.233.tgz) = 5fd1449380d185584c03fbfe4b62abee83bb868de11c1d7ebca4db5f8c5338bf
-SIZE (magic-7.5.233.tgz) = 3753060
+SHA256 (magic-7.5.240.tgz) = c34134fb47aaa58c2f1b45454f1ab53069fc80d1e85a1def313c2e7695b901f7
+SIZE (magic-7.5.240.tgz) = 3753069
diff --git a/cad/magic/files/license.txt b/cad/magic/files/license.txt
new file mode 100644
index 000000000000..015556c5f97b
--- /dev/null
+++ b/cad/magic/files/license.txt
@@ -0,0 +1,10 @@
+Copyright (C) 1985, 1990 Regents of the University of California.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies.  The University of California
+makes no representations about the suitability of this
+software for any purpose.  It is provided "as is" without
+express or implied warranty.  Export of this software outside
+of the United States of America may require an export license.