ports/52680: update to cad/xcircuit
Pedro F. Giffuni
giffunip at yahoo.com
Sun May 25 23:10:11 UTC 2003
>Number: 52680
>Category: ports
>Synopsis: update to cad/xcircuit
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun May 25 16:10:09 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Pedro F. Giffuni
>Release: FreeBSD 5.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD giffuni.org 5.0-RELEASE FreeBSD 5.0-RELEASE #3:
Wed Apr 16 22:20:49 COT 2003
pedro at giffuni.org:/usr/src/sys/i386/compile/CPQ i386
>Description:
version 3.1.1 of xcircuit now uses Tcl/Tk instead of python and
adds many features wrt to the version in ports. Unfortunately my
Tcl/Tk packages got corrupted somehow so I could only test the
python version (which is still an option).
This version should build and run fine, but if someone wants the
python version back, they can just type make USE_PYTHON=yes
>How-To-Repeat:
There are two other open PR's about xcircuit: PR 47380, is not
the latest version (like this) but it works too.
>Fix:
I'm attaching the patch wrt the current port and the tarball in
uu format, to make it easier to commit.
__________________________________________________
It's Samaritans' Week. Help Samaritans help others.
Call 08709 000032 to give or donate online now at http://www.samaritans.org/support/donations.shtm
--0-2087524602-1053903856=:18069
Content-Type: text/plain; name=patch-xcircuit
Content-Description: patch-xcircuit
Content-Disposition: inline; filename=patch-xcircuit
diff -ruN xcircuit.orig/Makefile xcircuit/Makefile
--- xcircuit.orig/Makefile Fri May 9 19:48:06 2003
+++ xcircuit/Makefile Sun May 25 16:15:30 2003
@@ -6,31 +6,38 @@
#
PORTNAME= xcircuit
-PORTVERSION= 2.3.3
-PORTEPOCH= 1
+PORTVERSION= 3.1.15
CATEGORIES= cad
MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/
MAINTAINER= ports at FreeBSD.org
COMMENT= An X11 drawing program [especially for circuit schematics]
+DEPENDS= ${LOCALBASE}/lib/tcl8.3/TclConfig.sh:${PORTSDIR}/lang/tcl83 \
+ ${LOCALBASE}/lib/tk8.3/TkConfig.sh:${PORTSDIR}/lang/tk83
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu
-BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+USE_BZIP2= yes
USE_XPM= yes
-USE_IMAKE= yes
-USE_REINPLACE= yes
-XMKMF= xmkmf
+GNU_CONFIGURE= yes
-MAN1= xcircuit.1
+.ifdef USE_PYTHON
+CONFIGURE_ARGS= --with-python
+.else # Tcl/Tk is recommended
+CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.3 \
+ --with-tk=${LOCALBASE}/lib/tk8.3
+.endif
-post-patch:
- @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
- 's|<malloc.h>|<stdlib.h>|g'
+MAN1= xcircuit.1
post-install:
+.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/examples/xcircuit
- ${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . | \
- ${TAR} -C ${PREFIX}/share/examples/xcircuit --unlink -xf -
+ ${CP} ${WRKSRC}/examples/.xcircuitrc ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.lgf ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.lps ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.ps ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.py ${PREFIX}/share/examples/xcircuit
+.endif
.include <bsd.port.mk>
diff -ruN xcircuit.orig/distinfo xcircuit/distinfo
--- xcircuit.orig/distinfo Fri May 9 19:48:06 2003
+++ xcircuit/distinfo Sat May 24 20:46:25 2003
@@ -1 +1 @@
-MD5 (xcircuit-2.3.3.tar.gz) = 766a2d86a66c91acc67b4a361a2fe0e3
+MD5 (xcircuit-3.1.15.tar.bz2) = d63a94dc3f8d8437a605fa35ea78abf0
diff -ruN xcircuit.orig/files/patch-aa xcircuit/files/patch-aa
--- xcircuit.orig/files/patch-aa Sat Oct 6 10:09:38 2001
+++ xcircuit/files/patch-aa Wed Dec 31 19:00:00 1969
@@ -1,86 +0,0 @@
-*** Imakefile.orig Fri Sep 7 03:31:47 2001
---- Imakefile Fri Sep 7 03:44:46 2001
-***************
-*** 28,50 ****
- #CCOPTIONS = -O2
- #
- # for debugging purposes uncomment the following line:
-! CDEBUGFLAGS = -g
-! STD_INCLUDES = -I. -I/usr/X11R6/include/X11
-
- # The "m4" macro processor is used to generate the man page such that
- # the man page reflects the configured options.
-! M4 = m4
-
- #------------------------------------------------------------------------
- # Installation directories:
- # Change the following as desired to suit your environment:
- #------------------------------------------------------------------------
- #
-! PREFIX = /usr/local
- # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
-! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3
-! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
-! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
- XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
-
- #------------------------------------------------------------------------
---- 28,51 ----
- #CCOPTIONS = -O2
- #
- # for debugging purposes uncomment the following line:
-! # CDEBUGFLAGS = -g
-! STD_INCLUDES = -I. -I$(INCDIR)/X11
-! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV
-
- # The "m4" macro processor is used to generate the man page such that
- # the man page reflects the configured options.
-! M4 = gm4
-
- #------------------------------------------------------------------------
- # Installation directories:
- # Change the following as desired to suit your environment:
- #------------------------------------------------------------------------
- #
-! # PREFIX = /usr/local
- # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
-! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
-! XCIRCUIT_BIN_DIR = $(BINDIR)
-! XCIRCUIT_MAN_DIR = $(MANDIR)
- XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
-
- #------------------------------------------------------------------------
-***************
-*** 63,69 ****
- # Support for background rendering through ghostscript. Change this
- # to the path where gs can be found.
- # GS_EXEC= /usr/local/src/gs5.50/obj/gs
-! GS_EXEC= /usr/bin/gs
-
- #------------------------------------------------------------------------
- # Window manager bug workaround---If you don't like xcircuit grabbing kbd
---- 64,70 ----
- # Support for background rendering through ghostscript. Change this
- # to the path where gs can be found.
- # GS_EXEC= /usr/local/src/gs5.50/obj/gs
-! GS_EXEC=${LOCALBASE}/bin/gs
-
- #------------------------------------------------------------------------
- # Window manager bug workaround---If you don't like xcircuit grabbing kbd
-***************
-*** 91,97 ****
- # Support for embedded Python interpreter
- # (requires libpython${PYTHON_VERSION}.a)
- #
-! #define HAVE_PYTHON
-
- PYTHON_VERSION=2.1
- PYTHON_LIB_DIR=/usr/local/lib
---- 92,98 ----
- # Support for embedded Python interpreter
- # (requires libpython${PYTHON_VERSION}.a)
- #
-! /* #define HAVE_PYTHON */
-
- PYTHON_VERSION=2.1
- PYTHON_LIB_DIR=/usr/local/lib
diff -ruN xcircuit.orig/files/patch-ab xcircuit/files/patch-ab
--- xcircuit.orig/files/patch-ab Tue Jul 3 07:33:16 2001
+++ xcircuit/files/patch-ab Wed Dec 31 19:00:00 1969
@@ -1,27 +0,0 @@
-*** xcircuit.c.orig Tue Jun 26 22:34:15 2001
---- xcircuit.c Sat Jun 30 12:53:00 2001
-***************
-*** 21,26 ****
---- 21,29 ----
- #include <limits.h>
- #include <locale.h>
- #include <unistd.h> /* for unlink() */
-+ #ifdef __FreeBSD__
-+ #include <machine/floatingpoint.h>
-+ #endif
-
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
-***************
-*** 1685,1690 ****
---- 1688,1697 ----
- char *argv0; /* find root of argv[0] */
- short initargc = argc; /* because XtInitialize() absorbs the */
- /* -schem flag and renumbers argc! (bug?) */
-+
-+ #ifdef __FreeBSD__
-+ fpsetmask(0);
-+ #endif
-
- /*-----------------------------------------------------------*/
- /* Find the root of the command called from the command line */
diff -ruN xcircuit.orig/pkg-descr xcircuit/pkg-descr
--- xcircuit.orig/pkg-descr Sat Oct 6 10:09:38 2001
+++ xcircuit/pkg-descr Sun May 25 11:08:01 2003
@@ -1,3 +1,5 @@
-xcircuit is software for drawing electrical circuits.
+xcircuit is software for drawing electrical circuits.
+The default format is postscript. It also features symbol libraries and
+the option to generate spice, sim, and pcb netlists.
WWW: http://xcircuit.ece.jhu.edu/
diff -ruN xcircuit.orig/pkg-plist xcircuit/pkg-plist
--- xcircuit.orig/pkg-plist Sat Oct 6 10:09:38 2001
+++ xcircuit/pkg-plist Sat May 24 21:43:05 2003
@@ -1,61 +1,61 @@
bin/xcircuit
-lib/X11/app-defaults/XCircuit
-lib/X11/xcircuit/analog.lps
-lib/X11/xcircuit/analoglib2.lps
-lib/X11/xcircuit/app-defaults
-lib/X11/xcircuit/avlsi.lps
-lib/X11/xcircuit/digital.lps
-lib/X11/xcircuit/fonts/courier.lps
-lib/X11/xcircuit/fonts/courier.xfe
-lib/X11/xcircuit/fonts/courieriso.xfe
-lib/X11/xcircuit/fonts/courieriso2.lps
-lib/X11/xcircuit/fonts/courieriso2.xfe
-lib/X11/xcircuit/fonts/courieriso5.lps
-lib/X11/xcircuit/fonts/courieriso5.xfe
-lib/X11/xcircuit/fonts/helvetica.lps
-lib/X11/xcircuit/fonts/helvetica.xfe
-lib/X11/xcircuit/fonts/helveticaiso.xfe
-lib/X11/xcircuit/fonts/helveticaiso2.lps
-lib/X11/xcircuit/fonts/helveticaiso2.xfe
-lib/X11/xcircuit/fonts/helveticaiso5.lps
-lib/X11/xcircuit/fonts/helveticaiso5.xfe
-lib/X11/xcircuit/fonts/myfont.lps
-lib/X11/xcircuit/fonts/myfont.xfe
-lib/X11/xcircuit/fonts/symbol.lps
-lib/X11/xcircuit/fonts/symbol.xfe
-lib/X11/xcircuit/fonts/times_roman.lps
-lib/X11/xcircuit/fonts/times_roman.xfe
-lib/X11/xcircuit/fonts/times_romaniso.xfe
-lib/X11/xcircuit/fonts/times_romaniso2.lps
-lib/X11/xcircuit/fonts/times_romaniso2.xfe
-lib/X11/xcircuit/fonts/times_romaniso5.lps
-lib/X11/xcircuit/fonts/times_romaniso5.xfe
-lib/X11/xcircuit/generic.lps
-lib/X11/xcircuit/ic_templates.lps
-lib/X11/xcircuit/lgf.lps
-lib/X11/xcircuit/musiclib.lps
-lib/X11/xcircuit/signal.lps
-lib/X11/xcircuit/startup.script
-lib/X11/xcircuit/xcircps2.pro
+lib/xcircuit-3.1/analog.lps
+lib/xcircuit-3.1/analoglib2.lps
+lib/xcircuit-3.1/app-defaults/XCircuit
+ at dirrm lib/xcircuit-3.1/app-defaults
+lib/xcircuit-3.1/avlsi.lps
+lib/xcircuit-3.1/digital.lps
+lib/xcircuit-3.1/fonts/courier.lps
+lib/xcircuit-3.1/fonts/courier.xfe
+lib/xcircuit-3.1/fonts/courieriso.xfe
+lib/xcircuit-3.1/fonts/courieriso2.lps
+lib/xcircuit-3.1/fonts/courieriso2.xfe
+lib/xcircuit-3.1/fonts/courieriso5.lps
+lib/xcircuit-3.1/fonts/courieriso5.xfe
+lib/xcircuit-3.1/fonts/helvetica.lps
+lib/xcircuit-3.1/fonts/helvetica.xfe
+lib/xcircuit-3.1/fonts/helveticaiso.xfe
+lib/xcircuit-3.1/fonts/helveticaiso2.lps
+lib/xcircuit-3.1/fonts/helveticaiso2.xfe
+lib/xcircuit-3.1/fonts/helveticaiso5.lps
+lib/xcircuit-3.1/fonts/helveticaiso5.xfe
+lib/xcircuit-3.1/fonts/myfont.lps
+lib/xcircuit-3.1/fonts/myfont.xfe
+lib/xcircuit-3.1/fonts/symbol.lps
+lib/xcircuit-3.1/fonts/symbol.xfe
+lib/xcircuit-3.1/fonts/times_roman.lps
+lib/xcircuit-3.1/fonts/times_roman.xfe
+lib/xcircuit-3.1/fonts/times_romaniso.xfe
+lib/xcircuit-3.1/fonts/times_romaniso2.lps
+lib/xcircuit-3.1/fonts/times_romaniso2.xfe
+lib/xcircuit-3.1/fonts/times_romaniso5.lps
+lib/xcircuit-3.1/fonts/times_romaniso5.xfe
+ at dirrm lib/xcircuit-3.1/fonts
+lib/xcircuit-3.1/generic.lps
+lib/xcircuit-3.1/ic_templates.lps
+lib/xcircuit-3.1/lgf.lps
+lib/xcircuit-3.1/musiclib.lps
+lib/xcircuit-3.1/quadparts.lps
+lib/xcircuit-3.1/signal.lps
+lib/xcircuit-3.1/startup.script
+lib/xcircuit-3.1/xcircps2.pro
+ at dirrm lib/xcircuit-3.1
share/examples/xcircuit/.xcircuitrc
share/examples/xcircuit/FlareLED.ps
-share/examples/xcircuit/FlareLEDtest.ps
share/examples/xcircuit/USAflag.ps
share/examples/xcircuit/analog1.ps
share/examples/xcircuit/analog2.ps
share/examples/xcircuit/analoglib1.lps
share/examples/xcircuit/border.ps
share/examples/xcircuit/diffamp_test.ps
+share/examples/xcircuit/diffamp_test2.ps
share/examples/xcircuit/envelope.ps
share/examples/xcircuit/fourttest.ps
-share/examples/xcircuit/gettext.py
-share/examples/xcircuit/loadlgf.py
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
@dirrm share/examples/xcircuit
- at dirrm lib/X11/xcircuit/fonts
- at dirrm lib/X11/xcircuit
--0-2087524602-1053903856=:18069
Content-Type: application/base64; name="port-xcircuit.uu"
Content-Transfer-Encoding: base64
Content-Description: port-xcircuit.uu
Content-Disposition: attachment; filename="port-xcircuit.uu"
YmVnaW4gNjQ0IHhjaXJjdWl0LnRhci5negpNJ1hMKGAtW0pUI1hgYF5VODs2
X0IuISM+S14xN14tMV5WI1RNPjIlYCozSS5JOSNWVCE6SEAlWVs7WkksCk1Y
QDA/Mj5SUzM1TVZNP19dWy8jMj1ETCI0Sz89LlZVJkpFK0xRXF4sOVZTL1Yn
PE45TlgsQlM8TyoqOTkKTS1AXEolP0UtWSxPT1hPXiM6SzVMNT5WSjU5K01F
RTRJJztSSU8qMTEqWUVRYDlFNFIwQyk9LCtNISonUApNLTBRWjc7RTtRTV9I
UEJHUjw4QT4wKD1JRjY6VTckWis/XEZOJ0pTQjdSRTkiRj85SThLXVFHUCE2
WVsoCk09UVtfLz0hI01YYDIpQ0FQMjFAQjVWYDJAVkJZJkghLzYrVlA2QjM6
J0ZBI0A4IytEL1FYXTQrISFEVyoKTUAnNVg2KS1dRVEsMlI7OSJAJ1VfJUYt
WiEnRiQ9LCgiOzRfVltJXFBBKFonWz9JIkZeJSJTV0JSXk1bPwpNYCROVyNU
JyktJlcjSyFCNiI0UlM3Sls1UzJKQDIiYD8uJzw0WyRNIls7UF8mLzY6Nzo9
UTtZWUpeTTQ5Ck0jI09dN0otQFpZOU41OzE2PF4yPF1APD05XUBIMik1Ok1T
RDwuOC9LODY+RDZCOSJUK0pRTUQtJytNK18KTUdMUVRZLFQsUi1QKU9EJiYp
TD1UPkIvWVlQUDpBPDNYSF41PERMRlVeTVZOVFFMVSJMVDg3JUQ2XCFCXApN
UTckYCoiLCFAUSdYYFcmKjdgUyM8Kls8Ijk6WmAnPEcqKCgiTl9QTzMzTl5a
KVJVS11PLk49LUsyW09WCk0vWVdVNlxWU1heOzBeNlIkPiZQKC1aU0lNQyVS
UFE6KT8xU0g/JSs/P1pMRi8mUVchQSgjWFJgIVY+IS8KTUs7IUFfIzA5L0xU
Oi86VzlWTiJCPVZdJVAuT1tHXlkxRS4lOCYsJiQ8LCU9QUpESCFPJSxUUlom
U083UQpNW1lXUzRKLFAxU1NZPjc3Pjc/UFhbNVU8TV9KXURcW0lRPCE5LSZE
Wl1DVDkyKDRbX1ZXVDJbXkdLMSc3Ck1TPCdJTGAmKlE1TEwpRDRaJVEsMjpT
SCouOSsrOkBfKFY8TElgLFAhMFJaKShBMVtSJEw7KzlXMTInJUMKTVhKKDU7
K0ghSTlQRV08OD5dRTdUPlU6Q0wlWUVOSjVJNStKQEImLVk9KDFBNzRUKF8i
IkdBJi9ETz5XVQpNRTwvOl89O1BHNThYVk9fNF86IVwhWjA/IVxZKVleSlNQ
Mj4wKDAvPVA4QiZCKl43R0I5Q1VDSTdQLE8hCk1BXiZAXT9EPkhKXFBTJ1Q2
U1hdWiYvQy85OiNcRjBTLylZQ08wK2AqR0hZQy1ZUVkiL1BUWUlaTi1KXD4K
TTM3XzZPTzZRXlleMV0wR0w4MllQWyksN1QrJEVfXE1OOlknX1M5KUk1OlRE
X11ORTxJW183VCZaWzBJWApNTlVIJFE0Ny5VKjUnXS8nJ1RDTzBgJVs1QUg9
RVNbN11GRTxLVlA+UDpFOVw6JTwwLypDIUw2X0YuXkdfCk0rPk9dM1o9IVQ0
LFJLV11dJz1PVk9WVk9bV1w1SltTOF9WNzVfXzUtPjJLP14/WT9RNVw1NTlT
WFhFOkYKTVRaMSo3NTZRMiVUKSYnOUFOIkk8TjBaVFQwMCE2PydgNjJANDZJ
OlFCSCJOKlQsPT1gMmAoMj9gRVU+JQpNJjQuMj8xWi0yMEFEPzw0QFBbKCFR
QVswQSIwQi0rRVMiYCgiJSIuRjtBQjw4QT5dIVFRJ1tRLDw9PDxACk0xQio0
MjhLS0ZHOVk+NUQnNjs1Wz9CU00qKF9WL1U3Xl8/SFpNTlNfTEU2TktPKV9N
N0pQVy9eNT8vXl8KTUFIUVE/JVxUSltPL1BVS2BAIyQsMjoiKl9LMF5WNVEq
Wjo+VE4jUEJOJyc1NkpIWFxDIUMkPEEkO14iWgpNIjNHPkssOyNgOTs3TCxW
PS9IRzUyUC45UjAuJ1swKllcXSQ2Ii45RC1VMio2WVsiPUYqS1ssOTZSNio7
Ck1IL2AmIjdGNDlXJz1AVzlBVk4qLUFbQSw/U1AmW0xCOFo5LydQYFMmOipa
XjY1MSsxYDsnKEs9RTwyUDEKTSYxUCIxWEE/LFErIS4oT0goNlBXTUJUUT5I
UyxDLSo3VClVOSxSL1UpNTJRSUFUM1I4QkcxJEc9QC1XLQpNNkshWys1ISQw
VUU3XCxWKCwvYFc9VDBTQ0VXOU5LR1dHUUdUKiYwQkE5N0MoJFhbRiUzMiQz
LkorWkpFCk1JX1cpI1xJKy5GNERTMUU6Uk1PJ1BfPkI1LFEpKi1PL0crOE5L
NE8jN2BSOz9AQiMrLEBCIjVDOyg6N00KTSQjRF8qXyU2JkZRLEYiPy9aYFIk
QVdVP01MRVg8WyRLK00sUiUtXkBEJSI0QT8nRVoyTlY6OTNTUFZYTQpNIlQl
QV8pJjAyKj9TPWBBI1pCVEtCWDcvTjVTTEdKNj5eRSkhIlYvM104QCkwUSgi
QFRRNS1SWDlBXDI9CkMqTFFSQjo6XVFHV0sqQj43NycrKSk5PTw8TERFRVVR
UjQ/KE9MRUVRLmBgSGBgYGAKYAplbmQK
--0-2087524602-1053903856=:18069--
>Release-Note:
>Audit-Trail:
>Unformatted:
--0-2087524602-1053903856=:18069
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Content-Id:
Content-Disposition: inline
More information about the freebsd-ports-bugs
mailing list