- Update to 3.4.11

- Update WWW and master site
- use USE_TCL and USE_TK

Submitted by:	Ports fury
PR:		ports/92611

5 files changed, 36 insertions, 31 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 30d7205db71e..8d46ae30f0a0 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -6,31 +6,30 @@
 #
 
 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@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
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR}
 
-CFLAGS+=	-fPIC -I${X11BASE}/include
+CFLAGS+=	-fPIC
 
-WISH=		${LOCALBASE}/bin/wish8.4
+MAN1=		xcircuit.1
 
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
@@ -42,12 +41,10 @@ pre-everything::
 
 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 --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 0d21f6bc078f..33a7d638ab2b 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -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 --git a/cad/xcircuit/files/patch-Makefile.in b/cad/xcircuit/files/patch-Makefile.in
index 26e6287a8388..a482a221a7dd 100644
--- a/cad/xcircuit/files/patch-Makefile.in
+++ b/cad/xcircuit/files/patch-Makefile.in
@@ -1,15 +1,17 @@
---- 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	Mon Nov 21 22:35:37 2005
++++ Makefile.in	Wed Feb  1 02:58:02 2006
+@@ -238,8 +238,8 @@
  tmpdir = /tmp
  
- # Directory for app-defaults file
+ # Directories for app-defaults file and manual page
 -appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
+-appmandir = $(datadir)/$(PACKAGE)-$(VERSION)/man
 +appdefaultsdir = $(libdir)/X11/app-defaults
++appmandir = $(prefix)/man/man1
  PATHNAMES = -DPROG_VERSION=$(VERSION) \
+ 	-DPROG_REVISION=$(REVISION) \
  	-DCAD_DIR=\"$(prefix)\" \
- 	-DTEMP_DIR=\"$(tmpdir)\" \
-@@ -261,7 +261,7 @@
+@@ -266,7 +266,7 @@
  INCLUDES = -IXw ${INC_SPECS}
  
  # Library directory and files
@@ -18,12 +20,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 --git a/cad/xcircuit/pkg-descr b/cad/xcircuit/pkg-descr
index 8895103c54dd..49fb4af26479 100644
--- a/cad/xcircuit/pkg-descr
+++ b/cad/xcircuit/pkg-descr
@@ -1,3 +1,3 @@
 xcircuit is software for drawing electrical circuits.
 
-WWW: http://xcircuit.ece.jhu.edu/
+WWW: http://opencircuitdesign.com/xcircuit/
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index 6e3e9191dcdb..38b00b88276c 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -58,9 +58,11 @@ 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/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/stip62.xbm
 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