Merge branch 'next' into arm-port

[people/teissler/ipfire-2.x.git] / lfs / groff

diff --git a/lfs/groff b/lfs/groff
index 194877e7818d419fc9592276f07711fd73733a17..3c36edcc11c32c02c4c722c7cbd0e3f796ea667a 100644 (file)
--- a/lfs/groff
+++ b/lfs/groff
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.18.1.1
+VER        = 1.21
 
 THISAPP    = groff-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 511dbd64b67548c99805f1521f82cc5e
+$(DL_FILE)_MD5 = 8b8cd29385b97616a0f0d96d0951c5bf
 
 install : $(TARGET)
 
@@ -71,12 +71,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-debian_fixes-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/groff-char_block.patch
        cd $(DIR_APP) && sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
                                -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto
        cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       ln -sv eqn /usr/bin/geqn
-       ln -sv tbl /usr/bin/gtbl
+       ln -svf eqn /usr/bin/geqn
+       ln -svf tbl /usr/bin/gtbl
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)