[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c691e565e778ca2df4386967f7797d83722499f0)

Ladislav Hagara scm at sourcemage.org
Tue Oct 25 09:51:47 EDT 2011


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 net/wvdial/BUILD                           |    1 -
 net/wvdial/DETAILS                         |   13 +++++++------
 net/wvdial/HISTORY                         |    5 +++++
 net/wvdial/PRE_BUILD                       |    3 +++
 net/wvdial/wvdial-1.61-parallel-make.patch |   20 ++++++++++++++++++++
 5 files changed, 35 insertions(+), 7 deletions(-)

New commits:
commit c691e565e778ca2df4386967f7797d83722499f0
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wvdial 1.61

diff --git a/net/wvdial/BUILD b/net/wvdial/BUILD
deleted file mode 100755
index 8f58e6d..0000000
--- a/net/wvdial/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-make
diff --git a/net/wvdial/DETAILS b/net/wvdial/DETAILS
index b2866b4..8983cf5 100755
--- a/net/wvdial/DETAILS
+++ b/net/wvdial/DETAILS
@@ -1,12 +1,13 @@
            SPELL=wvdial
-         VERSION=1.60
+         VERSION=1.61
           SOURCE=$SPELL-$VERSION.tar.gz
-         SOURCE2=${SOURCE}.asc
+     SOURCE_HASH=sha512:e949632583d889ad040c284f42c46790d247fffbc2d5e926c4b5836c970002f07741d26d052489bdc9c8144dcbb62a12851a3c275a5cecd5393d2722f43bb49a
+#         SOURCE2=${SOURCE}.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://alumnit.ca/download/$SOURCE
-  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-      SOURCE_GPG=wlach.gpg:$SOURCE.asc:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+   SOURCE_URL[0]=http://wvstreams.googlecode.com/files/$SOURCE
+#  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+#      SOURCE_GPG=wlach.gpg:$SOURCE.asc:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
         WEB_SITE=http://open.nit.ca/wiki/?page=WvDial
          ENTERED=20040601
       LICENSE[0]=GPL
diff --git a/net/wvdial/HISTORY b/net/wvdial/HISTORY
index b5448b1..4f84af3 100644
--- a/net/wvdial/HISTORY
+++ b/net/wvdial/HISTORY
@@ -1,3 +1,8 @@
+2011-10-25 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.61, SOURCE_URL[0] updated, no asc file
+	* BUILD: removed
+	* PRE_BUILD, wvdial-1.61-parallel-make.patch: added patch from Gentoo
+
 2007-08-19 Elisamuel Resto <ryuji at mages.ath.cx>
 	* DETAILS: updated version to 1.60, changed SOURCE_URL to match upstream,
 	  changed gpg keyring name
diff --git a/net/wvdial/PRE_BUILD b/net/wvdial/PRE_BUILD
new file mode 100755
index 0000000..cac80c1
--- /dev/null
+++ b/net/wvdial/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch  -p1 < $SPELL_DIRECTORY/wvdial-1.61-parallel-make.patch
diff --git a/net/wvdial/wvdial-1.61-parallel-make.patch b/net/wvdial/wvdial-1.61-parallel-make.patch
new file mode 100644
index 0000000..4c0c837
--- /dev/null
+++ b/net/wvdial/wvdial-1.61-parallel-make.patch
@@ -0,0 +1,20 @@
+--- wvdial-1.61/wvrules-posix.mk
++++ wvdial-1.61/wvrules-posix.mk
+@@ -85,12 +85,15 @@
+ 	$(AR) s $1
+ endef
+ 
+-CC: FORCE
++CC:
+ 	@CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS_SRC)/gen-cc CC c
+ 
+-CXX: FORCE
++CXX:
+ 	@CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS_SRC)/gen-cc CXX cc
+ 
++#All files must depend on the above two rules. This is a godawful hack.
++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
++
+ wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)


More information about the SM-Commit mailing list