summaryrefslogtreecommitdiffstats
path: root/cad
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2004-04-02 19:00:08 +0000
committerkrion <krion@FreeBSD.org>2004-04-02 19:00:08 +0000
commit6c60cc54937d8d11733f2ba11b9a86f0238d5fa0 (patch)
tree631bedf9bfeb287b0096352a32ffacdc584fee09 /cad
parent793ebec7dba68e2c4490d839b6b321a23ce88c3a (diff)
downloadFreeBSD-ports-6c60cc54937d8d11733f2ba11b9a86f0238d5fa0.zip
FreeBSD-ports-6c60cc54937d8d11733f2ba11b9a86f0238d5fa0.tar.gz
- Update to version 3.1.38
PR: ports/65077 Submitted by: Ports Fury
Diffstat (limited to 'cad')
-rw-r--r--cad/xcircuit/Makefile29
-rw-r--r--cad/xcircuit/distinfo4
-rw-r--r--cad/xcircuit/files/patch-Makefile.in6
-rw-r--r--cad/xcircuit/pkg-plist136
4 files changed, 76 insertions, 99 deletions
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index b8244b6..11fd808 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xcircuit
-PORTVERSION= 3.1.18
-PORTREVISION= 2
+PORTVERSION= 3.1.38
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/
@@ -18,6 +17,7 @@ COMMENT= An X11 drawing program [especially for circuit schematics]
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
+USE_GHOSTSCRIPT_RUN= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -26,8 +26,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
-USE_GHOSTSCRIPT_RUN= yes
-
WISH= ${LOCALBASE}/bin/wish8.4
.if defined(WITH_TCLTK)
@@ -37,21 +35,12 @@ CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \
--with-tk=${LOCALBASE}/lib/tk8.4
ALL_TARGET= tcl
INSTALL_TARGET= install-tcl
-PLIST_SUB+= PYTHON="@comment " NOPYTHON="" TCLTK="" NOTCLTK="@comment "
+PLIST_SUB+= TCLTK="" NOTCLTK="@comment "
CFLAGS+= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 \
-I${X11BASE}/include
.else
MAN1+= xcircuit.1
-.if defined(WITH_PYTHON)
-PKGNAMESUFFIX= -python
-USE_PYTHON= yes
-CONFIGURE_ARGS+= --with-python
-CPPFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LIBS}
-PLIST_SUB+= PYTHON="" NOPYTHON="@comment " TCLTK="@comment " NOTCLTK=""
-.else
-PLIST_SUB+= PYTHON="@comment " NOPYTHON="" TCLTK="@comment " NOTCLTK=""
-.endif
+PLIST_SUB+= TCLTK="@comment " NOTCLTK=""
.endif
pre-everything::
@@ -67,12 +56,6 @@ pre-everything::
@${ECHO_MSG} " (prevents python support)"
@${ECHO_MSG} ""
.endif
-.if !defined(WITH_PYTHON)
- @${ECHO_MSG} ""
- @${ECHO_MSG} " Or define WITH_PYTHON for Python support"
- @${ECHO_MSG} " (only available without WITH_TCLTK defined)"
- @${ECHO_MSG} ""
-.endif
post-patch:
@${REINPLACE_CMD} -e 's|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl84"|g ; \
@@ -84,8 +67,8 @@ post-patch:
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${EXAMPLESDIR}
- ${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . | \
- ${TAR} -C ${EXAMPLESDIR} --unlink -xf -
+ ${TAR} -C ${WRKSRC}/examples --exclude "CVS" --exclude "*.py" \
+ -cf - . | ${TAR} -C ${EXAMPLESDIR} --unlink -xf -
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
.endif
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index b7ca1ca..b803d75 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,2 +1,2 @@
-MD5 (xcircuit-3.1.18.tar.bz2) = 37372d7e05b876f092dc0ccd138846ef
-SIZE (xcircuit-3.1.18.tar.bz2) = 652179
+MD5 (xcircuit-3.1.38.tar.bz2) = c7c852061d04f026fcacc58314c8654e
+SIZE (xcircuit-3.1.38.tar.bz2) = 716708
diff --git a/cad/xcircuit/files/patch-Makefile.in b/cad/xcircuit/files/patch-Makefile.in
index 1bf5563..49316f6 100644
--- a/cad/xcircuit/files/patch-Makefile.in
+++ b/cad/xcircuit/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon Jul 14 23:52:38 2003
-+++ Makefile.in Sun Jul 27 22:04:59 2003
+--- Makefile.in.orig Fri Nov 7 05:44:51 2003
++++ Makefile.in Fri Nov 14 00:00:39 2003
@@ -168,7 +168,7 @@
tmpdir = /tmp
@@ -23,7 +23,7 @@
lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
$(RM) lib/xcircuit${SHDLIB_EXT}
- $(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
-+ $(LD) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
++ $(LD) ${LDFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
tcl: lib/tcl/xcircuit${SHDLIB_EXT}
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index 7d045c2..c498489 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -1,11 +1,11 @@
@comment $FreeBSD$
bin/xcircuit
lib/X11/app-defaults/XCircuit
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/.wishrc
+%%TCLTK%%lib/X11/xcircuit/.wishrc
lib/X11/xcircuit/analog.lps
lib/X11/xcircuit/analoglib2.lps
lib/X11/xcircuit/avlsi.lps
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/console.tcl
+%%TCLTK%%lib/X11/xcircuit/console.tcl
lib/X11/xcircuit/digital.lps
lib/X11/xcircuit/fonts/courier.lps
lib/X11/xcircuit/fonts/courier.xfe
@@ -36,76 +36,70 @@ lib/X11/xcircuit/generic.lps
lib/X11/xcircuit/ic_templates.lps
lib/X11/xcircuit/lgf.lps
lib/X11/xcircuit/musiclib.lps
-%%PYTHON%%%%NOTCLTK%%lib/X11/xcircuit/python/gettext.py
-%%PYTHON%%%%NOTCLTK%%lib/X11/xcircuit/python/pagebbox.py
-%%PYTHON%%%%NOTCLTK%%lib/X11/xcircuit/python/spice.py
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/a.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/b.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/bd.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/ccw.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/co.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/cp.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/cw.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/d2.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/e.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/fi.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/fx.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/fy.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/i.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/li.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/mk.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/pl.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/pm.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/po2.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/pu2.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/pz.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/q.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/s.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/solid.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/stip12.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/stip25.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/stip38.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/stip50.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/stip62.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/stip75.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/stip88.xbm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/t.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/uj.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/xcircuit.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/yp.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/z4.xpm
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/pixmaps/z5.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/a.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/b.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/bd.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/ccw.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/co.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/cp.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/cw.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/d2.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/e.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/fi.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/fx.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/fy.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/i.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/li.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/mk.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/pl.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/pm.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/po2.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/pu2.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/pz.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/q.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/s.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/solid.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/stip12.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/stip25.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/stip38.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/stip50.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/stip62.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/stip75.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/stip88.xbm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/t.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/uj.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/xcircuit.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/yp.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/z4.xpm
+%%TCLTK%%lib/X11/xcircuit/pixmaps/z5.xpm
lib/X11/xcircuit/quadparts.lps
lib/X11/xcircuit/signal.lps
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/tkcon.tcl
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/wrapper.tcl
-%%PYTHON%%%%NOTCLTK%%lib/X11/xcircuit/xcircps2.pro
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/xcircuit.so
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/xcircuit.tcl
-%%NOTCLTK%%%%NOPYTHON%%lib/X11/xcircuit/startup.script
-%%NOPYTHON%%lib/X11/xcircuit/xcircps2.pro
-%%PYTHON%%%%NOTCLTK%%lib/X11/xcircuit/xcstartup.py
-%%NOPYTHON%%%%TCLTK%%lib/X11/xcircuit/xcstartup.tcl
-%%PORTDOCS%%share/examples/xcircuit/.xcircuitrc
-%%PORTDOCS%%share/examples/xcircuit/FlareLED.ps
-%%PORTDOCS%%share/examples/xcircuit/USAflag.ps
-%%PORTDOCS%%share/examples/xcircuit/analog1.ps
-%%PORTDOCS%%share/examples/xcircuit/analog2.ps
-%%PORTDOCS%%share/examples/xcircuit/analoglib1.lps
-%%PORTDOCS%%share/examples/xcircuit/border.ps
-%%PORTDOCS%%share/examples/xcircuit/diffamp_test.ps
-%%PORTDOCS%%share/examples/xcircuit/diffamp_test2.ps
-%%PORTDOCS%%share/examples/xcircuit/envelope.ps
-%%PORTDOCS%%share/examples/xcircuit/fourttest.ps
-%%PORTDOCS%%share/examples/xcircuit/logic8.ps
-%%PORTDOCS%%share/examples/xcircuit/panzoom.py
-%%PORTDOCS%%share/examples/xcircuit/prelude.ps
-%%PORTDOCS%%share/examples/xcircuit/systemd1.lgf
-%%PORTDOCS%%share/examples/xcircuit/test.py
-%%PORTDOCS%%share/examples/xcircuit/threestage.ps
-%%PORTDOCS%%share/examples/xcircuit/vcoblock.ps
-%%PORTDOCS%%@dirrm share/examples/xcircuit
-%%PYTHON%%%%NOTCLTK%%@dirrm lib/X11/xcircuit/python
-%%NOPYTHON%%%%TCLTK%%@dirrm lib/X11/xcircuit/pixmaps
+%%TCLTK%%lib/X11/xcircuit/tkcon.tcl
+%%TCLTK%%lib/X11/xcircuit/wrapper.tcl
+%%TCLTK%%lib/X11/xcircuit/xcircuit.so
+%%TCLTK%%lib/X11/xcircuit/xcircuit.tcl
+%%NOTCLTK%%lib/X11/xcircuit/startup.script
+lib/X11/xcircuit/xcircps2.pro
+%%TCLTK%%lib/X11/xcircuit/xcstartup.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/.xcircuitrc
+%%PORTDOCS%%%%EXAMPLESDIR%%/FlareLED.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/USAflag.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/analog1.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/analog2.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/analoglib1.lps
+%%PORTDOCS%%%%EXAMPLESDIR%%/border.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test2.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test3.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/envelope.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/fourttest.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/logic8.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/prelude.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/systemd1.lgf
+%%PORTDOCS%%%%EXAMPLESDIR%%/threestage.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/vcoblock.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/xcclock.ps
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%TCLTK%%@dirrm lib/X11/xcircuit/pixmaps
@dirrm lib/X11/xcircuit/fonts
@dirrm lib/X11/xcircuit
OpenPOWER on IntegriCloud