soundmodem: fixed cross compilation; removed -devel subpkg (unnecessary).

Close #3361

srcpkgs/soundmodem-devel

@@ -1 +0,0 @@
-soundmodem/

srcpkgs/soundmodem/patches/cross.patch

@@ -0,0 +1,51 @@
+--- configure.in.orig	2016-01-15 07:06:06.724289188 +0100
++++ configure.in	2016-01-15 07:06:46.395656258 +0100
+@@ -31,19 +31,6 @@ AC_MINGW32
+ AC_EXEEXT
+ AC_OBJEXT
+ 
+-dnl check for cross compiler path
+-if test x$cross_compiling = xyes; then
+-  AC_MSG_CHECKING(for cross compiler path)
+-  if test -d /usr/local/cross/i686-pc-cygwin; then
+-    CROSSCOMPPATH=/usr/local/cross/i686-pc-cygwin
+-  elif test -d /usr/local/cygwin/i686-pc-cygwin; then
+-    CROSSCOMPPATH=/usr/local/cygwin/i686-pc-cygwin
+-  else
+-    AC_ERROR("cross compiler not found")
+-  fi
+-  AC_MSG_RESULT($CROSSCOMPPATH)
+-fi
+-
+ if test x$CYGWIN != xyes -a x$MINGW32 != xyes; then
+   AC_CHECK_LIB(m,sqrt)
+ fi
+@@ -137,25 +124,9 @@ if test x$CYGWIN = xyes -o x$MINGW32 = x
+   LIBS="$LIBS -ldsound -lgdi32"
+ fi
+ 
+-if test x$cross_compiling = xyes; then
+-  gtk=no
+-  xlibs="$LIBS"
+-  LIBS="$LIBS -L$CROSSCOMPPATH/gtk/lib"
+-  AC_CHECK_LIB(gtk,gtk_main,gtk=yes)
+-  LIBS="$xlibs"
+-  if test x$gtk = xyes; then
+-    GTK_CFLAGS="-I$CROSSCOMPPATH/gtk/include -I$CROSSCOMPPATH/gtk/include/glib -I$CROSSCOMPPATH/gtk/include/gdk"
+-    GTK_LIBS="-L$CROSSCOMPPATH/gtk/lib -lgtk -lgdk -lglib"
+-    PTHREAD_CFLAGS="-I$CROSSCOMPPATH/gtk/include"
+-    PTHREAD_LIBS="-L$CROSSCOMPPATH/gtk/lib"
+-    AUDIOFILE_CFLAGS="-I$CROSSCOMPPATH/audiofile/include"
+-    AUDIOFILE_LIBS="-L$CROSSCOMPPATH/audiofile/lib -laudiofile"
+-  fi
+-else
+-  PKG_CHECK_MODULES(XML,libxml-2.0)
+-  PKG_CHECK_MODULES(GTK,gtk+-2.0 >= 2.6.0)
+-  PKG_CHECK_MODULES(AUDIOFILE,audiofile)
+-fi
++PKG_CHECK_MODULES(XML,libxml-2.0)
++PKG_CHECK_MODULES(GTK,gtk+-2.0 >= 2.6.0)
++PKG_CHECK_MODULES(AUDIOFILE,audiofile)
+ 
+ dnl Check for recently introduced GTK symbols
+ xlibs="$LIBS"

srcpkgs/soundmodem/template

@@ -3,8 +3,7 @@ pkgname=soundmodem
 version=0.18
 revision=1
 build_style=gnu-configure
-configure_args="--host=${XBPS_MACHINE} --target=${XBPS_TARGET_MACHINE}"
+hostmakedepends="automake libtool pkg-config gettext-devel alsa-lib-devel"
-hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel audiofile-devel gtk+-devel libxml2-devel"
 short_desc="Multiplatform Soundcard Packet Radio Modem"
 maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
@@ -14,17 +13,5 @@ distfiles="http://soundmodem.vk4msl.yi.org/soundmodem-${version}.tar.gz"
 checksum=f033c1716df1378cda646dbb1c48ea9fb9a068772c6686f2ca411bfa64245c1c
 
 pre_configure() {
-	sed -i -e "s|/usr/local/cross/i686-pc-cygwin|${XBPS_CROSS_BASE}|g" configure
+	autoreconf -fi
-}
-
-do_build() {
-	make -I${XBPS_CROSS_BASE} CC=$CC CXX=$CXX LD=$CXX CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"
-}
-
-soundmodem-devel_package() {
-	short_desc+=" - development files"
-	depends="soundmodem>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-	}
 }