5 files changed, 10 insertions, 97 deletions

diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index d20fd6e634f5..28c32694a1e3 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -6,23 +6,25 @@
 #
 
 PORTNAME=	electric
-PORTVERSION=	5.7.4
+PORTVERSION=	6.0.4
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 
 MAINTAINER=	lioux@FreeBSD.org
 
 USE_XLIB=	yes
 USE_MOTIF=	yes
-EXTRA_PATCHES=	${WRKDIR}/patch-prefix
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-MAKE_ENV+=	X11BASE="${X11BASE}" HACK_INSTALL_DIR="${INSTALL_DIR}"
+CONFIGURE_ARGS=	-with-x
 
 INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
 
-pre-patch:
-	${SED} "s!PREFIX!${PREFIX}!g" ${FILESDIR}/template-patch-prefix > ${EXTRA_PATCHES}
+post-patch:
+	@${PERL} -pi -e 's|/usr/local/lib/electric/|${PREFIX}/share/electric/lib/|; \
+		s|/usr/local/|${PREFIX}/|' ${WRKSRC}/src/include/config.h
+	@${PERL} -pi -e 's|/lib/electric|/share/electric/lib|' ${WRKSRC}/Makefile.in
+	@${PERL} -pi -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/cad/electric/distinfo b/cad/electric/distinfo
index 8d4e7a920c81..e4eea3d71c13 100644
--- a/cad/electric/distinfo
+++ b/cad/electric/distinfo
@@ -1 +1 @@
-MD5 (electric-5.7.4.tar.gz) = b5fffef439f68dc575b37574b2df0d17
+MD5 (electric-6.04.tar.gz) = cd4710379fa0b053ce7d4df7ff867ff4
diff --git a/cad/electric/files/patch-aa b/cad/electric/files/patch-aa
deleted file mode 100644
index 73428b5da7a5..000000000000
--- a/cad/electric/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.in.orig	Tue Mar 21 19:44:24 2000
-+++ Makefile.in	Wed Nov  1 03:49:14 2000
-@@ -14,7 +14,7 @@
- ############################################### X WIDGET SELECTION ############
- ##### If using Motif/Lesstif widgets, uncomment the next two lines
- TIFFLAGS = -DUSETIF
--XTLIBS = -lXm @XMULIB@ -lXt
-+XTLIBS = ${MOTIFLIB} @XMULIB@ -lXt
- 
- ##### If using Athena widgets, uncomment the next line
- # XTLIBS = -lXaw @XMULIB@ -lXt
-@@ -356,18 +356,19 @@
- BUILDOPTS = $(DEBUG)
- BUILDDIR = obj
- HDS = src/include
--EXTRA_CFLAGS = $(LANGCFLAGS) $(PROJCFLAGS) $(CADENCECFLAGS)
--CFLAGS = $(EXTRA_CFLAGS) $(DEBUG) -I$(HDS) $(MULTIPROCESSORCFLAGS)
-+EXTRA_CFLAGS = $(LANGCFLAGS) $(PROJCFLAGS) $(CADENCECFLAGS) @CFLAGS@ -I$(X11BASE)/include
-+CFLAGS = $(EXTRA_CFLAGS) $(DEBUG) -I$(HDS) $(MULTIPROCESSORCFLAGS) 
- XCFLAGS = @X_CFLAGS@ $(CFLAGS) $(TIFFLAGS) $(XPOWER)
- INSTALL = cp
--INSTALL_PROGRAM = $(INSTALL)
--INSTALL_DATA = $(INSTALL)
-+INSTALL_PROGRAM = $(BSD_INSTALL_PROGRAM)
-+INSTALL_DATA = $(BSD_INSTALL_DATA)
-+INSTALL_DIR = $(HACK_INSTALL_DIR)
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- LIBS = @X_PRE_LIBS@ @X_LIBS@ $(XTLIBS) -lX11 -lm @X_EXTRA_LIBS@
- 
- # the target of the build
--electric: $(CORE_OBJS)
-+all: $(CORE_OBJS)
- 	$(COMPILER) $(BUILDOPTS) -o electric $(CORE_OBJS) $(LIBS)
-  
- clean:
-@@ -422,15 +423,17 @@
- 	rm -f src/usr/*~ src/usr/"#"*"#"
- 	rm -f src/vhdl/*~ src/vhdl/"#"*"#"
- 
--install: all $(prefix)/electric $(prefix)/electric/lib
-+install: all @datadir@/electric @datadir@/electric/lib
- 	$(INSTALL_PROGRAM) electric @bindir@/electric
--	$(INSTALL_DATA) lib/* $(prefix)/electric/lib
--	$(INSTALL_DATA) lib/.cadrc $(prefix)/electric/lib
--
--$(prefix)/electric:
--	mkdir $(prefix)/electric
--$(prefix)/electric/lib:
--	mkdir $(prefix)/electric/lib
-+	$(INSTALL_DATA) lib/*.help @datadir@/electric/lib
-+	$(INSTALL_DATA) lib/*.mac @datadir@/electric/lib
-+	$(INSTALL_DATA) lib/*.txt @datadir@/electric/lib
-+	$(INSTALL_DATA) lib/.cadrc @datadir@/electric/lib
-+
-+@datadir@/electric:
-+	$(INSTALL_DIR) @datadir@/electric
-+@datadir@/electric/lib:
-+	$(INSTALL_DIR) @datadir@/electric/lib
- 
- uninstall:
- 	rm -f @bindir@/electric
diff --git a/cad/electric/files/template-patch-prefix b/cad/electric/files/template-patch-prefix
deleted file mode 100644
index d7e0356b8a72..000000000000
--- a/cad/electric/files/template-patch-prefix
+++ /dev/null
@@ -1,28 +0,0 @@
-This patch teaches it a little bit about hier(7)
-
---- src/include/config.h.ORIG	Thu May  4 01:19:57 2000
-+++ src/include/config.h	Thu May  4 01:22:03 2000
-@@ -110,15 +110,15 @@
- #  define ELECTRICLOG        ".electric.log"
- #  define ELECTRICLOGSAVE    ".electriclast.log"
- #  define OPTIONSFILE        ".electricoptions.elib"
--#  define LIBDIR             "lib/"
-+#  define LIBDIR             "PREFIX/share/electric/lib/"
- #  define SORTLOC            "/usr/bin/sort"
--#  define ESIMLOC            "/usr/local/bin/esim"
--#  define RSIMLOC            "/usr/local/bin/rsim"
--#  define PRESIMLOC          "/usr/local/bin/presim"
--#  define RNLLOC             "/usr/local/bin/rnl"
--#  define SPICELOC           "/usr/local/bin/spice"
--#  define FLATDRCLOC         "/usr/local/bin/ffindshort"
--#  define SFLATDRCLOC        "/usr/local/bin/findshort"
-+#  define ESIMLOC            "PREFIX/bin/esim"
-+#  define RSIMLOC            "PREFIX/bin/rsim"
-+#  define PRESIMLOC          "PREFIX/bin/presim"
-+#  define RNLLOC             "PREFIX/bin/rnl"
-+#  define SPICELOC           "PREFIX/bin/spice"
-+#  define FLATDRCLOC         "PREFIX/bin/ffindshort"
-+#  define SFLATDRCLOC        "PREFIX/bin/findshort"
- #  define HUGEINT            0x7FFFFFFF		/* largest possible integer */
-    typedef          long   INTBIG;			/* at least 32 bits, can hold address */
-    typedef          short  INTSML;			/* at least 16 bits */
diff --git a/cad/electric/pkg-plist b/cad/electric/pkg-plist
index 177b2750afaa..6f7b1ec36f36 100644
--- a/cad/electric/pkg-plist
+++ b/cad/electric/pkg-plist
@@ -5,6 +5,7 @@ share/electric/lib/EVE.help
 share/electric/lib/QUISC.help
 share/electric/lib/evemenus.mac
 share/electric/lib/evetutor.mac
+share/electric/lib/pads4u.txt
 share/electric/lib/pla_mocmos.txt
 share/electric/lib/sclib.txt
 share/electric/lib/tsmc25.txt