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

[Brandon Invergo]

------------------------------------------------------------
revno: 1158
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-13 00:11:07 +0100
message:
  clean up mailutils and fix build
added:
  gnu/mailutils/config.mk
modified:
  gnu/mailutils/Makefile

=== modified file 'gnu/mailutils/Makefile'
--- a/gnu/mailutils/Makefile    2010-12-06 12:51:41 +0000
+++ b/gnu/mailutils/Makefile    2012-11-12 23:11:07 +0000
@@ -1,8 +1,12 @@
 GARNAME = mailutils
 GARVERSION = 2.2
+HOME_URL = http://www.gnu.org/software/mailutils/
+DESCRIPTION = A rich and powerful protocol-independent mail framework
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = mailutils/
+MASTER_SUBDIR = $(GARNAME)/
 
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
@@ -10,9 +14,13 @@
 BUILDDEPS = libtool
 LIBDEPS = gettext gdbm readline ncurses gnutls guile m4 #  pam
 
-HOME_URL = http://www.gnu.org/software/mailutils/
-DESCRIPTION = GNU Mailutils is a rich and powerful protocol-independent mail 
framework
-
-CONFIGURE_OPTS = --without-python
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += "LIBS=-lguile"
+
+pre-configure:
+       sed -i -e '/gets is a security/d' $(WORKSRC)/lib/stdio.in.h
+       $(MAKECOOKIE)

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