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

(-)cad/xcircuit/Makefile (-29 / +13 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	xcircuit
8
PORTNAME=	xcircuit
9
PORTVERSION=	3.1.38
9
PORTVERSION=	3.3.18
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 14-19 Link Here
14
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
15
COMMENT=	An X11 drawing program [especially for circuit schematics]
15
COMMENT=	An X11 drawing program [especially for circuit schematics]
16
16
17
LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84
18
17
USE_BZIP2=	yes
19
USE_BZIP2=	yes
18
USE_X_PREFIX=	yes
20
USE_X_PREFIX=	yes
19
USE_XPM=	yes
21
USE_XPM=	yes
Lines 22-47 Link Here
22
USE_GMAKE=	yes
24
USE_GMAKE=	yes
23
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
24
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
26
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
26
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
27
		AUTOHEADER="${TRUE}"
28
29
WISH=		${LOCALBASE}/bin/wish8.4
30
31
.if defined(WITH_TCLTK)
32
PKGNAMESUFFIX=	-tcltk
33
LIB_DEPENDS+=	tk84:${PORTSDIR}/x11-toolkits/tk84
34
CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
27
CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
35
		--with-tk=${LOCALBASE}/lib/tk8.4
28
		--with-tk=${LOCALBASE}/lib/tk8.4
36
ALL_TARGET=	tcl
29
37
INSTALL_TARGET=	install-tcl
30
CFLAGS+=	-I${X11BASE}/include
38
PLIST_SUB+=	TCLTK="" NOTCLTK="@comment "
31
39
CFLAGS+=	-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 \
32
WISH=		${LOCALBASE}/bin/wish8.4
40
		-I${X11BASE}/include
41
.else
42
MAN1+=		xcircuit.1
43
PLIST_SUB+=	TCLTK="@comment " NOTCLTK=""
44
.endif
45
33
46
pre-everything::
34
pre-everything::
47
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
35
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
Lines 50-65 Link Here
50
	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
38
	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
51
	@${ECHO_MSG} ""
39
	@${ECHO_MSG} ""
52
.endif
40
.endif
53
.if !defined(WITH_TCLTK)
54
	@${ECHO_MSG} ""
55
	@${ECHO_MSG} "      Define WITH_TCLTK for Tcl/Tk support"
56
	@${ECHO_MSG} "      (prevents python support)"
57
	@${ECHO_MSG} ""
58
.endif
59
41
60
post-patch:
42
post-patch:
61
	@${REINPLACE_CMD} -e 's|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl84"|g ; \
43
	@${REINPLACE_CMD} -e '/test/s| == | = |g ; \
62
		 s|TK_LIB_NAME=.*$$|TK_LIB_NAME="tk84"|g' ${WRKSRC}/configure
44
		 s|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl84"|g ; \
45
		 s|TK_LIB_NAME=.*$$|TK_LIB_NAME="tk84"|g ; \
46
		 s|-Wl,--version-script=|--version-script |g' ${WRKSRC}/configure
63
.for file in lib/tcl/xcircuit.sh.m4 lib/tcl/tkcon.tcl
47
.for file in lib/tcl/xcircuit.sh.m4 lib/tcl/tkcon.tcl
64
	@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|g' ${WRKSRC}/${file}
48
	@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|g' ${WRKSRC}/${file}
65
.endfor
49
.endfor
Lines 67-74 Link Here
67
post-install:
51
post-install:
68
.if !defined(NOPORTDOCS)
52
.if !defined(NOPORTDOCS)
69
	@${MKDIR} ${EXAMPLESDIR}
53
	@${MKDIR} ${EXAMPLESDIR}
70
	${TAR} -C ${WRKSRC}/examples --exclude "CVS" --exclude "*.py" \
54
	${TAR} -C ${WRKSRC}/examples --exclude "*.py" -cf - . | \
71
		-cf - . | ${TAR} -C ${EXAMPLESDIR} --unlink -xf -
55
		${TAR} -C ${EXAMPLESDIR} --unlink -xf -
72
	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
56
	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
73
.endif
57
.endif
74
58
(-)cad/xcircuit/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (xcircuit-3.1.38.tar.bz2) = c7c852061d04f026fcacc58314c8654e
1
MD5 (xcircuit-3.3.18.tar.bz2) = c945e47cbfc2d4fa0878b443b9ad7f79
2
SIZE (xcircuit-3.1.38.tar.bz2) = 716708
2
SIZE (xcircuit-3.3.18.tar.bz2) = 1097776
(-)cad/xcircuit/files/patch-Makefile.in (-12 / +12 lines)
Lines 1-15 Link Here
1
--- Makefile.in.orig	Fri Nov  7 05:44:51 2003
1
--- Makefile.in.orig	Thu Jun 16 02:44:43 2005
2
+++ Makefile.in	Fri Nov 14 00:00:39 2003
2
+++ Makefile.in	Fri Jun 24 13:30:27 2005
3
@@ -168,7 +168,7 @@
3
@@ -234,7 +234,7 @@
4
 tmpdir = /tmp
4
 tmpdir = /tmp
5
 
5
 
6
 # Directory for app-defaults file
6
 # Directory for app-defaults file
7
-appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
7
-appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
8
+appdefaultsdir = $(libdir)/X11/app-defaults
8
+appdefaultsdir = $(libdir)/X11/app-defaults
9
 
10
 PATHNAMES = -DPROG_VERSION=$(VERSION) \
9
 PATHNAMES = -DPROG_VERSION=$(VERSION) \
11
 	-DCAD_DIR=\"$(prefix)\" \
10
 	-DCAD_DIR=\"$(prefix)\" \
12
@@ -195,7 +195,7 @@
11
 	-DTEMP_DIR=\"$(tmpdir)\" \
12
@@ -261,7 +261,7 @@
13
 INCLUDES = -IXw ${INC_SPECS}
13
 INCLUDES = -IXw ${INC_SPECS}
14
 
14
 
15
 # Library directory and files
15
 # Library directory and files
Lines 17-29 Link Here
17
+librarydir = $(libdir)/X11/$(PACKAGE)
17
+librarydir = $(libdir)/X11/$(PACKAGE)
18
 USER_RC_FILE = .xcircuitrc
18
 USER_RC_FILE = .xcircuitrc
19
 PROLOGUE_FILE = xcircps2.pro
19
 PROLOGUE_FILE = xcircps2.pro
20
 BUILTINS_DEP1 = generic.lps
20
 LGF_LIB = lgf.lps
21
@@ -746,7 +746,7 @@
21
@@ -786,7 +786,7 @@
22
 
22
 
23
 lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
23
 lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND}
24
 	$(RM) lib/xcircuit${SHDLIB_EXT}
24
 	$(RM) lib/xcircuit${SHDLIB_EXT}
25
-	$(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
25
-	$(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \
26
+	$(LD) ${LDFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
26
+	$(LD) -o $@ ${LDDL_FLAGS} xcwrap.o \
27
 		${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
27
 		${xcircuit_OBJECTS} ${xcircuit_LDADD} ${LDFLAGS} \
28
 		${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
28
 
29
 
29
 tcl:	lib/tcl/xcircuit${SHDLIB_EXT}
(-)cad/xcircuit/pkg-plist (-45 / +59 lines)
Lines 1-11 Link Here
1
@comment $FreeBSD: ports/cad/xcircuit/pkg-plist,v 1.16 2004/04/02 19:00:08 krion Exp $
1
@comment $FreeBSD: ports/cad/xcircuit/pkg-plist,v 1.16 2004/04/02 19:00:08 krion Exp $
2
bin/xcircuit
2
bin/xcircuit
3
lib/X11/app-defaults/XCircuit
3
lib/X11/app-defaults/XCircuit
4
%%TCLTK%%lib/X11/xcircuit/.wishrc
5
lib/X11/xcircuit/analog.lps
4
lib/X11/xcircuit/analog.lps
6
lib/X11/xcircuit/analoglib2.lps
5
lib/X11/xcircuit/analoglib2.lps
6
lib/X11/xcircuit/asg_spice.lps
7
lib/X11/xcircuit/avlsi.lps
7
lib/X11/xcircuit/avlsi.lps
8
%%TCLTK%%lib/X11/xcircuit/console.tcl
8
lib/X11/xcircuit/bparams.tcl
9
lib/X11/xcircuit/console.tcl
9
lib/X11/xcircuit/digital.lps
10
lib/X11/xcircuit/digital.lps
10
lib/X11/xcircuit/fonts/courier.lps
11
lib/X11/xcircuit/fonts/courier.lps
11
lib/X11/xcircuit/fonts/courier.xfe
12
lib/X11/xcircuit/fonts/courier.xfe
Lines 35-86 Link Here
35
lib/X11/xcircuit/generic.lps
36
lib/X11/xcircuit/generic.lps
36
lib/X11/xcircuit/ic_templates.lps
37
lib/X11/xcircuit/ic_templates.lps
37
lib/X11/xcircuit/lgf.lps
38
lib/X11/xcircuit/lgf.lps
39
lib/X11/xcircuit/library.tcl
38
lib/X11/xcircuit/musiclib.lps
40
lib/X11/xcircuit/musiclib.lps
39
%%TCLTK%%lib/X11/xcircuit/pixmaps/a.xpm
41
lib/X11/xcircuit/ngspice.tcl
40
%%TCLTK%%lib/X11/xcircuit/pixmaps/b.xpm
42
lib/X11/xcircuit/panzoom.tcl
41
%%TCLTK%%lib/X11/xcircuit/pixmaps/bd.xpm
43
lib/X11/xcircuit/pcb.lps
42
%%TCLTK%%lib/X11/xcircuit/pixmaps/ccw.xpm
44
lib/X11/xcircuit/pcb_layout.lps
43
%%TCLTK%%lib/X11/xcircuit/pixmaps/co.xpm
45
lib/X11/xcircuit/pcbout.tcl
44
%%TCLTK%%lib/X11/xcircuit/pixmaps/cp.xpm
46
lib/X11/xcircuit/pixmaps/a.xpm
45
%%TCLTK%%lib/X11/xcircuit/pixmaps/cw.xpm
47
lib/X11/xcircuit/pixmaps/b.xpm
46
%%TCLTK%%lib/X11/xcircuit/pixmaps/d2.xpm
48
lib/X11/xcircuit/pixmaps/bd.xpm
47
%%TCLTK%%lib/X11/xcircuit/pixmaps/e.xpm
49
lib/X11/xcircuit/pixmaps/ccw.xpm
48
%%TCLTK%%lib/X11/xcircuit/pixmaps/fi.xpm
50
lib/X11/xcircuit/pixmaps/co.xpm
49
%%TCLTK%%lib/X11/xcircuit/pixmaps/fx.xpm
51
lib/X11/xcircuit/pixmaps/cp.xpm
50
%%TCLTK%%lib/X11/xcircuit/pixmaps/fy.xpm
52
lib/X11/xcircuit/pixmaps/cw.xpm
51
%%TCLTK%%lib/X11/xcircuit/pixmaps/i.xpm
53
lib/X11/xcircuit/pixmaps/d2.xpm
52
%%TCLTK%%lib/X11/xcircuit/pixmaps/li.xpm
54
lib/X11/xcircuit/pixmaps/e.xpm
53
%%TCLTK%%lib/X11/xcircuit/pixmaps/mk.xpm
55
lib/X11/xcircuit/pixmaps/fi.xpm
54
%%TCLTK%%lib/X11/xcircuit/pixmaps/pl.xpm
56
lib/X11/xcircuit/pixmaps/fx.xpm
55
%%TCLTK%%lib/X11/xcircuit/pixmaps/pm.xpm
57
lib/X11/xcircuit/pixmaps/fy.xpm
56
%%TCLTK%%lib/X11/xcircuit/pixmaps/po2.xpm
58
lib/X11/xcircuit/pixmaps/i.xpm
57
%%TCLTK%%lib/X11/xcircuit/pixmaps/pu2.xpm
59
lib/X11/xcircuit/pixmaps/li.xpm
58
%%TCLTK%%lib/X11/xcircuit/pixmaps/pz.xpm
60
lib/X11/xcircuit/pixmaps/mk.xpm
59
%%TCLTK%%lib/X11/xcircuit/pixmaps/q.xpm
61
lib/X11/xcircuit/pixmaps/pa.xpm
60
%%TCLTK%%lib/X11/xcircuit/pixmaps/s.xpm
62
lib/X11/xcircuit/pixmaps/pl.xpm
61
%%TCLTK%%lib/X11/xcircuit/pixmaps/solid.xbm
63
lib/X11/xcircuit/pixmaps/pm.xpm
62
%%TCLTK%%lib/X11/xcircuit/pixmaps/stip12.xbm
64
lib/X11/xcircuit/pixmaps/po2.xpm
63
%%TCLTK%%lib/X11/xcircuit/pixmaps/stip25.xbm
65
lib/X11/xcircuit/pixmaps/pu2.xpm
64
%%TCLTK%%lib/X11/xcircuit/pixmaps/stip38.xbm
66
lib/X11/xcircuit/pixmaps/pz.xpm
65
%%TCLTK%%lib/X11/xcircuit/pixmaps/stip50.xbm
67
lib/X11/xcircuit/pixmaps/q.xpm
66
%%TCLTK%%lib/X11/xcircuit/pixmaps/stip62.xbm
68
lib/X11/xcircuit/pixmaps/s.xpm
67
%%TCLTK%%lib/X11/xcircuit/pixmaps/stip75.xbm
69
lib/X11/xcircuit/pixmaps/solid.xbm
68
%%TCLTK%%lib/X11/xcircuit/pixmaps/stip88.xbm
70
lib/X11/xcircuit/pixmaps/stip12.xbm
69
%%TCLTK%%lib/X11/xcircuit/pixmaps/t.xpm
71
lib/X11/xcircuit/pixmaps/stip25.xbm
70
%%TCLTK%%lib/X11/xcircuit/pixmaps/uj.xpm
72
lib/X11/xcircuit/pixmaps/stip38.xbm
71
%%TCLTK%%lib/X11/xcircuit/pixmaps/xcircuit.xpm
73
lib/X11/xcircuit/pixmaps/stip50.xbm
72
%%TCLTK%%lib/X11/xcircuit/pixmaps/yp.xpm
74
lib/X11/xcircuit/pixmaps/stip62.xbm
73
%%TCLTK%%lib/X11/xcircuit/pixmaps/z4.xpm
75
lib/X11/xcircuit/pixmaps/stip75.xbm
74
%%TCLTK%%lib/X11/xcircuit/pixmaps/z5.xpm
76
lib/X11/xcircuit/pixmaps/stip88.xbm
77
lib/X11/xcircuit/pixmaps/t.xpm
78
lib/X11/xcircuit/pixmaps/uj.xpm
79
lib/X11/xcircuit/pixmaps/xcircuit.xpm
80
lib/X11/xcircuit/pixmaps/yp.xpm
81
lib/X11/xcircuit/pixmaps/z4.xpm
82
lib/X11/xcircuit/pixmaps/z5.xpm
75
lib/X11/xcircuit/quadparts.lps
83
lib/X11/xcircuit/quadparts.lps
84
lib/X11/xcircuit/resource.tcl
85
lib/X11/xcircuit/series74xx.lps
76
lib/X11/xcircuit/signal.lps
86
lib/X11/xcircuit/signal.lps
77
%%TCLTK%%lib/X11/xcircuit/tkcon.tcl
87
lib/X11/xcircuit/sue_xc.tcl
78
%%TCLTK%%lib/X11/xcircuit/wrapper.tcl
88
lib/X11/xcircuit/tkcon.tcl
79
%%TCLTK%%lib/X11/xcircuit/xcircuit.so
89
lib/X11/xcircuit/wrapper.tcl
80
%%TCLTK%%lib/X11/xcircuit/xcircuit.tcl
90
lib/X11/xcircuit/xcircexec
81
%%NOTCLTK%%lib/X11/xcircuit/startup.script
82
lib/X11/xcircuit/xcircps2.pro
91
lib/X11/xcircuit/xcircps2.pro
83
%%TCLTK%%lib/X11/xcircuit/xcstartup.tcl
92
lib/X11/xcircuit/xcircuit.so
93
lib/X11/xcircuit/xcircuit.tcl
94
lib/X11/xcircuit/xcstartup.tcl
84
%%PORTDOCS%%%%EXAMPLESDIR%%/.xcircuitrc
95
%%PORTDOCS%%%%EXAMPLESDIR%%/.xcircuitrc
85
%%PORTDOCS%%%%EXAMPLESDIR%%/FlareLED.ps
96
%%PORTDOCS%%%%EXAMPLESDIR%%/FlareLED.ps
86
%%PORTDOCS%%%%EXAMPLESDIR%%/USAflag.ps
97
%%PORTDOCS%%%%EXAMPLESDIR%%/USAflag.ps
Lines 88-98 Link Here
88
%%PORTDOCS%%%%EXAMPLESDIR%%/analog2.ps
99
%%PORTDOCS%%%%EXAMPLESDIR%%/analog2.ps
89
%%PORTDOCS%%%%EXAMPLESDIR%%/analoglib1.lps
100
%%PORTDOCS%%%%EXAMPLESDIR%%/analoglib1.lps
90
%%PORTDOCS%%%%EXAMPLESDIR%%/border.ps
101
%%PORTDOCS%%%%EXAMPLESDIR%%/border.ps
102
%%PORTDOCS%%%%EXAMPLESDIR%%/buses.ps
91
%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test.ps
103
%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test.ps
92
%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test2.ps
104
%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test2.ps
93
%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test3.ps
105
%%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test3.ps
94
%%PORTDOCS%%%%EXAMPLESDIR%%/envelope.ps
106
%%PORTDOCS%%%%EXAMPLESDIR%%/envelope.ps
95
%%PORTDOCS%%%%EXAMPLESDIR%%/fourttest.ps
107
%%PORTDOCS%%%%EXAMPLESDIR%%/fourttest.ps
108
%%PORTDOCS%%%%EXAMPLESDIR%%/logic.fspc
109
%%PORTDOCS%%%%EXAMPLESDIR%%/logic.sim
96
%%PORTDOCS%%%%EXAMPLESDIR%%/logic8.ps
110
%%PORTDOCS%%%%EXAMPLESDIR%%/logic8.ps
97
%%PORTDOCS%%%%EXAMPLESDIR%%/prelude.ps
111
%%PORTDOCS%%%%EXAMPLESDIR%%/prelude.ps
98
%%PORTDOCS%%%%EXAMPLESDIR%%/systemd1.lgf
112
%%PORTDOCS%%%%EXAMPLESDIR%%/systemd1.lgf
Lines 100-105 Link Here
100
%%PORTDOCS%%%%EXAMPLESDIR%%/vcoblock.ps
114
%%PORTDOCS%%%%EXAMPLESDIR%%/vcoblock.ps
101
%%PORTDOCS%%%%EXAMPLESDIR%%/xcclock.ps
115
%%PORTDOCS%%%%EXAMPLESDIR%%/xcclock.ps
102
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
116
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
103
%%TCLTK%%@dirrm lib/X11/xcircuit/pixmaps
117
@dirrm lib/X11/xcircuit/pixmaps
104
@dirrm lib/X11/xcircuit/fonts
118
@dirrm lib/X11/xcircuit/fonts
105
@dirrm lib/X11/xcircuit
119
@dirrm lib/X11/xcircuit

Return to bug 82670