Attachment #33997 for bug #55417

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

Lines 6-12 Link Here

(-)cad/xcircuit/Makefile (-1 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= xcircuit	8	PORTNAME= xcircuit
9	PORTVERSION= 3.1.15	9	PORTVERSION= 3.1.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 22-28 Link Here
22	USE_REINPLACE= yes	22	USE_REINPLACE= yes
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
		25	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	26	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		27	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
		28	AUTOHEADER="${TRUE}"
26		29
27	WISH= ${LOCALBASE}/bin/wish8.4	30	WISH= ${LOCALBASE}/bin/wish8.4
28		31

Line 1 Link Here

(-)cad/xcircuit/distinfo (-1 / +1 lines)
1	MD5 (xcircuit-3.1.15.tar.bz2) = d63a94dc3f8d8437a605fa35ea78abf0	1	MD5 (xcircuit-3.1.18.tar.bz2) = 37372d7e05b876f092dc0ccd138846ef




--- Makefile.in.orig	Mon Jul 14 23:52:38 2003
+++ Makefile.in	Sun Jul 27 22:04:59 2003
@@ -168,7 +168,7 @@
 tmpdir = /tmp
 
 # Directory for app-defaults file

 
 PATHNAMES = -DPROG_VERSION=$(VERSION) \
 	-DCAD_DIR=\"$(prefix)\" \
@@ -195,7 +195,7 @@
 INCLUDES = -IXw ${INC_SPECS}
 
 # Library directory and files
-librarydir = $(datadir)/$(PACKAGE)-$(VERSION)

 USER_RC_FILE = .xcircuitrc
 PROLOGUE_FILE = xcircps2.pro
 BUILTINS_DEP1 = generic.lps
@@ -746,7 +746,7 @@
 
 lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
 	$(RM) lib/xcircuit${SHDLIB_EXT}

 		${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
 
 tcl:	lib/tcl/xcircuit${SHDLIB_EXT}
-	make lib/tcl/xcircuit${SHDLIB_EXT}
+	$(MAKE) lib/tcl/xcircuit${SHDLIB_EXT}
 
 help.c: menudep.h
 menucalls.c: menudep.h

Return to bug 55417

Lines 1-6 Link Here

(-)cad/xcircuit/files/patch-Makefile.in (-11 / +6 lines)
1	--- Makefile.in.orig Tue May 20 00:54:39 2003	1	--- Makefile.in.orig Mon Jul 14 23:52:38 2003
2	+++ Makefile.in Mon May 26 21:57:18 2003	2	+++ Makefile.in Sun Jul 27 22:04:59 2003
3	@@ -108,7 +108,7 @@	3	@@ -168,7 +168,7 @@
4	tmpdir = /tmp	4	tmpdir = /tmp
5		5
6	# Directory for app-defaults file	6	# Directory for app-defaults file
Lines 9-16 Link Here
9		9
10	PATHNAMES = -DPROG_VERSION=$(VERSION) \	10	PATHNAMES = -DPROG_VERSION=$(VERSION) \
11	-DCAD_DIR=\"$(prefix)\" \	11	-DCAD_DIR=\"$(prefix)\" \
12	@@ -143,7 +143,7 @@	12	@@ -195,7 +195,7 @@
13	LDDL_FLAGS = @LDDL_FLAGS@	13	INCLUDES = -IXw ${INC_SPECS}
14		14
15	# Library directory and files	15	# Library directory and files
16	-librarydir = $(datadir)/$(PACKAGE)-$(VERSION)	16	-librarydir = $(datadir)/$(PACKAGE)-$(VERSION)
Lines 18-24 Link Here
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	BUILTINS_DEP1 = generic.lps
21	@@ -572,11 +572,11 @@	21	@@ -746,7 +746,7 @@
22		22
23	lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}	23	lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
24	$(RM) lib/xcircuit${SHDLIB_EXT}	24	$(RM) lib/xcircuit${SHDLIB_EXT}
Lines 27-34 Link Here
27	${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}	27	${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
28		28
29	tcl: lib/tcl/xcircuit${SHDLIB_EXT}	29	tcl: lib/tcl/xcircuit${SHDLIB_EXT}
30	- make lib/tcl/xcircuit${SHDLIB_EXT}
31	+ $(MAKE) lib/tcl/xcircuit${SHDLIB_EXT}
32
33	help.c: menudep.h
34	menucalls.c: menudep.h