[Gsrc-commit] /srv/bzr/gsrc/trunk r994: clean up emacs

[Brandon Invergo]

------------------------------------------------------------
revno: 994
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 12:21:06 +0100
message:
  clean up emacs
added:
  gnu/emacs/config.mk
modified:
  gnu/emacs/Makefile

=== modified file 'gnu/emacs/Makefile'
--- a/gnu/emacs/Makefile        2012-08-31 14:53:41 +0000
+++ b/gnu/emacs/Makefile        2012-10-28 11:21:06 +0000
@@ -1,23 +1,20 @@
 GARNAME = emacs
 GARVERSION = 24.2
-#MINOR_UPDATE = a
+MINOR_UPDATE =
+HOME_URL = http://www.gnu.org/software/emacs/
+DESCRIPTION = GNU Emacs 23.x, the extensible, customizable text editor
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = emacs/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME)$(MINOR_UPDATE).tar.gz
 SIGFILES = $(DISTNAME)$(MINOR_UPDATE).tar.gz.sig
 
-BUILDDEPS = ncurses texinfo
-# LIBDEPS = 
-
-CONFIGURE_OPTS = --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no 
--with-tiff=no
-
-HOME_URL = http://www.gnu.org/software/emacs/
-DESCRIPTION = GNU Emacs 23.x, the extensible, customizable text editor
+BUILDDEPS = texinfo
+LIBDEPS = ncurses
+
+######################################################################
 
 include ../../gar.lib/auto.mk
-
-pre-build:
-       exec sed -i -e '/gets is a security/d' $(WORKSRC)/lib/stdio.in.h
-       $(MAKECOOKIE)
+include config.mk

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