Merge branch 'next' into arm-port

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

diff --git a/lfs/groff b/lfs/groff
index d654c05b29e50f07ac7e3b8409e098784770255f..3c36edcc11c32c02c4c722c7cbd0e3f796ea667a 100644 (file)
--- a/lfs/groff
+++ b/lfs/groff
@@ -70,10 +70,14 @@ $(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) && 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)