From 633e4f1bc175d5adc17dbf4ee3d257e2161e438e Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 24 Mar 2006 17:30:34 +0000 Subject: [PATCH] update to xcircuit 3.4.21 remove patches as they were taken up by the author joint work with and ok maintainer Zvezdan Petkovic --- cad/xcircuit/Makefile | 13 ++++---- cad/xcircuit/distinfo | 8 ++--- cad/xcircuit/patches/patch-Makefile_in | 21 ------------- cad/xcircuit/patches/patch-configure_in | 12 -------- cad/xcircuit/pkg/PLIST | 40 +++++++++++++++++++++++-- 5 files changed, 48 insertions(+), 46 deletions(-) delete mode 100644 cad/xcircuit/patches/patch-Makefile_in delete mode 100644 cad/xcircuit/patches/patch-configure_in diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index cb61637530d..48dd68be9d8 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2006/02/17 22:08:52 steven Exp $ +# $OpenBSD: Makefile,v 1.4 2006/03/24 17:30:34 steven Exp $ SHARED_ONLY= Yes COMMENT= "circuit drawing and schematic capture" BASEVER= 3.4 -DISTNAME= xcircuit-${BASEVER}.11 -PKGNAME= ${DISTNAME}p1 +DISTNAME= xcircuit-${BASEVER}.21 CATEGORIES= cad HOMEPAGE= http://opencircuitdesign.com/xcircuit/ @@ -40,11 +39,13 @@ NO_REGRESS= Yes SUBST_VARS= BASEVER post-install: - @cd ${WRKSRC}; ${MAKE} install-man + @cd ${WRKSRC} && ${MAKE} install-man ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcircuit ${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/xcircuit ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xcircuit - ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit - ${INSTALL_DATA} ${WRKSRC}/examples/.xcircuitrc ${PREFIX}/share/examples/xcircuit/dot.xcircuitrc + ${INSTALL_DATA} ${WRKSRC}/examples/*.* \ + ${PREFIX}/share/examples/xcircuit + ${INSTALL_DATA} ${WRKSRC}/examples/.xcircuitrc \ + ${PREFIX}/share/examples/xcircuit/dot.xcircuitrc .include diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo index b0892296c42..2d5b412499b 100644 --- a/cad/xcircuit/distinfo +++ b/cad/xcircuit/distinfo @@ -1,4 +1,4 @@ -MD5 (xcircuit-3.4.11.tgz) = 40343553af00482ebb32ad9ca053a40f -RMD160 (xcircuit-3.4.11.tgz) = 54c9cb18c5ff1d9ac889822937e5c0103f4f14f7 -SHA1 (xcircuit-3.4.11.tgz) = 10a0e9ed2cd3a2ad01fa788ebdb830adef1dd820 -SIZE (xcircuit-3.4.11.tgz) = 983308 +MD5 (xcircuit-3.4.21.tgz) = 940c8fa26fd13b83eaf23055277fff58 +RMD160 (xcircuit-3.4.21.tgz) = cf3e37264d9ba8124e0d048b36f7038180e20b40 +SHA1 (xcircuit-3.4.21.tgz) = 203e32dfd012722a88c02c15185309bee71808e7 +SIZE (xcircuit-3.4.21.tgz) = 1107187 diff --git a/cad/xcircuit/patches/patch-Makefile_in b/cad/xcircuit/patches/patch-Makefile_in deleted file mode 100644 index 16f2cbf6249..00000000000 --- a/cad/xcircuit/patches/patch-Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2006/02/17 22:08:52 steven Exp $ ---- Makefile.in.orig Mon Nov 21 22:35:37 2005 -+++ Makefile.in Sun Feb 12 15:27:26 2006 -@@ -361,7 +361,7 @@ distclean-compile: - -rm -f *.tab.c - - .c.o: -- $(COMPILE) -c $< -+ $(COMPILE) $(SHLIB_CFLAGS) -c $< - - .c.obj: - $(COMPILE) -c `$(CYGPATH_W) '$<'` -@@ -787,7 +787,7 @@ menudep.h: menudep$(EXEEXT) - - xcwrap.o: xcwrap.c menudep.h - $(CC) ${CPPFLAGS} ${CFLAGS} ${DEFS} $(PATHNAMES) $(INCLUDES) \ -- xcwrap.c -c -o xcwrap.o -+ ${SHLIB_CFLAGS} xcwrap.c -c -o xcwrap.o - - lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND} - $(RM) lib/xcircuit${SHDLIB_EXT} diff --git a/cad/xcircuit/patches/patch-configure_in b/cad/xcircuit/patches/patch-configure_in deleted file mode 100644 index feee4c43cc5..00000000000 --- a/cad/xcircuit/patches/patch-configure_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.1 2006/02/17 22:08:52 steven Exp $ ---- configure.in.orig Mon Nov 21 22:02:02 2005 -+++ configure.in Fri Feb 17 01:13:20 2006 -@@ -1006,7 +1006,7 @@ if test "x$xc_with_tcl" != "x" ; then - if test "$test_ok" = yes; then - SHLIB_CFLAGS="-fpic" - SHLIB_LD="ld" -- LDDL_FLAGS="-Wl,-Bshareable,-x" -+ LDDL_FLAGS="-shared" - fi - ;; - diff --git a/cad/xcircuit/pkg/PLIST b/cad/xcircuit/pkg/PLIST index 6993ef18b1c..4136b9d9aad 100644 --- a/cad/xcircuit/pkg/PLIST +++ b/cad/xcircuit/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2006/01/29 09:49:57 sturm Exp $ +@comment $OpenBSD: PLIST,v 1.3 2006/03/24 17:30:34 steven Exp $ bin/xcircuit lib/xcircuit-${BASEVER}/ lib/xcircuit-${BASEVER}/analog.lps @@ -49,30 +49,55 @@ lib/xcircuit-${BASEVER}/pcb.lps lib/xcircuit-${BASEVER}/pcb_layout.lps lib/xcircuit-${BASEVER}/pcbout.tcl lib/xcircuit-${BASEVER}/pixmaps/ +lib/xcircuit-${BASEVER}/pixmaps/a.gif lib/xcircuit-${BASEVER}/pixmaps/a.xpm +lib/xcircuit-${BASEVER}/pixmaps/b.gif lib/xcircuit-${BASEVER}/pixmaps/b.xpm +lib/xcircuit-${BASEVER}/pixmaps/bd.gif lib/xcircuit-${BASEVER}/pixmaps/bd.xpm +lib/xcircuit-${BASEVER}/pixmaps/ccw.gif lib/xcircuit-${BASEVER}/pixmaps/ccw.xpm +lib/xcircuit-${BASEVER}/pixmaps/co.gif lib/xcircuit-${BASEVER}/pixmaps/co.xpm +lib/xcircuit-${BASEVER}/pixmaps/cp.gif lib/xcircuit-${BASEVER}/pixmaps/cp.xpm +lib/xcircuit-${BASEVER}/pixmaps/cw.gif lib/xcircuit-${BASEVER}/pixmaps/cw.xpm +lib/xcircuit-${BASEVER}/pixmaps/d2.gif lib/xcircuit-${BASEVER}/pixmaps/d2.xpm +lib/xcircuit-${BASEVER}/pixmaps/e.gif lib/xcircuit-${BASEVER}/pixmaps/e.xpm +lib/xcircuit-${BASEVER}/pixmaps/fi.gif lib/xcircuit-${BASEVER}/pixmaps/fi.xpm +lib/xcircuit-${BASEVER}/pixmaps/fx.gif lib/xcircuit-${BASEVER}/pixmaps/fx.xpm +lib/xcircuit-${BASEVER}/pixmaps/fy.gif lib/xcircuit-${BASEVER}/pixmaps/fy.xpm +lib/xcircuit-${BASEVER}/pixmaps/i.gif lib/xcircuit-${BASEVER}/pixmaps/i.xpm +lib/xcircuit-${BASEVER}/pixmaps/li.gif lib/xcircuit-${BASEVER}/pixmaps/li.xpm +lib/xcircuit-${BASEVER}/pixmaps/mk.gif lib/xcircuit-${BASEVER}/pixmaps/mk.xpm +lib/xcircuit-${BASEVER}/pixmaps/mv.gif lib/xcircuit-${BASEVER}/pixmaps/mv.xpm +lib/xcircuit-${BASEVER}/pixmaps/pa.gif lib/xcircuit-${BASEVER}/pixmaps/pa.xpm +lib/xcircuit-${BASEVER}/pixmaps/pl.gif lib/xcircuit-${BASEVER}/pixmaps/pl.xpm +lib/xcircuit-${BASEVER}/pixmaps/pm.gif lib/xcircuit-${BASEVER}/pixmaps/pm.xpm +lib/xcircuit-${BASEVER}/pixmaps/pn.gif lib/xcircuit-${BASEVER}/pixmaps/pn.xpm +lib/xcircuit-${BASEVER}/pixmaps/po2.gif lib/xcircuit-${BASEVER}/pixmaps/po2.xpm +lib/xcircuit-${BASEVER}/pixmaps/pu2.gif lib/xcircuit-${BASEVER}/pixmaps/pu2.xpm +lib/xcircuit-${BASEVER}/pixmaps/pz.gif lib/xcircuit-${BASEVER}/pixmaps/pz.xpm +lib/xcircuit-${BASEVER}/pixmaps/q.gif lib/xcircuit-${BASEVER}/pixmaps/q.xpm +lib/xcircuit-${BASEVER}/pixmaps/s.gif lib/xcircuit-${BASEVER}/pixmaps/s.xpm lib/xcircuit-${BASEVER}/pixmaps/solid.xbm lib/xcircuit-${BASEVER}/pixmaps/stip12.xbm @@ -82,15 +107,26 @@ lib/xcircuit-${BASEVER}/pixmaps/stip50.xbm lib/xcircuit-${BASEVER}/pixmaps/stip62.xbm lib/xcircuit-${BASEVER}/pixmaps/stip75.xbm lib/xcircuit-${BASEVER}/pixmaps/stip88.xbm +lib/xcircuit-${BASEVER}/pixmaps/t.gif lib/xcircuit-${BASEVER}/pixmaps/t.xpm +lib/xcircuit-${BASEVER}/pixmaps/tg.gif lib/xcircuit-${BASEVER}/pixmaps/tg.xpm +lib/xcircuit-${BASEVER}/pixmaps/ti.gif lib/xcircuit-${BASEVER}/pixmaps/ti.xpm +lib/xcircuit-${BASEVER}/pixmaps/tp.gif lib/xcircuit-${BASEVER}/pixmaps/tp.xpm +lib/xcircuit-${BASEVER}/pixmaps/uj.gif lib/xcircuit-${BASEVER}/pixmaps/uj.xpm +lib/xcircuit-${BASEVER}/pixmaps/w.gif lib/xcircuit-${BASEVER}/pixmaps/w.xpm +lib/xcircuit-${BASEVER}/pixmaps/xcircuit.gif +lib/xcircuit-${BASEVER}/pixmaps/xcircuit.ico lib/xcircuit-${BASEVER}/pixmaps/xcircuit.xpm +lib/xcircuit-${BASEVER}/pixmaps/yp.gif lib/xcircuit-${BASEVER}/pixmaps/yp.xpm +lib/xcircuit-${BASEVER}/pixmaps/z4.gif lib/xcircuit-${BASEVER}/pixmaps/z4.xpm +lib/xcircuit-${BASEVER}/pixmaps/z5.gif lib/xcircuit-${BASEVER}/pixmaps/z5.xpm lib/xcircuit-${BASEVER}/quadparts.lps lib/xcircuit-${BASEVER}/resource.tcl @@ -126,10 +162,8 @@ share/examples/xcircuit/envelope.ps share/examples/xcircuit/fourttest.ps share/examples/xcircuit/logic.sim share/examples/xcircuit/logic8.ps -share/examples/xcircuit/panzoom.py share/examples/xcircuit/prelude.ps share/examples/xcircuit/systemd1.lgf -share/examples/xcircuit/test.py share/examples/xcircuit/threestage.ps share/examples/xcircuit/vcoblock.ps share/examples/xcircuit/xcclock.ps