Attachment #31664 for bug #52662

View | Details | Raw Unified | Return to bug 52662
Collapse All | Expand All




#

PORTNAME=	xcircuit
PORTVERSION=	3.1.15
PORTEPOCH=	1
CATEGORIES=	cad
MASTER_SITES=	http://xcircuit.ece.jhu.edu/archive/

COMMENT=	An X11 drawing program [especially for circuit schematics]

RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

USE_BZIP2=	yes
USE_X_PREFIX=	yes
USE_XPM=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
XMKMF=		xmkmf

MAN1=		xcircuit.1

.if defined(WITH_PYTHON)
USE_PYTHON=	yes
CONFIGURE_ARGS+=	--with-python
CPPFLAGS+=	${PTHREAD_CFLAGS}
LDFLAGS+=	${PTHREAD_LIBS}
PLIST_SUB+=	PYTHON="" NOPYTHON="@comment "
.else
PLIST_SUB+=	PYTHON="@comment " NOPYTHON=""
.endif

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${EXAMPLESDIR}
	${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . | \
		${TAR} -C ${EXAMPLESDIR} --unlink -xf -
	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)cad/xcircuit/distinfo (-1 / +1 lines)
1	MD5 (xcircuit-2.3.3.tar.gz) = 766a2d86a66c91acc67b4a361a2fe0e3	1	MD5 (xcircuit-3.1.15.tar.bz2) = d63a94dc3f8d8437a605fa35ea78abf0




--- Makefile.in.orig	Tue May 20 00:54:39 2003
+++ Makefile.in	Sun May 25 00:02:41 2003
@@ -108,7 +108,7 @@
 tmpdir = /tmp
 
 # Directory for app-defaults file
-appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
+appdefaultsdir = $(libdir)/X11/app-defaults
 
 PATHNAMES = -DPROG_VERSION=$(VERSION) \
 	-DCAD_DIR=\"$(prefix)\" \
@@ -143,7 +143,7 @@
 LDDL_FLAGS = @LDDL_FLAGS@
 
 # Library directory and files
-librarydir = $(datadir)/$(PACKAGE)-$(VERSION)
+librarydir = $(libdir)/X11/$(PACKAGE)
 USER_RC_FILE = .xcircuitrc
 PROLOGUE_FILE = xcircps2.pro
 BUILTINS_DEP1 = generic.lps




*** 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




*** 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 */




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/ic_templates.lps
lib/X11/xcircuit/lgf.lps
lib/X11/xcircuit/musiclib.lps
%%PYTHON%%lib/X11/xcircuit/python/gettext.py
%%PYTHON%%lib/X11/xcircuit/python/pagebbox.py
%%PYTHON%%lib/X11/xcircuit/python/spice.py
lib/X11/xcircuit/quadparts.lps
lib/X11/xcircuit/signal.lps
%%NOPYTHON%%lib/X11/xcircuit/startup.script
lib/X11/xcircuit/xcircps2.pro
%%PYTHON%%lib/X11/xcircuit/xcstartup.py
%%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%%@dirrm lib/X11/xcircuit/python
@dirrm lib/X11/xcircuit/fonts
@dirrm lib/X11/xcircuit

Return to bug 52662

Lines 6-12 Link Here

(-)cad/xcircuit/Makefile (-10 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= xcircuit	8	PORTNAME= xcircuit
9	PORTVERSION= 2.3.3	9	PORTVERSION= 3.1.15
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= cad	11	CATEGORIES= cad
12	MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/	12	MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/
Lines 15-36 Link Here
15	COMMENT= An X11 drawing program [especially for circuit schematics]	15	COMMENT= An X11 drawing program [especially for circuit schematics]
16		16
17	RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu	17	RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu
18	BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
19		18
		19	USE_BZIP2= yes
		20	USE_X_PREFIX= yes
20	USE_XPM= yes	21	USE_XPM= yes
21	USE_IMAKE= yes	22	GNU_CONFIGURE= yes
22	USE_REINPLACE= yes	23	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
23	XMKMF= xmkmf
24		24
25	MAN1= xcircuit.1	25	MAN1= xcircuit.1
26		26
27	post-patch:	27	.if defined(WITH_PYTHON)
28	@${FIND} ${WRKSRC} -name '*.[ch]' \| ${XARGS} ${REINPLACE_CMD} -e \	28	USE_PYTHON= yes
29	's\|<malloc.h>\|<stdlib.h>\|g'	29	CONFIGURE_ARGS+= --with-python
		30	CPPFLAGS+= ${PTHREAD_CFLAGS}
		31	LDFLAGS+= ${PTHREAD_LIBS}
		32	PLIST_SUB+= PYTHON="" NOPYTHON="@comment "
		33	.else
		34	PLIST_SUB+= PYTHON="@comment " NOPYTHON=""
		35	.endif
30		36
31	post-install:	37	post-install:
32	@${MKDIR} ${PREFIX}/share/examples/xcircuit	38	.if !defined(NOPORTDOCS)
		39	@${MKDIR} ${EXAMPLESDIR}
33	${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . \| \	40	${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . \| \
34	${TAR} -C ${PREFIX}/share/examples/xcircuit --unlink -xf -	41	${TAR} -C ${EXAMPLESDIR} --unlink -xf -
		42	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
		43	.endif
35		44
36	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Line 0 Link Here

(-)cad/xcircuit/files/patch-Makefile.in (+20 lines)
	1	--- Makefile.in.orig Tue May 20 00:54:39 2003
	2	+++ Makefile.in Sun May 25 00:02:41 2003
	3	@@ -108,7 +108,7 @@
	4	tmpdir = /tmp
	5
	6	# Directory for app-defaults file
	7	-appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
	8	+appdefaultsdir = $(libdir)/X11/app-defaults
	9
	10	PATHNAMES = -DPROG_VERSION=$(VERSION) \
	11	-DCAD_DIR=\"$(prefix)\" \
	12	@@ -143,7 +143,7 @@
	13	LDDL_FLAGS = @LDDL_FLAGS@
	14
	15	# Library directory and files
	16	-librarydir = $(datadir)/$(PACKAGE)-$(VERSION)
	17	+librarydir = $(libdir)/X11/$(PACKAGE)
	18	USER_RC_FILE = .xcircuitrc
	19	PROLOGUE_FILE = xcircps2.pro
	20	BUILTINS_DEP1 = generic.lps

Lines 1-86 Link Here

(-)cad/xcircuit/files/patch-aa (-86 lines)
1	*** Imakefile.orig Fri Sep 7 03:31:47 2001
2	--- Imakefile Fri Sep 7 03:44:46 2001
3	***************
4	* 28,50 **
5	#CCOPTIONS = -O2
6	#
7	# for debugging purposes uncomment the following line:
8	! CDEBUGFLAGS = -g
9	! STD_INCLUDES = -I. -I/usr/X11R6/include/X11
10
11	# The "m4" macro processor is used to generate the man page such that
12	# the man page reflects the configured options.
13	! M4 = m4
14
15	#------------------------------------------------------------------------
16	# Installation directories:
17	# Change the following as desired to suit your environment:
18	#------------------------------------------------------------------------
19	#
20	! PREFIX = /usr/local
21	# XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
22	! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3
23	! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
24	! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
25	XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
26
27	#------------------------------------------------------------------------
28	--- 28,51 ----
29	#CCOPTIONS = -O2
30	#
31	# for debugging purposes uncomment the following line:
32	! # CDEBUGFLAGS = -g
33	! STD_INCLUDES = -I. -I$(INCDIR)/X11
34	! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV
35
36	# The "m4" macro processor is used to generate the man page such that
37	# the man page reflects the configured options.
38	! M4 = gm4
39
40	#------------------------------------------------------------------------
41	# Installation directories:
42	# Change the following as desired to suit your environment:
43	#------------------------------------------------------------------------
44	#
45	! # PREFIX = /usr/local
46	# XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
47	! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
48	! XCIRCUIT_BIN_DIR = $(BINDIR)
49	! XCIRCUIT_MAN_DIR = $(MANDIR)
50	XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
51
52	#------------------------------------------------------------------------
53	***************
54	* 63,69 **
55	# Support for background rendering through ghostscript. Change this
56	# to the path where gs can be found.
57	# GS_EXEC= /usr/local/src/gs5.50/obj/gs
58	! GS_EXEC= /usr/bin/gs
59
60	#------------------------------------------------------------------------
61	# Window manager bug workaround---If you don't like xcircuit grabbing kbd
62	--- 64,70 ----
63	# Support for background rendering through ghostscript. Change this
64	# to the path where gs can be found.
65	# GS_EXEC= /usr/local/src/gs5.50/obj/gs
66	! GS_EXEC=${LOCALBASE}/bin/gs
67
68	#------------------------------------------------------------------------
69	# Window manager bug workaround---If you don't like xcircuit grabbing kbd
70	***************
71	* 91,97 **
72	# Support for embedded Python interpreter
73	# (requires libpython${PYTHON_VERSION}.a)
74	#
75	! #define HAVE_PYTHON
76
77	PYTHON_VERSION=2.1
78	PYTHON_LIB_DIR=/usr/local/lib
79	--- 92,98 ----
80	# Support for embedded Python interpreter
81	# (requires libpython${PYTHON_VERSION}.a)
82	#
83	! /* #define HAVE_PYTHON */
84
85	PYTHON_VERSION=2.1
86	PYTHON_LIB_DIR=/usr/local/lib

Lines 1-27 Link Here

(-)cad/xcircuit/files/patch-ab (-27 lines)
1	*** xcircuit.c.orig Tue Jun 26 22:34:15 2001
2	--- xcircuit.c Sat Jun 30 12:53:00 2001
3	***************
4	* 21,26 **
5	--- 21,29 ----
6	#include <limits.h>
7	#include <locale.h>
8	#include <unistd.h> /* for unlink() */
9	+ #ifdef __FreeBSD__
10	+ #include <machine/floatingpoint.h>
11	+ #endif
12
13	#include <X11/Intrinsic.h>
14	#include <X11/StringDefs.h>
15	***************
16	* 1685,1690 **
17	--- 1688,1697 ----
18	char argv0; / find root of argv[0] */
19	short initargc = argc; /* because XtInitialize() absorbs the */
20	/* -schem flag and renumbers argc! (bug?) */
21	+
22	+ #ifdef __FreeBSD__
23	+ fpsetmask(0);
24	+ #endif
25
26	/-----------------------------------------------------------/
27	/* Find the root of the command called from the command line */

Lines 2-8 Link Here

(-)cad/xcircuit/pkg-plist (-22 / +26 lines)
2	lib/X11/app-defaults/XCircuit	2	lib/X11/app-defaults/XCircuit
3	lib/X11/xcircuit/analog.lps	3	lib/X11/xcircuit/analog.lps
4	lib/X11/xcircuit/analoglib2.lps	4	lib/X11/xcircuit/analoglib2.lps
5	lib/X11/xcircuit/app-defaults
6	lib/X11/xcircuit/avlsi.lps	5	lib/X11/xcircuit/avlsi.lps
7	lib/X11/xcircuit/digital.lps	6	lib/X11/xcircuit/digital.lps
8	lib/X11/xcircuit/fonts/courier.lps	7	lib/X11/xcircuit/fonts/courier.lps
Lines 34-61 Link Here
34	lib/X11/xcircuit/ic_templates.lps	33	lib/X11/xcircuit/ic_templates.lps
35	lib/X11/xcircuit/lgf.lps	34	lib/X11/xcircuit/lgf.lps
36	lib/X11/xcircuit/musiclib.lps	35	lib/X11/xcircuit/musiclib.lps
		36	%%PYTHON%%lib/X11/xcircuit/python/gettext.py
		37	%%PYTHON%%lib/X11/xcircuit/python/pagebbox.py
		38	%%PYTHON%%lib/X11/xcircuit/python/spice.py
		39	lib/X11/xcircuit/quadparts.lps
37	lib/X11/xcircuit/signal.lps	40	lib/X11/xcircuit/signal.lps
38	lib/X11/xcircuit/startup.script	41	%%NOPYTHON%%lib/X11/xcircuit/startup.script
39	lib/X11/xcircuit/xcircps2.pro	42	lib/X11/xcircuit/xcircps2.pro
40	share/examples/xcircuit/.xcircuitrc	43	%%PYTHON%%lib/X11/xcircuit/xcstartup.py
41	share/examples/xcircuit/FlareLED.ps	44	%%PORTDOCS%%share/examples/xcircuit/.xcircuitrc
42	share/examples/xcircuit/FlareLEDtest.ps	45	%%PORTDOCS%%share/examples/xcircuit/FlareLED.ps
43	share/examples/xcircuit/USAflag.ps	46	%%PORTDOCS%%share/examples/xcircuit/USAflag.ps
44	share/examples/xcircuit/analog1.ps	47	%%PORTDOCS%%share/examples/xcircuit/analog1.ps
45	share/examples/xcircuit/analog2.ps	48	%%PORTDOCS%%share/examples/xcircuit/analog2.ps
46	share/examples/xcircuit/analoglib1.lps	49	%%PORTDOCS%%share/examples/xcircuit/analoglib1.lps
47	share/examples/xcircuit/border.ps	50	%%PORTDOCS%%share/examples/xcircuit/border.ps
48	share/examples/xcircuit/diffamp_test.ps	51	%%PORTDOCS%%share/examples/xcircuit/diffamp_test.ps
49	share/examples/xcircuit/envelope.ps	52	%%PORTDOCS%%share/examples/xcircuit/diffamp_test2.ps
50	share/examples/xcircuit/fourttest.ps	53	%%PORTDOCS%%share/examples/xcircuit/envelope.ps
51	share/examples/xcircuit/gettext.py	54	%%PORTDOCS%%share/examples/xcircuit/fourttest.ps
52	share/examples/xcircuit/loadlgf.py	55	%%PORTDOCS%%share/examples/xcircuit/logic8.ps
53	share/examples/xcircuit/logic8.ps	56	%%PORTDOCS%%share/examples/xcircuit/panzoom.py
54	share/examples/xcircuit/prelude.ps	57	%%PORTDOCS%%share/examples/xcircuit/prelude.ps
55	share/examples/xcircuit/systemd1.lgf	58	%%PORTDOCS%%share/examples/xcircuit/systemd1.lgf
56	share/examples/xcircuit/test.py	59	%%PORTDOCS%%share/examples/xcircuit/test.py
57	share/examples/xcircuit/threestage.ps	60	%%PORTDOCS%%share/examples/xcircuit/threestage.ps
58	share/examples/xcircuit/vcoblock.ps	61	%%PORTDOCS%%share/examples/xcircuit/vcoblock.ps
59	@dirrm share/examples/xcircuit	62	%%PORTDOCS%%@dirrm share/examples/xcircuit
		63	%%PYTHON%%@dirrm lib/X11/xcircuit/python
60	@dirrm lib/X11/xcircuit/fonts	64	@dirrm lib/X11/xcircuit/fonts
61	@dirrm lib/X11/xcircuit	65	@dirrm lib/X11/xcircuit