Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- Update to 7.5.124

PR:		164986
Submitted by:	Ports Fury
  • Loading branch information...
commit b8552ab89b1e0e54fe2b62d1d0f63eacbd76ecf4 1 parent f4e0f3a
@miwi-fbsd miwi-fbsd authored
View
14 cad/magic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= magic
-PORTVERSION= 7.5.213
+PORTVERSION= 7.5.214
CATEGORIES= cad
MASTER_SITES= http://opencircuitdesign.com/magic/archive/ \
http://fossies.org/linux/misc/
@@ -15,7 +15,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive editor for VLSI layouts
-LIB_DEPENDS+= BLT24.3:${PORTSDIR}/x11-toolkits/blt
+LICENSE= BSD
+
+LIB_DEPENDS= BLT24.3:${PORTSDIR}/x11-toolkits/blt
CONFIGURE_WRKSRC= ${WRKSRC}/scripts
@@ -29,7 +31,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
ALL_TARGET= tcllibrary
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_SAFE=yes
MAN1= ext2sim.1 ext2spice.1 extcheck.1 magic.1
MAN5= cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 mag.5 \
@@ -38,6 +40,8 @@ MAN5= cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 mag.5 \
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+PORTSCOUT= limit:^7\.
+
.include <bsd.port.pre.mk>
post-patch:
@@ -56,4 +60,8 @@ post-patch:
@${REINPLACE_CMD} -e \
's|^#!.*|#!${WISH}|' ${WRKSRC}/tcltk/tkshell.tcl
+pre-build:
+ @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} database/database.h)
+
.include <bsd.port.post.mk>
View
4 cad/magic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (magic-7.5.213.tgz) = cacd14275ec13a008cb2dd0455e3bd5ff288be9060de0a805bb15b890ea42bf0
-SIZE (magic-7.5.213.tgz) = 3694855
+SHA256 (magic-7.5.214.tgz) = c809d4b497acfa69da729d06e0b4ceaab9b4eada89c38f79056f82db943667ab
+SIZE (magic-7.5.214.tgz) = 3758817
View
83 cad/magic/files/patch-Makefile
@@ -0,0 +1,83 @@
+--- Makefile.orig 2012-01-17 02:17:06.000000000 +0900
++++ Makefile 2012-01-17 02:18:32.000000000 +0900
+@@ -18,12 +18,10 @@
+ all: $(ALL_TARGET)
+
+ standard:
+- @echo --- errors and warnings logged in file make.log
+- @${MAKE} mains 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
++ ${MAKE} mains
+
+ tcl:
+- @echo --- errors and warnings logged in file make.log
+- @${MAKE} tcllibrary 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
++ ${MAKE} tcllibrary
+
+ force: clean all
+
+@@ -36,12 +34,12 @@
+ tcllibrary: database/database.h modules
+ @echo --- making Tcl shared libraries
+ for dir in ${PROGRAMS}; do \
+- (cd $$dir && ${MAKE} tcl-main); done
++ ${MAKE} -C $$dir tcl-main || exit 1 ; done
+
+ mains: database/database.h modules libs
+ @echo --- making main programs
+ for dir in ${PROGRAMS}; do \
+- (cd $$dir && ${MAKE} main); done
++ ${MAKE} -C $$dir main || exit 1 ; done
+
+ database/database.h: database/database.h.in
+ @echo --- making header file database/database.h
+@@ -50,30 +48,30 @@
+ modules:
+ @echo --- making modules
+ for dir in ${MODULES} ${PROGRAMS}; do \
+- (cd $$dir && ${MAKE} module); done
++ ${MAKE} -C $$dir module || exit 1 ; done
+
+ libs:
+ @echo --- making libraries
+ for dir in ${LIBRARIES}; do \
+- (cd $$dir && ${MAKE} lib); done
++ ${MAKE} -C $$dir lib || exit 1 ; done
+
+ depend: database/database.h
+ ${RM} */Depend
+ for dir in ${MODULES} ${UNUSED_MODULES} ${PROGRAMS}; do \
+- (cd $$dir && ${MAKE} depend); done
++ ${MAKE} -C $$dir depend || exit 1 ; done
+
+ install: $(INSTALL_TARGET)
+
+ install-magic:
+ @echo --- installing executable to $(DESTDIR)${BINDIR}
+ @echo --- installing runtime files to $(DESTDIR)${LIBDIR}
+- @${MAKE} install-real 2>&1 >> install.log
++ @${MAKE} install-real 2>&1
+
+ install-real: install-dirs
+ for dir in ${INSTALL_CAD_DIRS}; do \
+- (cd $$dir && ${MAKE} install); done
++ ${MAKE} -C $$dir install || exit 1 ; done
+ for dir in ${PROGRAMS}; do \
+- (cd $$dir && ${MAKE} install); done
++ ${MAKE} -C $$dir install || exit 1 ; done
+
+ install-tcl-dirs:
+ ${MAGICDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR} \
+@@ -86,11 +84,11 @@
+ install-tcl:
+ @echo --- installing executable to $(DESTDIR)${BINDIR}
+ @echo --- installing runtime files to $(DESTDIR)${LIBDIR}
+- @${MAKE} install-tcl-real 2>&1 >> install.log
++ @${MAKE} install-tcl-real
+
+ install-tcl-real: install-tcl-dirs
+ for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \
+- (cd $$dir && ${MAKE} install-tcl); done
++ ${MAKE} -C $$dir install-tcl || exit 1 ; done
+
+ clean:
+ for dir in ${MODULES} ${PROGRAMS} ${TECH} ${UNUSED_MODULES}; do \
View
16 cad/magic/files/patch-commands__Makefile
@@ -0,0 +1,16 @@
+--- commands/Makefile.orig 2006-05-24 04:18:33.000000000 +0900
++++ commands/Makefile 2012-01-17 02:11:59.000000000 +0900
+@@ -10,12 +10,7 @@
+ # Force the module to regenerate the symbolic link in the readline
+ # directory, as it may be needed by CmdFI.c (in the non-Tcl compile)
+
+-module: ${MAGICDIR}/readline/readline lib${MODULE}.o
+-
+-${MAGICDIR}/readline/readline:
+- @if ( ! test -f ${MAGICDIR}/readline/readline ) ; then \
+- (cd ${MAGICDIR}/readline; ln -s `ls | grep readline` readline) ; \
+- fi
++module: lib${MODULE}.o
+
+ include ${MAGICDIR}/defs.mak
+ include ${MAGICDIR}/rules.mak
View
11 cad/magic/files/patch-textio__textioInt.h
@@ -0,0 +1,11 @@
+--- textio/textioInt.h.orig 2006-04-11 07:03:13.000000000 +0900
++++ textio/textioInt.h 2012-01-17 02:37:35.000000000 +0900
+@@ -41,7 +41,7 @@
+ #define TX_CMD_PROMPT ":"
+
+ /* all of the state associated with a tty terminal */
+-#if !defined(SYSV) && !defined(CYGWIN)
++#if !defined(SYSV) && !defined(CYGWIN) && !defined(__FreeBSD__)
+ typedef struct {
+ struct sgttyb tx_i_sgtty;
+ struct tchars tx_i_tchars;
View
89 cad/magic/files/patch-textio__txInput.c
@@ -0,0 +1,89 @@
+--- textio/txInput.c.orig 2012-01-17 02:40:11.000000000 +0900
++++ textio/txInput.c 2012-01-17 02:45:26.000000000 +0900
+@@ -1204,14 +1204,14 @@
+ * ----------------------------------------------------------------------------
+ */
+
+-#if defined(SYSV) || defined(CYGWIN)
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+
+ void
+ txGetTermState(buf)
+- struct termio *buf;
++ struct termios *buf;
+
+ {
+- ioctl( fileno( stdin ), TCGETA, buf);
++ ioctl( fileno( stdin ), TIOCGETA, buf);
+ }
+
+ #else
+@@ -1244,14 +1244,14 @@
+
+ void
+ txSetTermState(buf)
+-#if defined(SYSV) || defined(CYGWIN)
+- struct termio *buf;
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
++ struct termios *buf;
+ #else
+ txTermState *buf;
+ #endif /* SYSV */
+ {
+-#if defined(SYSV) || defined(CYGWIN)
+- ioctl( fileno(stdin), TCSETAF, buf );
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
++ ioctl( fileno(stdin), TIOCSETAF, buf );
+ #else
+ /* set the current terminal characteristics */
+ (void) ioctl(fileno(stdin), TIOCSETN, (char *) &(buf->tx_i_sgtty) );
+@@ -1279,13 +1279,13 @@
+
+ void
+ txInitTermRec(buf)
+-#if defined(SYSV) || defined(CYGWIN)
+- struct termio *buf;
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
++ struct termios *buf;
+ #else
+ txTermState *buf;
+ #endif /* SYSV */
+ {
+-#if defined(SYSV) || defined(CYGWIN)
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+ buf->c_lflag = ISIG; /* raw: no echo and no processing, allow signals */
+ buf->c_cc[ VMIN ] = 1;
+ buf->c_cc[ VTIME ] = 0;
+@@ -1300,8 +1300,8 @@
+
+
+
+-#if defined(SYSV) || defined(CYGWIN)
+-struct termio closeTermState;
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
++struct termios closeTermState;
+ #else
+ static txTermState closeTermState;
+ #endif /* SYSV */
+@@ -1327,8 +1327,8 @@
+ void
+ txSaveTerm()
+ {
+-#if defined(SYSV) || defined(CYGWIN)
+- ioctl( fileno( stdin ), TCGETA, &closeTermState);
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
++ ioctl( fileno( stdin ), TIOCGETA, &closeTermState);
+ txEraseChar = closeTermState.c_cc[VERASE];
+ txKillChar = closeTermState.c_cc[VKILL];
+ TxEOFChar = closeTermState.c_cc[VEOF];
+@@ -1368,8 +1368,8 @@
+ void
+ TxSetTerminal()
+ {
+-#if defined(SYSV) || defined(CYGWIN)
+- struct termio buf;
++#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
++ struct termios buf;
+ #else
+ txTermState buf;
+ #endif /* SYSV */
View
8 cad/magic/pkg-plist
@@ -232,9 +232,11 @@ lib/magic/doc/tuttcl3.ps
lib/magic/doc/tuttcl4.ps
lib/magic/doc/tuttcl5.ps
lib/magic/doc/tutwrl1.ps
+lib/magic/sys/.magicrc
lib/magic/sys/bw.glyphs
lib/magic/sys/color.glyphs
lib/magic/sys/gdsquery.tech
+lib/magic/sys/magicps.pro
lib/magic/sys/minimum.tech
lib/magic/sys/mos.24bit.dstyle
lib/magic/sys/mos.24bit.std.cmap
@@ -255,6 +257,11 @@ lib/magic/sys/windows11.glyphs
lib/magic/sys/windows14.glyphs
lib/magic/sys/windows22.glyphs
lib/magic/sys/windows7.glyphs
+lib/magic/tcl/bitmaps/down.xbm
+lib/magic/tcl/bitmaps/left.xbm
+lib/magic/tcl/bitmaps/right.xbm
+lib/magic/tcl/bitmaps/up.xbm
+lib/magic/tcl/bitmaps/zoom.xbm
lib/magic/tcl/console.tcl
lib/magic/tcl/exttosim.so
lib/magic/tcl/exttospice.so
@@ -263,6 +270,7 @@ lib/magic/tcl/magicdnull
lib/magic/tcl/magicexec
lib/magic/tcl/mazeroute.tcl
lib/magic/tcl/strip_reflibs.tcl
+lib/magic/tcl/tclmagic.so
lib/magic/tcl/techbuilder.tcl
lib/magic/tcl/tkcon.tcl
lib/magic/tcl/tkshell.tcl
Please sign in to comment.
Something went wrong with that request. Please try again.