Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv23961/10.4/stable/main/finkinfo/sci
Modified Files: xcircuit.info xcircuit.patch Added Files: xcircuit-testing.info Log Message: New upstream xcircuits. All deps are available in stable now, so we can get move it out of unstable. --- NEW FILE: xcircuit-testing.info --- Package: xcircuit-testing Version: 3.8.4 Revision: 1 Depends: x11, x11-shlibs, ghostscript | ghostscript-nox, tcltk, tcltk-shlibs, app-defaults, ngspice BuildDepends: m4, tcltk-dev, x11-dev, fink (>=0.28.0-1) Conflicts: xcircuit Replaces: xcircuit Source: http://opencircuitdesign.com/xcircuit/archive/xcircuit-%v.tgz Source-MD5: 5fbbd0ff89ceb27f82f6412a3f9fd8e1 PatchFile: xcircuit.patch PatchFile-MD5: 760c8f976dc5e8cb6c22c9b37229ba8d PatchScript: sed -e 's/@MAJOR_VERSION@/3.8/' %{PatchFile} | patch -p1 ConfigureParams: << --with-gnu-ld --x-libraries=/usr/X11/lib --x-includes=/usr/X11/include --with-ngspice=%p \ --enable-optimize << SetCFLAGS: -I/usr/X11/include -fno-common InstallScript: << #!/bin/sh -ev make install DESTDIR=%d mkdir -p %i/share/man/man1 mv %i/lib/xcircuit-3.8/man/xcircuit.1 %i/share/man/man1 rm -r %i/lib/xcircuit-3.8/man mkdir -p %i/etc/app-defaults mv %i/lib/xcircuit-3.8/app-defaults/XCircuit %i/etc/app-defaults rm -r %i/lib/xcircuit-3.8/app-defaults ./mkinstalldirs %i/lib/xcircuit-3.8/python for i in spice gettext pagebbox ; do install -c -m 644 lib/python/$i.py %i/lib/xcircuit-3.8/python ; done << Shlibs: !%p/lib/xcircuit-3.8/xcircuit.dylib DocFiles: COPYRIGHT README* TODO CHANGES examples Description: Circuit drawing app with schematic capture DescDetail: << XCircuit is a UNIX/X11 (and now Windows, if you have an X-Server running) program for drawing publishable-quality electrical circuit schematic diagrams and related figures, and produce circuit netlists through schematic capture. XCircuit regards circuits as inherently hierarchical, and writes both hierarchical PostScript output and hierarchical SPICE netlists. Circuit components are saved in and retrieved from libraries which are fully editable. XCircuit does not separate artistic expression from circuit drawing; it maintains flexiblity in style without compromising the power of schematic capture. XCircuit is flexible enough to be used as a generic program for drawing just about anything, and is competitive with powerful programs such as "xfig". It is especially good for any task requiring repeated use of a standard set of graphical objects, including architectural drawing, printed circuit board layouts, and (my personal favorite) music typography. This package represents the upstream "Development" branch. << DescUsage: << Depending on your X11 environment, dialog boxes can get buried behind the main window. << DescPort: << Needed to add -fno-common to CFLAGS. Added -I/usr/X11/include to CFLAGS because it wouldn't work with CPPFLAGS. This is needed because the linker apparently can't find the X11 headers by default on Fink's xfree86 or xorg. Patch Makefile.in to to make sure that xcircuit.dylb has a proper install_name. << DescPackaging: << 3.8.2-1 and later: unify patch with xcircuit, entailing a PatchScript to differentiate the two cases. 3.6.78-1 and later: includes Python bindings (they come with the tarball) and examples. App-defaults file is installed in a Fink-compliant location. Move manpage to Fink-compliant location in the InstallScript. Prior versions by Max Horn. << Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net> Homepage: http://opencircuitdesign.com/xcircuit/ License: GPL Index: xcircuit.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/xcircuit.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- xcircuit.info 27 Oct 2009 15:09:09 -0000 1.9 +++ xcircuit.info 27 Jan 2012 19:11:16 -0000 1.10 @@ -1,36 +1,35 @@ Package: xcircuit -Version: 3.4.30 +Version: 3.7.27 Revision: 1 -Depends: x11, x11-shlibs, ghostscript, tcltk, tcltk-shlibs, app-defaults -BuildDepends: m4, tcltk-dev, x11-dev, fink (>=0.28.0-1), xmkmf (>= 1.0.2-3) +Depends: x11, x11-shlibs, ghostscript | ghostscript-nox, tcltk, tcltk-shlibs, app-defaults, ngspice +BuildDepends: m4, tcltk-dev, x11-dev, fink (>=0.28.0-1) Conflicts: xcircuit-testing Replaces: xcircuit-testing Source: http://opencircuitdesign.com/xcircuit/archive/%n-%v.tgz -Source-MD5: adabfa8432ad4c95344d12a821902e81 +Source-MD5: 4595e847801b0bbda26c13253c85c58c PatchFile: %n.patch -PatchFIle-MD5: 5abce223428a5245ac0941ecba7a5e2a +PatchFile-MD5: 760c8f976dc5e8cb6c22c9b37229ba8d +PatchScript: sed -e 's/@MAJOR_VERSION@/3.7/' %{PatchFile} | patch -p1 ConfigureParams: << ---with-gnu-ld --mandir=%p/share/man --disable-dependency-tracking +--with-gnu-ld --x-libraries=/usr/X11R6/lib --x-includes=/usr/X11R6/include --with-ngspice=%p \ +--enable-optimize << SetCFLAGS: -I/usr/X11R6/include -fno-common -CompileScript: << -#!/bin/sh -ev - export PATH=%p/lib/xmkmf/bin:$PATH - ./configure %c - make -<< InstallScript: << #!/bin/sh -ev make install DESTDIR=%d +mkdir -p %i/share/man/man1 +mv %i/lib/xcircuit-3.7/man/xcircuit.1 %i/share/man/man1 +rm -r %i/lib/xcircuit-3.7/man mkdir -p %i/etc/app-defaults -mv %i/lib/xcircuit-3.4/app-defaults/XCircuit %i/etc/app-defaults -rm -r %i/lib/xcircuit-3.4/app-defaults -./mkinstalldirs %i/lib/xcircuit-3.4/python +mv %i/lib/xcircuit-3.7/app-defaults/XCircuit %i/etc/app-defaults +rm -r %i/lib/xcircuit-3.7/app-defaults +./mkinstalldirs %i/lib/xcircuit-3.7/python for i in spice gettext pagebbox ; -do install -c -m 644 lib/python/$i.py %i/lib/xcircuit-3.4/python ; +do install -c -m 644 lib/python/$i.py %i/lib/xcircuit-3.7/python ; done << -Shlibs: !%p/lib/xcircuit-3.4/xcircuit.dylib +Shlibs: !%p/lib/xcircuit-3.7/xcircuit.dylib DocFiles: COPYRIGHT README* TODO CHANGES examples Description: Circuit drawing app with schematic capture DescDetail: << @@ -58,16 +57,25 @@ << DescPort: << Needed to add -fno-common to CFLAGS. + Added -I/usr/X11R6/include to CFLAGS because it wouldn't work with CPPFLAGS. This is needed because the linker apparently can't find -the X11 headers by default on XFree86 or Xorg. -Patch Makefile.in to install manpage in Fink-appropriate location because -Makefile doesn't honor --mandir=foo and to make sure that xcircuit.dylb +the X11 headers by default on Fink's xfree86 or xorg. + +Patch Makefile.in to to make sure that xcircuit.dylb has a proper install_name. << DescPackaging: << +3.8.2-1 and later: unify patch with xcircuit, entailing a PatchScript to differentiate +the two cases. + 3.4.26-3 and later: includes Python bindings (they come with the tarball) and -examples. App-defaults file is installed in a Fink-compliant location. +examples. + +App-defaults file is installed in a Fink-compliant location. + +Move manpage to Fink-compliant location in the InstallScript. + Prior versions by Max Horn. << Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net> Index: xcircuit.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/xcircuit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xcircuit.patch 3 Sep 2006 13:47:14 -0000 1.1 +++ xcircuit.patch 27 Jan 2012 19:11:16 -0000 1.2 @@ -1,20 +1,12 @@ ---- xcircuit-3.4.16/Makefile.in 2006-02-23 15:58:51.000000000 -0500 -+++ xcircuit-3.4.16.patched/Makefile.in 2006-02-25 21:34:45.000000000 -0500 -@@ -239,7 +239,7 @@ - - # Directories for app-defaults file and manual page - appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults --appmandir = $(datadir)/$(PACKAGE)-$(VERSION)/man -+appmandir = $(man1dir) - PATHNAMES = -DPROG_VERSION=$(VERSION) \ - -DPROG_REVISION=$(REVISION) \ - -DCAD_DIR=\"$(libdir)\" \ -@@ -791,7 +791,7 @@ +diff -Naur xcircuit-3.7.26/Makefile.in xcircuit-3.7.26.patched//Makefile.in +--- xcircuit-3.7.26/Makefile.in 2009-11-06 22:26:53.000000000 -0500 ++++ xcircuit-3.7.26.patched//Makefile.in 2011-04-14 08:27:42.000000000 -0400 +@@ -638,7 +638,7 @@ lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND} $(RM) lib/xcircuit${SHDLIB_EXT} - $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \ -+ $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ -install_name $(libdir)/xcircuit-3.4/xcircuit${SHDLIB_EXT} ${LDDL_FLAGS} xcwrap.o \ - ${xcircuit_OBJECTS} ${xcircuit_LDADD} ${LDFLAGS} \ - ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} ${EXTRA_LIB_SPECS} \ - ${SHLIB_LIB_SPECS} ++ $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ -install_name $(libdir)/xcircuit-@MAJOR_VERSION@/xcircuit${SHDLIB_EXT} ${LDDL_FLAGS} xcwrap.o \ + ${xcircuit_OBJECTS} ${xcircuit_LDADD} ${SHLIB_LIB_SPECS} \ + ${LDFLAGS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} \ + ${EXTRA_LIB_SPECS} ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs