ports/92611: Update port: cad/xcircuit to 3.4.11
KATO Tsuguru
tkato432 at yahoo.com
Tue Jan 31 14:10:11 UTC 2006
>Number: 92611
>Category: ports
>Synopsis: Update port: cad/xcircuit to 3.4.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 31 14:10:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p14 i386
>Organization:
>Environment:
>Description:
- Update to version 3.4.11
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/cad/xcircuit/Makefile cad/xcircuit/Makefile
--- /usr/ports/cad/xcircuit/Makefile Tue Oct 18 23:34:34 2005
+++ cad/xcircuit/Makefile Fri Jan 27 02:31:12 2006
@@ -6,31 +6,28 @@
#
PORTNAME= xcircuit
-PORTVERSION= 3.3.38
+PORTVERSION= 3.4.11
PORTEPOCH= 1
CATEGORIES= cad
-MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/
+MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/
MAINTAINER= ports at FreeBSD.org
COMMENT= An X11 drawing program [especially for circuit schematics]
-LIB_DEPENDS= tk84:${PORTSDIR}/x11-toolkits/tk84 \
- tcl84:${PORTSDIR}/lang/tcl84
-
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
+USE_TCL= 84
+USE_TK= 84
USE_GHOSTSCRIPT_RUN= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \
- --with-tk=${LOCALBASE}/lib/tk8.4
-
-CFLAGS+= -fPIC -I${X11BASE}/include
+CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
+ --with-tk=${TK_LIBDIR}
-WISH= ${LOCALBASE}/bin/wish8.4
+CFLAGS+= -fPIC
pre-everything::
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
@@ -42,12 +39,10 @@
post-patch:
@${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
+ s|-Wl,-Bshareable,-x|-shared -Wl,-x|g ; \
+ s|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl${TCL_VER:S/.//}"|g ; \
+ s|TK_LIB_NAME=.*$$|TK_LIB_NAME="tk${TK_VER:S/.//}"|g ; \
+ s|wish |${WISH:T} |g' ${WRKSRC}/configure
post-install:
.if !defined(NOPORTDOCS)
diff -urN /usr/ports/cad/xcircuit/distinfo cad/xcircuit/distinfo
--- /usr/ports/cad/xcircuit/distinfo Thu Nov 24 16:02:07 2005
+++ cad/xcircuit/distinfo Thu Jan 26 15:07:47 2006
@@ -1,3 +1,3 @@
-MD5 (xcircuit-3.3.38.tar.bz2) = e7d09b3ed6ba69c899abb632c06a8382
-SHA256 (xcircuit-3.3.38.tar.bz2) = 776c3496df23f3db87ef32c23e84d23f555874eff3b7b72470c1ad7528b5c42e
-SIZE (xcircuit-3.3.38.tar.bz2) = 1115177
+MD5 (xcircuit-3.4.11.tar.bz2) = c93be6276bec4da0585bb1341eb3f037
+SHA256 (xcircuit-3.4.11.tar.bz2) = b26e36a42aebaefda8eda1ef9bb79cc4bdbd51d61a0e4d23e9e84d42ea885b82
+SIZE (xcircuit-3.4.11.tar.bz2) = 798592
diff -urN /usr/ports/cad/xcircuit/files/patch-Makefile.in cad/xcircuit/files/patch-Makefile.in
--- /usr/ports/cad/xcircuit/files/patch-Makefile.in Mon Jun 27 18:36:53 2005
+++ cad/xcircuit/files/patch-Makefile.in Mon Jan 30 22:24:54 2006
@@ -1,15 +1,15 @@
---- Makefile.in.orig Thu Jun 16 02:44:43 2005
-+++ Makefile.in Fri Jun 24 13:30:27 2005
-@@ -234,7 +234,7 @@
+--- Makefile.in.orig Tue Nov 22 06:35:37 2005
++++ Makefile.in Mon Jan 30 22:24:46 2006
+@@ -238,7 +238,7 @@
tmpdir = /tmp
- # Directory for app-defaults file
+ # Directories for app-defaults file and manual page
-appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
+appdefaultsdir = $(libdir)/X11/app-defaults
+ appmandir = $(datadir)/$(PACKAGE)-$(VERSION)/man
PATHNAMES = -DPROG_VERSION=$(VERSION) \
- -DCAD_DIR=\"$(prefix)\" \
- -DTEMP_DIR=\"$(tmpdir)\" \
-@@ -261,7 +261,7 @@
+ -DPROG_REVISION=$(REVISION) \
+@@ -266,7 +266,7 @@
INCLUDES = -IXw ${INC_SPECS}
# Library directory and files
@@ -18,12 +18,12 @@
USER_RC_FILE = .xcircuitrc
PROLOGUE_FILE = xcircps2.pro
LGF_LIB = lgf.lps
-@@ -786,7 +786,7 @@
-
- lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND}
+@@ -793,7 +793,7 @@
$(RM) lib/xcircuit${SHDLIB_EXT}
-- $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \
-+ $(LD) -o $@ ${LDDL_FLAGS} xcwrap.o \
+ $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \
${xcircuit_OBJECTS} ${xcircuit_LDADD} ${LDFLAGS} \
- ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
+- ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} ${EXTRA_LIB_SPECS} \
++ ${X_EXTRA_LIBS} ${EXTRA_LIBS} ${LIBS} ${EXTRA_LIB_SPECS} \
+ ${SHLIB_LIB_SPECS}
+ xcircexec$(EXEEXT): xcircexec.o
diff -urN /usr/ports/cad/xcircuit/pkg-descr cad/xcircuit/pkg-descr
--- /usr/ports/cad/xcircuit/pkg-descr Sun Oct 7 00:09:38 2001
+++ cad/xcircuit/pkg-descr Thu Jan 26 14:49:36 2006
@@ -1,3 +1,3 @@
xcircuit is software for drawing electrical circuits.
-WWW: http://xcircuit.ece.jhu.edu/
+WWW: http://opencircuitdesign.com/xcircuit/
diff -urN /usr/ports/cad/xcircuit/pkg-plist cad/xcircuit/pkg-plist
--- /usr/ports/cad/xcircuit/pkg-plist Sat Sep 10 13:26:01 2005
+++ cad/xcircuit/pkg-plist Thu Jan 26 17:12:57 2006
@@ -58,9 +58,11 @@
lib/X11/xcircuit/pixmaps/i.xpm
lib/X11/xcircuit/pixmaps/li.xpm
lib/X11/xcircuit/pixmaps/mk.xpm
+lib/X11/xcircuit/pixmaps/mv.xpm
lib/X11/xcircuit/pixmaps/pa.xpm
lib/X11/xcircuit/pixmaps/pl.xpm
lib/X11/xcircuit/pixmaps/pm.xpm
+lib/X11/xcircuit/pixmaps/pn.xpm
lib/X11/xcircuit/pixmaps/po2.xpm
lib/X11/xcircuit/pixmaps/pu2.xpm
lib/X11/xcircuit/pixmaps/pz.xpm
@@ -75,7 +77,11 @@
lib/X11/xcircuit/pixmaps/stip75.xbm
lib/X11/xcircuit/pixmaps/stip88.xbm
lib/X11/xcircuit/pixmaps/t.xpm
+lib/X11/xcircuit/pixmaps/tg.xpm
+lib/X11/xcircuit/pixmaps/ti.xpm
+lib/X11/xcircuit/pixmaps/tp.xpm
lib/X11/xcircuit/pixmaps/uj.xpm
+lib/X11/xcircuit/pixmaps/w.xpm
lib/X11/xcircuit/pixmaps/xcircuit.xpm
lib/X11/xcircuit/pixmaps/yp.xpm
lib/X11/xcircuit/pixmaps/z4.xpm
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list