[52091] trunk/dports/science/qucs
rowue at macports.org
rowue at macports.org
Tue Jun 9 15:04:06 PDT 2009
Revision: 52091
http://trac.macports.org/changeset/52091
Author: rowue at macports.org
Date: 2009-06-09 15:04:06 -0700 (Tue, 09 Jun 2009)
Log Message:
-----------
Update to 0.0.15
Modified Paths:
--------------
trunk/dports/science/qucs/Portfile
trunk/dports/science/qucs/files/patch-configure.diff
trunk/dports/science/qucs/files/patch-qucs_qucsdigi.diff
Added Paths:
-----------
trunk/dports/science/qucs/files/patch-Makefile.in.diff
Modified: trunk/dports/science/qucs/Portfile
===================================================================
--- trunk/dports/science/qucs/Portfile 2009-06-09 21:53:42 UTC (rev 52090)
+++ trunk/dports/science/qucs/Portfile 2009-06-09 22:04:06 UTC (rev 52091)
@@ -4,8 +4,7 @@
PortSystem 1.0
name qucs
-version 0.0.14
-revision 7
+version 0.0.15
categories science electronics
maintainers rowue
platforms darwin
@@ -15,9 +14,10 @@
It's based on QT
homepage http://qucs.sourceforge.net/
master_sites sourceforge
-checksums md5 6c2b7ec626ccb167eb089c322d21aed0 \
- sha1 2563657d3659e1c7d45399f0c10dbc9fe4850b04 \
- rmd160 3962ca9e893f828d7e1bb033815f07e651c83e49
+checksums md5 5a35eee790c92eba97de181b12794823 \
+ sha1 fa0d19cbb49991d03e25726251bd153f3005732a \
+ rmd160 ced0243add1600bf6645963248051c7aef7903de
+
depends_lib port:qt3-mac \
port:freehdl \
port:libtool \
@@ -25,17 +25,17 @@
port:asco
use_parallel_build yes
patchfiles patch-configure.diff \
+ patch-qucs_qucsdigi.diff \
+ patch-qucs_qucsveri.diff \
patch-qucs-main.cpp.diff \
patch-qucs-main.h.diff \
patch-qucs-qucs_actions.cpp.diff \
- patch-qucs_qucsdigi.diff \
- patch-qucs_qucsveri.diff
+ patch-Makefile.in.diff
-
post-patch {
- reinplace "s|@APPDIR@|${applications_dir}|g" ${worksrcpath}/qucs/main.cpp
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/qucs/qucsdigi
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/qucs/qucsveri
+ reinplace "s|@APPDIR@|${applications_dir}|g" ${worksrcpath}/qucs/main.cpp
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/qucs/qucsdigi
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/qucs/qucsveri
}
post-destroot {
Added: trunk/dports/science/qucs/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/science/qucs/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/science/qucs/files/patch-Makefile.in.diff 2009-06-09 22:04:06 UTC (rev 52091)
@@ -0,0 +1,101 @@
+--- Makefile.in.orig 2009-06-09 20:14:07.000000000 +0200
++++ Makefile.in 2009-06-09 21:35:12.000000000 +0200
+@@ -105,8 +105,6 @@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-COND_MACOSX_FALSE = @COND_MACOSX_FALSE@
+-COND_MACOSX_TRUE = @COND_MACOSX_TRUE@
+ COND_WIN32_FALSE = @COND_WIN32_FALSE@
+ COND_WIN32_TRUE = @COND_WIN32_TRUE@
+ CPP = @CPP@
+@@ -219,15 +217,6 @@
+
+ EXTRA_DIST = autogen.sh depcomp PLATFORMS RELEASE Info.plist
+
+-# MacOSX specific installation of applications
+- at COND_MACOSX_TRUE@app_PROGS = $(top_builddir)/qucs/qucs \
+- at COND_MACOSX_TRUE@ $(top_builddir)/qucs-attenuator/qucsattenuator \
+- at COND_MACOSX_TRUE@ $(top_builddir)/qucs-filter/qucsfilter \
+- at COND_MACOSX_TRUE@ $(top_builddir)/qucs-help/qucshelp \
+- at COND_MACOSX_TRUE@ $(top_builddir)/qucs-lib/qucslib \
+- at COND_MACOSX_TRUE@ $(top_builddir)/qucs-edit/qucsedit \
+- at COND_MACOSX_TRUE@ $(top_builddir)/qucs-transcalc/qucstrans
+-
+ CLEANFILES = *~ *.rej *.orig
+ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
+ stamp-h.in stamp-h[0-9].in
+@@ -603,7 +592,6 @@
+
+ install-exec-am:
+ @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
+ install-info: install-info-recursive
+
+@@ -651,65 +639,6 @@
+ uninstall-info-am
+
+
+- at COND_MACOSX_TRUE@install-exec-hook: mac-install-apps mac-install-framework
+-
+- at COND_MACOSX_TRUE@mac-install-apps:
+- at COND_MACOSX_TRUE@ @echo "Creating MacOSX applications...";
+- at COND_MACOSX_TRUE@ @list='$(app_PROGS)'; for file in $$list; do \
+- at COND_MACOSX_TRUE@ app=`basename $$file` && \
+- at COND_MACOSX_TRUE@ $(mkinstalldirs) $(bindir)/$$app.app/Contents && \
+- at COND_MACOSX_TRUE@ $(mkinstalldirs) $(bindir)/$$app.app/Contents/Resources && \
+- at COND_MACOSX_TRUE@ $(mkinstalldirs) $(bindir)/$$app.app/Contents/MacOS && \
+- at COND_MACOSX_TRUE@ $(install_sh_PROGRAM) $$file $(bindir)/$$app.app/Contents/MacOS/ && \
+- at COND_MACOSX_TRUE@ strip $(bindir)/$$app.app/Contents/MacOS/$$app && \
+- at COND_MACOSX_TRUE@ case $$app in \
+- at COND_MACOSX_TRUE@ qucs) desc="Qucs";; \
+- at COND_MACOSX_TRUE@ qucsattenuator) desc="Qucs Attenuator";; \
+- at COND_MACOSX_TRUE@ qucsfilter) desc="Qucs Filter";; \
+- at COND_MACOSX_TRUE@ qucshelp) desc="Qucs Help";; \
+- at COND_MACOSX_TRUE@ qucslib) desc="Qucs Library";; \
+- at COND_MACOSX_TRUE@ qucsedit) desc="Qucs Editor";; \
+- at COND_MACOSX_TRUE@ qucstrans) desc="Qucs Transcalc";; \
+- at COND_MACOSX_TRUE@ esac && \
+- at COND_MACOSX_TRUE@ cat $(srcdir)/Info.plist | \
+- at COND_MACOSX_TRUE@ sed -e "s/@version@/$(PACKAGE_VERSION)/g" | \
+- at COND_MACOSX_TRUE@ sed -e "s/@name@/$$desc/g" | \
+- at COND_MACOSX_TRUE@ sed -e "s/@exec@/$$app/g" > \
+- at COND_MACOSX_TRUE@ $(bindir)/$$app.app/Contents/Info.plist && \
+- at COND_MACOSX_TRUE@ $(install_sh_DATA) $(srcdir)/qucs/bitmaps/$$app.icns \
+- at COND_MACOSX_TRUE@ $(bindir)/$$app.app/Contents/Resources/application.icns && \
+- at COND_MACOSX_TRUE@ echo "#!/bin/sh\n$(bindir)/$$app.app/Contents/MacOS/$$app \$$*\n" > \
+- at COND_MACOSX_TRUE@ $(bindir)/$$app && \
+- at COND_MACOSX_TRUE@ chmod +x $(bindir)/$$app; \
+- at COND_MACOSX_TRUE@ done
+-
+- at COND_MACOSX_TRUE@mac-install-framework:
+- at COND_MACOSX_TRUE@ @echo "Copying and setting up MacOSX/Qt framework...";
+- at COND_MACOSX_TRUE@ @if test -e "$(QTDIR)/lib/libqt.3.dylib"; then \
+- at COND_MACOSX_TRUE@ qtlib="$(QTDIR)/lib/libqt.3.dylib"; fi && \
+- at COND_MACOSX_TRUE@ if test -e "$(QTDIR)/lib/libqt-mt.3.dylib"; then \
+- at COND_MACOSX_TRUE@ qtlib="$(QTDIR)/lib/libqt-mt.3.dylib"; fi && \
+- at COND_MACOSX_TRUE@ if ! test -z "$$qtlib"; then \
+- at COND_MACOSX_TRUE@ $(mkinstalldirs) "$(bindir)/qucs.app/Contents/Frameworks"; \
+- at COND_MACOSX_TRUE@ cp "$$qtlib" "$(bindir)/qucs.app/Contents/Frameworks/"; \
+- at COND_MACOSX_TRUE@ qtlib=`basename $$qtlib`; \
+- at COND_MACOSX_TRUE@ install_name_tool -id "@executable_path/../Frameworks/$$qtlib" \
+- at COND_MACOSX_TRUE@ "$(bindir)/qucs.app/Contents/Frameworks/$$qtlib"; \
+- at COND_MACOSX_TRUE@ list='$(app_PROGS)'; for file in $$list; do \
+- at COND_MACOSX_TRUE@ app=`basename $$file` && \
+- at COND_MACOSX_TRUE@ install_name_tool -change $$qtlib \
+- at COND_MACOSX_TRUE@ "@executable_path/../../../qucs.app/Contents/Frameworks/$$qtlib" \
+- at COND_MACOSX_TRUE@ "$(bindir)/$$app.app/Contents/MacOS/$$app"; \
+- at COND_MACOSX_TRUE@ done; \
+- at COND_MACOSX_TRUE@ fi
+-
+- at COND_MACOSX_TRUE@uninstall-hook:
+- at COND_MACOSX_TRUE@ @list='$(app_PROGS)'; for file in $$list; do \
+- at COND_MACOSX_TRUE@ app=`basename $$file` && \
+- at COND_MACOSX_TRUE@ rm -rf $(bindir)/$$app.app; \
+- at COND_MACOSX_TRUE@ done
+- at COND_MACOSX_FALSE@install-exec-hook:
+- at COND_MACOSX_FALSE@uninstall-hook:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Modified: trunk/dports/science/qucs/files/patch-configure.diff
===================================================================
--- trunk/dports/science/qucs/files/patch-configure.diff 2009-06-09 21:53:42 UTC (rev 52090)
+++ trunk/dports/science/qucs/files/patch-configure.diff 2009-06-09 22:04:06 UTC (rev 52091)
@@ -1,11 +1,23 @@
---- configure.orig 2009-03-22 18:56:20.000000000 +0100
-+++ configure 2009-03-22 18:57:06.000000000 +0100
-@@ -6005,7 +6005,7 @@
+--- configure.orig 2009-06-09 23:25:33.000000000 +0200
++++ configure 2009-06-09 23:26:55.000000000 +0200
+@@ -6214,7 +6214,7 @@
+ $as_echo_n "checking for Qt headers... " >&6; }
paths="$QTDIR/include /usr/local/qt/include /usr/include/qt /usr/include/qt3 \
/usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/X11/qt \
- /usr/X11R6/include/qt /usr/X11R6/include /sw/include/qt \
-- /usr/X11R6/include/qt2"
-+ /usr/X11R6/include/qt2 $prefix/include/qt3"
+- /usr/X11R6/include/qt /usr/X11R6/include /sw/include/qt \
++ /usr/X11R6/include/qt /usr/X11R6/include \
+ /usr/X11R6/include/qt2 $prefix/include/qt3"
for path in $paths; do
if test -f "$path/qapplication.h"; then
- QT_INCLUDES=$path
+@@ -6278,9 +6278,9 @@
+ $as_echo "checking for Qt... $QT_VER ($QT_MTS)" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for Qt library" >&5
+ $as_echo_n "checking for Qt library... " >&6; }
+-paths="$QTDIR/lib $QTDIR/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib \
++paths="$QTDIR/lib $QTDIR/lib64 /usr/lib/qt /usr/lib \
+ /usr/X11R6/lib/X11/qt /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt \
+- /usr/X11R6/lib /sw/lib /usr/lib64/qt /usr/X11R6/lib/qt2"
++ /usr/X11R6/lib /usr/lib64/qt /usr/X11R6/lib/qt2"
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Modified: trunk/dports/science/qucs/files/patch-qucs_qucsdigi.diff
===================================================================
--- trunk/dports/science/qucs/files/patch-qucs_qucsdigi.diff 2009-06-09 21:53:42 UTC (rev 52090)
+++ trunk/dports/science/qucs/files/patch-qucs_qucsdigi.diff 2009-06-09 22:04:06 UTC (rev 52091)
@@ -8,12 +8,3 @@
# Bail out on any error
set -e
-@@ -79,7 +80,7 @@
- echo " done."
-
- echo -n "linking..."
--libtool --quiet --mode=link $CXX $NAME._main_.o $NAME.o $LIBS $IEEELIBS -o $NAME
-+glibtool --quiet --mode=link $CXX $NAME._main_.o $NAME.o $LIBS $IEEELIBS -o $NAME
- echo " done."
-
- echo "simulating..."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090609/6650922f/attachment.html>
More information about the macports-changes
mailing list