[Gsrc-commit] /srv/bzr/gsrc/trunk r1135: clean up jwhois and fix build

[Brandon Invergo]

------------------------------------------------------------
revno: 1135
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-11 22:00:23 +0100
message:
  clean up jwhois and fix build
added:
  gnu/jwhois/config.mk
  gnu/jwhois/files/
  gnu/jwhois/files/fix-build.diff
modified:
  gnu/jwhois/Makefile
  gnu/jwhois/sha256sums

=== modified file 'gnu/jwhois/Makefile'
--- a/gnu/jwhois/Makefile       2010-06-11 09:29:17 +0000
+++ b/gnu/jwhois/Makefile       2012-11-11 21:00:23 +0000
@@ -1,16 +1,24 @@
 GARNAME = jwhois
 GARVERSION = 4.0
+HOME_URL = http://www.gnu.org/software/jwhois/
+DESCRIPTION = A client for the WHOIS protocol allowing you to query \
+the owner of a domain name
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = jwhois/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/jwhois/
-DESCRIPTION = A client for the WHOIS protocol allowing you to query the owner 
of a domain name
+PATCHFILES = fix-build.diff
+
+BUILDDEPS = 
+LIBDEPS = libiconv
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) CFLAGS="-I$(prefix)/include"
+

=== added file 'gnu/jwhois/config.mk'
--- a/gnu/jwhois/config.mk      1970-01-01 00:00:00 +0000
+++ b/gnu/jwhois/config.mk      2012-11-11 21:00:23 +0000
@@ -0,0 +1,4 @@
+## Configuration options for jwhois ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/jwhois/files'
=== added file 'gnu/jwhois/files/fix-build.diff'
--- a/gnu/jwhois/files/fix-build.diff   1970-01-01 00:00:00 +0000
+++ b/gnu/jwhois/files/fix-build.diff   2012-11-11 21:00:23 +0000
@@ -0,0 +1,12 @@
+diff -x config.log -x config.status -ru work/jwhois-4.0/src/Makefile.in 
work/jwhois-4.0/src/Makefile.in
+--- work/jwhois-4.0/src/Makefile.in    2007-07-01 10:56:14.000000000 +0200
++++ work/jwhois-4.0/src/Makefile.in    2012-11-11 21:58:14.110859037 +0100
+@@ -140,7 +140,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -liconv
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@

=== modified file 'gnu/jwhois/sha256sums'
--- a/gnu/jwhois/sha256sums     2010-06-11 09:29:17 +0000
+++ b/gnu/jwhois/sha256sums     2012-11-11 21:00:23 +0000
@@ -1,2 +1,3 @@
 fa9bb86782b915c6d730bb723f876dc9b345a617db375aaf3416ec22553cd64e  
download/jwhois-4.0.tar.gz
+802dc1fb72fb52d01d1ffd31270080e46bc71bcaca8d78a039806713175a4e16  
download/fix-build.diff
 41f39b01f37f85848b8daf911bbe10db2149b700ee415688f631ed6bbb6862ae  
download/jwhois-4.0.tar.gz.sig