Attachment 54644 Details for Bug 82670 – file.diff

[patch] file.diff

file.diff (text/plain), 9.92 KB, created by tkato432 on 2005-06-26 18:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-06-26 18:10:14 UTC

Size: 9.92 KB

patch

obsolete

>diff -urN /usr/ports/cad/xcircuit/Makefile cad/xcircuit/Makefile
>--- /usr/ports/cad/xcircuit/Makefile	Tue Apr 12 14:02:26 2005
>+++ cad/xcircuit/Makefile	Fri Jun 24 13:57:48 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	xcircuit
>-PORTVERSION=	3.1.38
>+PORTVERSION=	3.3.18
> PORTEPOCH=	1
> CATEGORIES=	cad
> MASTER_SITES=	http://xcircuit.ece.jhu.edu/archive/
>@@ -14,6 +14,8 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An X11 drawing program [especially for circuit schematics]
> 
>+LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84
>+
> USE_BZIP2=	yes
> USE_X_PREFIX=	yes
> USE_XPM=	yes
>@@ -22,26 +24,12 @@
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
>-		AUTOHEADER="${TRUE}"
>-
>-WISH=		${LOCALBASE}/bin/wish8.4
>-
>-.if defined(WITH_TCLTK)
>-PKGNAMESUFFIX=	-tcltk
>-LIB_DEPENDS+=	tk84:${PORTSDIR}/x11-toolkits/tk84
> CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
> 		--with-tk=${LOCALBASE}/lib/tk8.4
>-ALL_TARGET=	tcl
>-INSTALL_TARGET=	install-tcl
>-PLIST_SUB+=	TCLTK="" NOTCLTK="@comment "
>-CFLAGS+=	-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 \
>-		-I${X11BASE}/include
>-.else
>-MAN1+=		xcircuit.1
>-PLIST_SUB+=	TCLTK="@comment " NOTCLTK=""
>-.endif
>+
>+CFLAGS+=	-I${X11BASE}/include
>+
>+WISH=		${LOCALBASE}/bin/wish8.4
> 
> pre-everything::
> .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
>@@ -50,16 +38,12 @@
> 	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
> 	@${ECHO_MSG} ""
> .endif
>-.if !defined(WITH_TCLTK)
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "      Define WITH_TCLTK for Tcl/Tk support"
>-	@${ECHO_MSG} "      (prevents python support)"
>-	@${ECHO_MSG} ""
>-.endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl84"|g ; \
>-		 s|TK_LIB_NAME=.*$$|TK_LIB_NAME="tk84"|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e '/test/s| == | = |g ; \
>+		 s|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl84"|g ; \
>+		 s|TK_LIB_NAME=.*$$|TK_LIB_NAME="tk84"|g ; \
>+		 s|-Wl,--version-script=|--version-script |g' ${WRKSRC}/configure
> .for file in lib/tcl/xcircuit.sh.m4 lib/tcl/tkcon.tcl
> 	@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|g' ${WRKSRC}/${file}
> .endfor
>@@ -67,8 +51,8 @@
> post-install:
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${EXAMPLESDIR}
>-	${TAR} -C ${WRKSRC}/examples --exclude "CVS" --exclude "*.py" \
>-		-cf - . | ${TAR} -C ${EXAMPLESDIR} --unlink -xf -
>+	${TAR} -C ${WRKSRC}/examples --exclude "*.py" -cf - . | \
>+		${TAR} -C ${EXAMPLESDIR} --unlink -xf -
> 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
> .endif
> 
>diff -urN /usr/ports/cad/xcircuit/distinfo cad/xcircuit/distinfo
>--- /usr/ports/cad/xcircuit/distinfo	Sat Apr  3 08:27:10 2004
>+++ cad/xcircuit/distinfo	Fri Jun 24 03:12:59 2005
>@@ -1,2 +1,2 @@
>-MD5 (xcircuit-3.1.38.tar.bz2) = c7c852061d04f026fcacc58314c8654e
>-SIZE (xcircuit-3.1.38.tar.bz2) = 716708
>+MD5 (xcircuit-3.3.18.tar.bz2) = c945e47cbfc2d4fa0878b443b9ad7f79
>+SIZE (xcircuit-3.3.18.tar.bz2) = 1097776
>diff -urN /usr/ports/cad/xcircuit/files/patch-Makefile.in cad/xcircuit/files/patch-Makefile.in
>--- /usr/ports/cad/xcircuit/files/patch-Makefile.in	Sat Apr  3 08:27:10 2004
>+++ cad/xcircuit/files/patch-Makefile.in	Fri Jun 24 13:33:47 2005
>@@ -1,15 +1,15 @@
>---- Makefile.in.orig	Fri Nov  7 05:44:51 2003
>-+++ Makefile.in	Fri Nov 14 00:00:39 2003
>-@@ -168,7 +168,7 @@
>+--- Makefile.in.orig	Thu Jun 16 02:44:43 2005
>++++ Makefile.in	Fri Jun 24 13:30:27 2005
>+@@ -234,7 +234,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)\" \
>-@@ -195,7 +195,7 @@
>+ 	-DTEMP_DIR=\"$(tmpdir)\" \
>+@@ -261,7 +261,7 @@
>  INCLUDES = -IXw ${INC_SPECS}
>  
>  # Library directory and files
>@@ -17,13 +17,13 @@
> +librarydir = $(libdir)/X11/$(PACKAGE)
>  USER_RC_FILE = .xcircuitrc
>  PROLOGUE_FILE = xcircps2.pro
>- BUILTINS_DEP1 = generic.lps
>-@@ -746,7 +746,7 @@
>+ LGF_LIB = lgf.lps
>+@@ -786,7 +786,7 @@
>  
>- lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
>+ lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND}
>  	$(RM) lib/xcircuit${SHDLIB_EXT}
>--	$(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
>-+	$(LD) ${LDFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
>- 		${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
>+-	$(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \
>++	$(LD) -o $@ ${LDDL_FLAGS} xcwrap.o \
>+ 		${xcircuit_OBJECTS} ${xcircuit_LDADD} ${LDFLAGS} \
>+ 		${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
>  
>- tcl:	lib/tcl/xcircuit${SHDLIB_EXT}
>diff -urN /usr/ports/cad/xcircuit/pkg-plist cad/xcircuit/pkg-plist
>--- /usr/ports/cad/xcircuit/pkg-plist	Sat Apr  3 08:27:10 2004
>+++ cad/xcircuit/pkg-plist	Fri Jun 24 13:50:47 2005
>@@ -1,11 +1,12 @@
> @comment $FreeBSD: ports/cad/xcircuit/pkg-plist,v 1.16 2004/04/02 19:00:08 krion Exp $
> bin/xcircuit
> lib/X11/app-defaults/XCircuit
>-%%TCLTK%%lib/X11/xcircuit/.wishrc
> lib/X11/xcircuit/analog.lps
> lib/X11/xcircuit/analoglib2.lps
>+lib/X11/xcircuit/asg_spice.lps
> lib/X11/xcircuit/avlsi.lps
>-%%TCLTK%%lib/X11/xcircuit/console.tcl
>+lib/X11/xcircuit/bparams.tcl
>+lib/X11/xcircuit/console.tcl
> lib/X11/xcircuit/digital.lps
> lib/X11/xcircuit/fonts/courier.lps
> lib/X11/xcircuit/fonts/courier.xfe
>@@ -35,52 +36,62 @@
> lib/X11/xcircuit/generic.lps
> lib/X11/xcircuit/ic_templates.lps
> lib/X11/xcircuit/lgf.lps
>+lib/X11/xcircuit/library.tcl
> lib/X11/xcircuit/musiclib.lps
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/a.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/b.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/bd.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/ccw.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/co.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/cp.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/cw.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/d2.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/e.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/fi.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/fx.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/fy.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/i.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/li.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/mk.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/pl.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/pm.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/po2.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/pu2.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/pz.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/q.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/s.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/solid.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/stip12.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/stip25.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/stip38.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/stip50.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/stip62.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/stip75.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/stip88.xbm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/t.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/uj.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/xcircuit.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/yp.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/z4.xpm
>-%%TCLTK%%lib/X11/xcircuit/pixmaps/z5.xpm
>+lib/X11/xcircuit/ngspice.tcl
>+lib/X11/xcircuit/panzoom.tcl
>+lib/X11/xcircuit/pcb.lps
>+lib/X11/xcircuit/pcb_layout.lps
>+lib/X11/xcircuit/pcbout.tcl
>+lib/X11/xcircuit/pixmaps/a.xpm
>+lib/X11/xcircuit/pixmaps/b.xpm
>+lib/X11/xcircuit/pixmaps/bd.xpm
>+lib/X11/xcircuit/pixmaps/ccw.xpm
>+lib/X11/xcircuit/pixmaps/co.xpm
>+lib/X11/xcircuit/pixmaps/cp.xpm
>+lib/X11/xcircuit/pixmaps/cw.xpm
>+lib/X11/xcircuit/pixmaps/d2.xpm
>+lib/X11/xcircuit/pixmaps/e.xpm
>+lib/X11/xcircuit/pixmaps/fi.xpm
>+lib/X11/xcircuit/pixmaps/fx.xpm
>+lib/X11/xcircuit/pixmaps/fy.xpm
>+lib/X11/xcircuit/pixmaps/i.xpm
>+lib/X11/xcircuit/pixmaps/li.xpm
>+lib/X11/xcircuit/pixmaps/mk.xpm
>+lib/X11/xcircuit/pixmaps/pa.xpm
>+lib/X11/xcircuit/pixmaps/pl.xpm
>+lib/X11/xcircuit/pixmaps/pm.xpm
>+lib/X11/xcircuit/pixmaps/po2.xpm
>+lib/X11/xcircuit/pixmaps/pu2.xpm
>+lib/X11/xcircuit/pixmaps/pz.xpm
>+lib/X11/xcircuit/pixmaps/q.xpm
>+lib/X11/xcircuit/pixmaps/s.xpm
>+lib/X11/xcircuit/pixmaps/solid.xbm
>+lib/X11/xcircuit/pixmaps/stip12.xbm
>+lib/X11/xcircuit/pixmaps/stip25.xbm
>+lib/X11/xcircuit/pixmaps/stip38.xbm
>+lib/X11/xcircuit/pixmaps/stip50.xbm
>+lib/X11/xcircuit/pixmaps/stip62.xbm
>+lib/X11/xcircuit/pixmaps/stip75.xbm
>+lib/X11/xcircuit/pixmaps/stip88.xbm
>+lib/X11/xcircuit/pixmaps/t.xpm
>+lib/X11/xcircuit/pixmaps/uj.xpm
>+lib/X11/xcircuit/pixmaps/xcircuit.xpm
>+lib/X11/xcircuit/pixmaps/yp.xpm
>+lib/X11/xcircuit/pixmaps/z4.xpm
>+lib/X11/xcircuit/pixmaps/z5.xpm
> lib/X11/xcircuit/quadparts.lps
>+lib/X11/xcircuit/resource.tcl
>+lib/X11/xcircuit/series74xx.lps
> lib/X11/xcircuit/signal.lps
>-%%TCLTK%%lib/X11/xcircuit/tkcon.tcl
>-%%TCLTK%%lib/X11/xcircuit/wrapper.tcl
>-%%TCLTK%%lib/X11/xcircuit/xcircuit.so
>-%%TCLTK%%lib/X11/xcircuit/xcircuit.tcl
>-%%NOTCLTK%%lib/X11/xcircuit/startup.script
>+lib/X11/xcircuit/sue_xc.tcl
>+lib/X11/xcircuit/tkcon.tcl
>+lib/X11/xcircuit/wrapper.tcl
>+lib/X11/xcircuit/xcircexec
> lib/X11/xcircuit/xcircps2.pro
>-%%TCLTK%%lib/X11/xcircuit/xcstartup.tcl
>+lib/X11/xcircuit/xcircuit.so
>+lib/X11/xcircuit/xcircuit.tcl
>+lib/X11/xcircuit/xcstartup.tcl
> %%PORTDOCS%%%%EXAMPLESDIR%%/.xcircuitrc
> %%PORTDOCS%%%%EXAMPLESDIR%%/FlareLED.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/USAflag.ps
>@@ -88,11 +99,14 @@
> %%PORTDOCS%%%%EXAMPLESDIR%%/analog2.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/analoglib1.lps
> %%PORTDOCS%%%%EXAMPLESDIR%%/border.ps
>+%%PORTDOCS%%%%EXAMPLESDIR%%/buses.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test2.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/diffamp_test3.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/envelope.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/fourttest.ps
>+%%PORTDOCS%%%%EXAMPLESDIR%%/logic.fspc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/logic.sim
> %%PORTDOCS%%%%EXAMPLESDIR%%/logic8.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/prelude.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/systemd1.lgf
>@@ -100,6 +114,6 @@
> %%PORTDOCS%%%%EXAMPLESDIR%%/vcoblock.ps
> %%PORTDOCS%%%%EXAMPLESDIR%%/xcclock.ps
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>-%%TCLTK%%@dirrm lib/X11/xcircuit/pixmaps
>+@dirrm lib/X11/xcircuit/pixmaps
> @dirrm lib/X11/xcircuit/fonts
> @dirrm lib/X11/xcircuit

Actions: View | Diff

Attachments on bug 82670: 54644