From ec26890a067c578d4d084fedd5a5d16ae388df47 Mon Sep 17 00:00:00 2001
From: Enno Boland <eb@s01.de>
Date: Thu, 11 Dec 2014 02:41:43 +0100
Subject: [PATCH] New package: wvdial-1.61

---
 .../patches/wvdial-1.61-as-needed.patch       | 12 +++++++
 .../wvdial/patches/wvdial-1.61-destdir.patch  | 35 +++++++++++++++++++
 .../patches/wvdial-1.61-parallel-make.patch   | 20 +++++++++++
 srcpkgs/wvdial/template                       | 15 ++++++++
 srcpkgs/wvstreams/template                    |  2 +-
 5 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wvdial/patches/wvdial-1.61-as-needed.patch
 create mode 100644 srcpkgs/wvdial/patches/wvdial-1.61-destdir.patch
 create mode 100644 srcpkgs/wvdial/patches/wvdial-1.61-parallel-make.patch
 create mode 100644 srcpkgs/wvdial/template

diff --git a/srcpkgs/wvdial/patches/wvdial-1.61-as-needed.patch b/srcpkgs/wvdial/patches/wvdial-1.61-as-needed.patch
new file mode 100644
index 00000000000..e1543472060
--- /dev/null
+++ b/srcpkgs/wvdial/patches/wvdial-1.61-as-needed.patch
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2014-12-11 02:14:39.418518774 +0100
++++ Makefile.in	2014-12-11 02:16:30.418510467 +0100
+@@ -21,6 +21,8 @@ ifeq ($(PC_LIBS),)
+ endif
+ LIBS+=$(PC_LIBS)
+ 
++wvdial-LIBS+= -luniconf
++
+ BINDIR=${prefix}/bin
+ MANDIR=${prefix}/share/man
+ PPPDIR=/etc/ppp/peers
+
diff --git a/srcpkgs/wvdial/patches/wvdial-1.61-destdir.patch b/srcpkgs/wvdial/patches/wvdial-1.61-destdir.patch
new file mode 100644
index 00000000000..61f8cf74264
--- /dev/null
+++ b/srcpkgs/wvdial/patches/wvdial-1.61-destdir.patch
@@ -0,0 +1,35 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	2010-05-27 13:08:26 +0000
++++ Makefile.in	2010-05-27 13:08:41 +0000
+@@ -3,7 +3,7 @@
+ WVPACKAGE_TARNAME=@PACKAGE_TARNAME@
+ WVPACKAGE_VERSION=@PACKAGE_VERSION@
+ 
+-prefix=/usr/local
++prefix=${DESTDIR}/usr
+ WVSTREAMS_INC=
+ WVSTREAMS_LIB=
+ WVSTREAMS_BIN=$(prefix)/bin
+@@ -23,7 +23,7 @@
+ 
+ BINDIR=${prefix}/bin
+ MANDIR=${prefix}/share/man
+-PPPDIR=/etc/ppp/peers
++PPPDIR=${DESTDIR}/etc/ppp/peers
+ 
+ include wvrules.mk
+ 
+
+=== modified file 'config.defaults.mk'
+--- config.defaults.mk	2010-05-27 13:08:26 +0000
++++ config.defaults.mk	2010-05-27 13:43:03 +0000
+@@ -13,7 +13,7 @@
+ LIBS_PAM=-lpam
+ LIBS_TCL=
+ 
+-prefix=/usr/local
++prefix=${DESTDIR}/usr
+ datadir=${prefix}/share
+ includedir=${prefix}/include
+ infodir=${prefix}/share/info
+
diff --git a/srcpkgs/wvdial/patches/wvdial-1.61-parallel-make.patch b/srcpkgs/wvdial/patches/wvdial-1.61-parallel-make.patch
new file mode 100644
index 00000000000..40e3d9c2627
--- /dev/null
+++ b/srcpkgs/wvdial/patches/wvdial-1.61-parallel-make.patch
@@ -0,0 +1,20 @@
+--- wvrules-posix.mk
++++ 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)
diff --git a/srcpkgs/wvdial/template b/srcpkgs/wvdial/template
new file mode 100644
index 00000000000..cd844f40731
--- /dev/null
+++ b/srcpkgs/wvdial/template
@@ -0,0 +1,15 @@
+# Template file for 'wvdial'
+pkgname=wvdial
+version=1.61
+revision=1
+build_style=gnu-configure
+short_desc="Point-to-Point Protocol dialer"
+maintainer="Enno Boland <eb@s01.de>"
+license="GPL-2"
+hostmakedepends="pkg-config"
+makedepends="wvstreams-devel"
+depends="ppp"
+homepage="https://code.google.com/p/wvstreams/"
+distfiles="https://wvstreams.googlecode.com/files/wvdial-$version.tar.gz"
+checksum=4fffab9652c760199c074533d1d3929bea55ab4233b11e735b0f1856d1ceec57
+conf_files="/etc/ppp/peers/wvdial /etc/ppp/peers/wvdial-pipe"
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 56f3f1c2df2..4dcf033bb99 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -14,7 +14,7 @@ configure_args="--without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"
 
 wvstreams-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	depends="${sourcepkg}>=${version}_${revision} uniconf>=${version}_${revision} $makedepends"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include