X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgroff;h=36f1f8f134abf7cfc74c772e716c1b909065541f;hb=70af65df4198c58f99a333748faa39b39ad1c3c4;hp=a3d13a1608183d2b3bd8ecd92d3c40ada6b492e5;hpb=bf4b7f6d4a99dfa60693c972a4e10ee94219e277;p=ipfire-2.x.git

diff --git a/lfs/groff b/lfs/groff
index a3d13a1608..36f1f8f134 100644
--- 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-2018  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.22.4
 
 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 = 08fb04335e2f5e73f23ea4c3adbf0c5f
 
 install : $(TARGET)
 
@@ -70,14 +70,12 @@ $(subst %,%_MD5,$(objects)) :
 $(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) && PAGE=A4 ./configure \
+		--prefix=/usr
+
 	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)