[65859] trunk/dports/graphics/electric
ryandesign at macports.org
ryandesign at macports.org
Thu Apr 1 23:57:47 PDT 2010
Revision: 65859
http://trac.macports.org/changeset/65859
Author: ryandesign at macports.org
Date: 2010-04-01 23:57:44 -0700 (Thu, 01 Apr 2010)
Log Message:
-----------
electric: update to 8.11, which is now written in Java, which means pretty much everything we did before in the Portfile is now obsolete
Modified Paths:
--------------
trunk/dports/graphics/electric/Portfile
Removed Paths:
-------------
trunk/dports/graphics/electric/files/patch-Makefile.in_motif
trunk/dports/graphics/electric/files/patch-Makefile.in_paths
trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_mac
trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_x11
trunk/dports/graphics/electric/files/patch-src_db_dbtext.c
trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macqt
trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macx11
trunk/dports/graphics/electric/files/patch-src_graph_graphunixx11.c
trunk/dports/graphics/electric/files/patch-src_include_config.h_macx11
trunk/dports/graphics/electric/files/patch-src_include_config.h_paths
trunk/dports/graphics/electric/files/patch-src_include_global.h
Modified: trunk/dports/graphics/electric/Portfile
===================================================================
--- trunk/dports/graphics/electric/Portfile 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/Portfile 2010-04-02 06:57:44 UTC (rev 65859)
@@ -2,7 +2,7 @@
PortSystem 1.0
name electric
-version 7.00
+version 8.11
categories graphics electronics science
maintainers nomaintainer
description CAD system for VLSI circuit design
@@ -15,54 +15,32 @@
homepage http://www.staticfreesoft.com/
master_sites gnu
+set jar electricBinary-${version}.jar
+distfiles ${jar}
+extract.only
-checksums md5 64c89f820467b418d24ddf6c7e206c08
+checksums md5 13323d7e5aa3329a4a736b9227a868bc \
+ sha1 f8936656700832bdbf7f8910f1920da9ac828be5 \
+ rmd160 ec97a0c87ec32c5c810828d5814ba176526a3aeb
-patchfiles patch-Makefile.in_paths patch-src_include_config.h_paths \
- patch-src_include_global.h patch-src_db_dbtext.c
+depends_run bin:java:kaffe
-post-patch {
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/include/config.h
-}
+use_configure no
-destroot.target install install.html
+build {}
-# Need to select some HI variant, so we'll try and be clever here
-if {[variant_isset darwin]} {
- default_variants +qt3-mac
-} else {
- default_variants +qt3-x11
+destroot {
+ set javadir ${prefix}/share/java
+ xinstall -d ${destroot}${javadir}
+ xinstall -m 644 ${distpath}/${jar} ${destroot}${javadir}/${name}.jar
+ xinstall ${filespath}/${name} ${destroot}${prefix}/bin
+ reinplace "s|@JAR@|${javadir}/${name}.jar|g" ${destroot}${prefix}/bin/${name}
}
-variant motif {
- depends_lib-append lib:libXm.4:openmotif
- patchfiles-append patch-Makefile.in_motif \
- patch-src_include_config.h_macx11
-}
-
-variant qt3_mac conflicts qt3_x11 {
- depends_lib-append lib:libqt-mt:qt3-mac
- patchfiles-append patch-Makefile.in_qt3_mac \
- patch-src_graph_graphqt.cpp_macqt
- build.args-append QTDIR=${prefix}
- destroot {
- set dpApps ${destroot}/Applications/MacPorts
- xinstall -m 755 -d ${dpApps}
- file copy ${worksrcpath}/electric.app ${dpApps}
- file copy ${worksrcpath}/lib ${dpApps}/electric.app/Contents
+platform darwin {
+ post-destroot {
+ set appname Electric
+ xinstall -d ${destroot}${applications_dir}/${appname}.app/Contents/MacOS
+ ln -s ${prefix}/bin/${name} ${destroot}${applications_dir}/${appname}.app/Contents/MacOS/${appname}
}
}
-
-variant qt3_x11 conflicts qt3_mac {
- depends_lib-append lib:libqt-mt:qt3
- patchfiles-append patch-Makefile.in_qt3_x11 \
- patch-src_include_config.h_macx11 \
- patch-src_graph_graphqt.cpp_macx11
- build.args-append QTDIR=${prefix}
- destroot.args-append QTDIR=${prefix}
-}
-
-platform darwin {
- patchfiles-append patch-src_graph_graphunixx11.c
-}
-
Deleted: trunk/dports/graphics/electric/files/patch-Makefile.in_motif
===================================================================
--- trunk/dports/graphics/electric/files/patch-Makefile.in_motif 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-Makefile.in_motif 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,13 +0,0 @@
---- Makefile.in.orig Tue Feb 10 15:24:08 2004
-+++ Makefile.in Tue Feb 10 15:24:23 2004
-@@ -20,8 +20,8 @@
-
- ########################################################### USING MOTIF
- ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines
--GRAPH_FLAGS = @X_CFLAGS@
--GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
-+GRAPH_FLAGS = @X_CFLAGS@ @CPPFLAGS@
-+GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 @LDFLAGS@
- GRAPH_OBJS = $(GRAPH_OBJS_XT)
- GRAPH_SRC = $(GRAPH_SRC_XT)
- CCOMPILER = @PTHREAD_CC@
Deleted: trunk/dports/graphics/electric/files/patch-Makefile.in_paths
===================================================================
--- trunk/dports/graphics/electric/files/patch-Makefile.in_paths 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-Makefile.in_paths 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,34 +0,0 @@
---- Makefile.in.orig Thu Jul 15 19:59:50 2004
-+++ Makefile.in Sat Nov 6 20:06:29 2004
-@@ -936,7 +936,7 @@
- rm -f src/vhdl/*~ src/vhdl/"#"*"#"
-
- install: all
-- $(INSTALL) -d -m755 @bindir@ $(DESTDIR)@datadir@/electric/lib
-+ $(INSTALL) -d -m755 $(DESTDIR)@bindir@ $(DESTDIR)@datadir@/electric/lib
- $(INSTALL) -m755 $(PROGNAME) $(DESTDIR)@bindir@/$(PROGNAME)
- $(INSTALL) -m644 lib/.cadrc $(DESTDIR)@datadir@/electric/lib
- @(cd lib ; \
-@@ -960,15 +960,15 @@
- done ) ; \
- done ) ;
-
--$(prefix)/$(PROGNAME):
-- mkdir $(prefix)/$(PROGNAME)
--$(prefix)/$(PROGNAME)/lib:
-- mkdir $(prefix)/$(PROGNAME)/lib
-+$(DESTDIR)$(prefix)/$(PROGNAME):
-+ mkdir $(DESTDIR)$(prefix)/$(PROGNAME)
-+$(DESTDIR)$(prefix)/$(PROGNAME)/lib:
-+ mkdir $(DESTDIR)$(prefix)/$(PROGNAME)/lib
-
- uninstall:
-- rm -f @bindir@/$(PROGNAME)
-- rm -rf @datadir@/electric/lib
-- rm -rf @datadir@/electric/doc
-+ rm -f $(DESTDIR)@bindir@/$(PROGNAME)
-+ rm -rf $(DESTDIR)@datadir@/electric/lib
-+ rm -rf $(DESTDIR)@datadir@/electric/doc
-
- depend:
- grep '^\#[ ]*include' `ls -1 src/*/*.c src/*/*.cpp` | \
Deleted: trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_mac
===================================================================
--- trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_mac 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_mac 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,47 +0,0 @@
---- Makefile.in.orig Tue Feb 10 15:24:08 2004
-+++ Makefile.in Tue Feb 10 15:25:05 2004
-@@ -1,18 +1,18 @@
- ########################################################## USING QT
- ##### If using Qt, uncomment these five lines
--# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS)
--# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
--# GRAPH_OBJS = $(GRAPH_OBJS_QT)
--# GRAPH_SRC = $(GRAPH_SRC_QT)
--# CCOMPILER = @CXX@
-+GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include -I$(QTDIR)/include/qt3 $(QUI_CFLAGS)
-+GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
-+GRAPH_OBJS = $(GRAPH_OBJS_QT)
-+GRAPH_SRC = $(GRAPH_SRC_QT)
-+CCOMPILER = @CXX@
-
- ##### Qt on UNIX/Linux: uncomment the next two lines:
--ELECTRIC_TARGET = electric-target-unix
--QT_LIB_EXTRAS = -lqt-mt -lX11
-+#ELECTRIC_TARGET = electric-target-unix
-+#QT_LIB_EXTRAS = -lqt-mt -lX11
-
- ##### Qt on Macintosh: uncomment the next two lines (for Qt Evaluation, change "-lqt" to "-lqt-mt"):
--# ELECTRIC_TARGET = electric-target-mac
--# QT_LIB_EXTRAS = -prebind -framework Carbon -lqt -lz -framework Quicktime
-+ELECTRIC_TARGET = electric-target-mac
-+QT_LIB_EXTRAS = -prebind -framework Carbon -lqt-mt -lz -framework Quicktime
-
- ##### Using ".ui" forms on Qt
- QUI_LIBS = -lqui
-@@ -20,11 +20,11 @@
-
- ########################################################### USING MOTIF
- ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines
--GRAPH_FLAGS = @X_CFLAGS@
--GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
--GRAPH_OBJS = $(GRAPH_OBJS_XT)
--GRAPH_SRC = $(GRAPH_SRC_XT)
--CCOMPILER = @PTHREAD_CC@
-+#GRAPH_FLAGS = @X_CFLAGS@
-+#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
-+#GRAPH_OBJS = $(GRAPH_OBJS_XT)
-+#GRAPH_SRC = $(GRAPH_SRC_XT)
-+#CCOMPILER = @PTHREAD_CC@
-
- ##### For the general-purpose X facility, uncomment this line
- XPOWER = -DANYDEPTH
Deleted: trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_x11
===================================================================
--- trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_x11 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-Makefile.in_qt3_x11 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,35 +0,0 @@
---- Makefile.in.orig Tue Feb 10 15:24:08 2004
-+++ Makefile.in Tue Feb 10 15:26:13 2004
-@@ -1,10 +1,10 @@
- ########################################################## USING QT
- ##### If using Qt, uncomment these five lines
--# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS)
--# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
--# GRAPH_OBJS = $(GRAPH_OBJS_QT)
--# GRAPH_SRC = $(GRAPH_SRC_QT)
--# CCOMPILER = @CXX@
-+GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include -I$(QTDIR)/include/qt3 $(QUI_CFLAGS)
-+GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
-+GRAPH_OBJS = $(GRAPH_OBJS_QT)
-+GRAPH_SRC = $(GRAPH_SRC_QT)
-+CCOMPILER = @CXX@
-
- ##### Qt on UNIX/Linux: uncomment the next two lines:
- ELECTRIC_TARGET = electric-target-unix
-@@ -20,11 +20,11 @@
-
- ########################################################### USING MOTIF
- ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines
--GRAPH_FLAGS = @X_CFLAGS@
--GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
--GRAPH_OBJS = $(GRAPH_OBJS_XT)
--GRAPH_SRC = $(GRAPH_SRC_XT)
--CCOMPILER = @PTHREAD_CC@
-+#GRAPH_FLAGS = @X_CFLAGS@
-+#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
-+#GRAPH_OBJS = $(GRAPH_OBJS_XT)
-+#GRAPH_SRC = $(GRAPH_SRC_XT)
-+#CCOMPILER = @PTHREAD_CC@
-
- ##### For the general-purpose X facility, uncomment this line
- XPOWER = -DANYDEPTH
Deleted: trunk/dports/graphics/electric/files/patch-src_db_dbtext.c
===================================================================
--- trunk/dports/graphics/electric/files/patch-src_db_dbtext.c 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-src_db_dbtext.c 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,11 +0,0 @@
---- src/db/dbtext.c.orig 2004-07-15 19:59:51.000000000 -0600
-+++ src/db/dbtext.c 2005-10-01 16:53:11.000000000 -0600
-@@ -3631,7 +3631,7 @@
- inf->infstr[inf->infstrptr] = 0;
- }
-
--void addstringtoinfstr(void *vinf, CHAR *pp)
-+void addstringtoinfstr(void *vinf, const CHAR *pp)
- {
- REGISTER CHAR *str;
- REGISTER INTBIG l, i, ori;
Deleted: trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macqt
===================================================================
--- trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macqt 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macqt 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,23 +0,0 @@
---- src/graph/graphqt.cpp.orig Thu Jul 15 19:59:53 2004
-+++ src/graph/graphqt.cpp Sat Nov 6 20:12:21 2004
-@@ -1320,9 +1320,19 @@
- return;
- }
-
-- /* try the current location (look for "lib") */
-+ /* try the current location, or on Mac OS X, in the app bundle (look for "lib") */
- infstr = initinfstr();
-+#ifdef MACOSX
-+ CFURLRef bundleRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-+ CFStringRef macPath = CFURLCopyFileSystemPath(bundleRef, kCFURLPOSIXPathStyle);
-+ const char *pathPtr = CFStringGetCStringPtr(macPath, CFStringGetSystemEncoding());
-+ addstringtoinfstr(infstr, pathPtr);
-+ addstringtoinfstr(infstr, "/Contents/");
-+ CFRelease(macPath);
-+ CFRelease(bundleRef);
-+#else
- addstringtoinfstr(infstr, currentdirectory());
-+#endif
- addstringtoinfstr(infstr, "lib/");
- addstringtoinfstr(infstr, CADRCFILENAME);
- pt = returninfstr(infstr);
Deleted: trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macx11
===================================================================
--- trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macx11 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-src_graph_graphqt.cpp_macx11 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,36 +0,0 @@
---- src/graph/graphqt.cpp.orig Thu Jul 15 19:59:53 2004
-+++ src/graph/graphqt.cpp Sat Nov 6 20:15:22 2004
-@@ -102,6 +102,10 @@
- # include <io.h>
- #endif
-
-+#ifdef __APPLE__
-+# include <sys/sysctl.h>
-+#endif
-+
- #if LANGTCL
- # include "dblang.h"
- Tcl_Interp *gra_tclinterp;
-@@ -2359,8 +2363,22 @@
- */
- INTBIG enumprocessors(void)
- {
-+#ifdef __APPLE__
-+ int ctlName[ 2 ], numproc, result;
-+ size_t numSize;
-+
-+ ctlName[ 0 ] = CTL_HW;
-+ ctlName[ 1 ] = HW_NCPU;
-+ numSize = sizeof( numproc );
-+ result = sysctl( ctlName, 2, &numproc, &numSize, NULL, 0 );
-+ if( result == 0 )
-+ return( (INTBIG) numproc );
-+ else
-+ return( 1 );
-+#else
- #ifdef ONUNIX
- return(sysconf(_SC_NPROCESSORS_ONLN));
-+#endif
- #endif
- #ifdef MACOS
- return(MPProcessors());
Deleted: trunk/dports/graphics/electric/files/patch-src_graph_graphunixx11.c
===================================================================
--- trunk/dports/graphics/electric/files/patch-src_graph_graphunixx11.c 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-src_graph_graphunixx11.c 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,38 +0,0 @@
---- src/graph/graphunixx11.c.orig Thu Jul 15 19:59:53 2004
-+++ src/graph/graphunixx11.c Sat Nov 6 20:16:31 2004
-@@ -151,6 +151,10 @@
- INTBIG gra_initializetcl(void);
- #endif
-
-+#ifdef __APPLE__
-+# include <sys/sysctl.h>
-+#endif
-+
- #ifdef _UNICODE
- # define estat _wstat
- # define eaccess _waccess
-@@ -3087,10 +3091,24 @@
- */
- INTBIG enumprocessors(void)
- {
-+#ifdef __APPLE__
-+ int ctlName[ 2 ], numproc, result;
-+ size_t numSize;
-+
-+ ctlName[ 0 ] = CTL_HW;
-+ ctlName[ 1 ] = HW_NCPU;
-+ numSize = sizeof( numproc );
-+ result = sysctl( ctlName, 2, &numproc, &numSize, NULL, 0 );
-+ if( result == 0 )
-+ return( (INTBIG) numproc );
-+ else
-+ return( 1 );
-+#else
- INTBIG numproc;
-
- numproc = sysconf(_SC_NPROCESSORS_ONLN);
- return(numproc);
-+#endif
- }
-
- /*
Deleted: trunk/dports/graphics/electric/files/patch-src_include_config.h_macx11
===================================================================
--- trunk/dports/graphics/electric/files/patch-src_include_config.h_macx11 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-src_include_config.h_macx11 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,20 +0,0 @@
---- src/include/config.h.orig Thu May 22 12:35:30 2003
-+++ src/include/config.h Tue Feb 10 01:17:16 2004
-@@ -35,7 +35,7 @@
- /********************* MACHINE DETERMINATION *********************/
-
- /* determine if it is Macintosh OS */
--#if defined(__APPLE__)
-+/*#if defined(__APPLE__)
- # define MACOSX 1
- # if __APPLE_CC__ <= 934
- # define MACOSX_101 1
-@@ -43,7 +43,7 @@
- #endif
- #if defined(THINK_C) || defined(THINK_CPLUS) || defined(__MWERKS__) || defined(MACOSX)
- # define MACOS 1
--#endif
-+#endif*/
-
- /* determine if it is Windows 9x/NT */
- #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
Deleted: trunk/dports/graphics/electric/files/patch-src_include_config.h_paths
===================================================================
--- trunk/dports/graphics/electric/files/patch-src_include_config.h_paths 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-src_include_config.h_paths 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,13 +0,0 @@
---- src/include/config.h.orig Thu May 22 12:35:30 2003
-+++ src/include/config.h Tue Feb 10 01:17:16 2004
-@@ -157,8 +157,8 @@
- # define SFLATDRCLOC x_("/usr/local/bin/findshort")
- # define u_int64_t uint64_t
- # else
--# define LIBDIR x_("/usr/share/electric/lib/") /* location of library files */
--# define DOCDIR x_("/usr/share/electric/doc/html/") /* location of HTML files */
-+# define LIBDIR x_("@PREFIX@/share/electric/lib/") /* location of library files */
-+# define DOCDIR x_("@PREFIX@/share/doc/electric/html/") /* location of HTML files */
- # define ESIMLOC x_("/usr/bin/esim")
- # define RSIMLOC x_("/usr/bin/rsim")
- # define PRESIMLOC x_("/usr/bin/presim")
Deleted: trunk/dports/graphics/electric/files/patch-src_include_global.h
===================================================================
--- trunk/dports/graphics/electric/files/patch-src_include_global.h 2010-04-02 06:47:55 UTC (rev 65858)
+++ trunk/dports/graphics/electric/files/patch-src_include_global.h 2010-04-02 06:57:44 UTC (rev 65859)
@@ -1,11 +0,0 @@
---- src/include/global.h.orig 2004-07-15 19:59:53.000000000 -0600
-+++ src/include/global.h 2005-10-01 16:53:05.000000000 -0600
-@@ -2169,7 +2169,7 @@
- INTBIG parse(CHAR *keyword, COMCOMP *list, BOOLEAN noise);
- void *initinfstr(void);
- void addtoinfstr(void*, CHAR c);
--void addstringtoinfstr(void*, CHAR *str);
-+void addstringtoinfstr(void*, const CHAR *str);
- void formatinfstr(void*, CHAR *msg, ...);
- CHAR *returninfstr(void*);
- void *newstringarray(CLUSTER *cluster);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100401/c5f1e294/attachment-0001.html>
More information about the macports-changes
mailing list