- s/New/News/g in %files and %install - desktop file

[packages/tin.git] / tin-with_system_pcre.patch

diff --git a/tin-with_system_pcre.patch b/tin-with_system_pcre.patch
index 3a5bed699c8fcb879914150a6ec45a28f434489a..b5e1eee3fcf13536860c1d36220ab8d728fbfea2 100644 (file)
--- a/tin-with_system_pcre.patch
+++ b/tin-with_system_pcre.patch
@@ -1,34 +1,34 @@
-diff -Nru tin-1.4.3/src/Makefile.in tin-1.4.3.new/src/Makefile.in
---- tin-1.4.3/src/Makefile.in  Thu Sep 16 16:25:22 1999
-+++ tin-1.4.3.new/src/Makefile.in      Thu May  4 03:01:50 2000
-@@ -20,7 +20,7 @@
+diff -uNr tin-1.5.6.orig/src/Makefile.in tin-1.5.6/src/Makefile.in
+--- tin-1.5.6.orig/src/Makefile.in     Thu Aug  3 15:41:43 2000
++++ tin-1.5.6/src/Makefile.in  Fri Aug 18 03:24:59 2000
+@@ -50,7 +50,7 @@
+ 
  DEBUG = @ENABLE_DEBUG@ -DDEBUG #-DDEBUG_NEWSRC -DPROFILE -DDEBUG_REFS
- DAEMON        = # -DINDEX_DAEMON
  CANLOCK = # -DUSE_CANLOCK # -DEVIL_INSIDE
--CPPOPTS       = @DEFS@ -I. -I../include -I$(top_srcdir)/pcre -I$(INCDIR) $(DEBUG) $(DAEMON) $(CANLOCK) @CPPFLAGS@
-+CPPOPTS       = @DEFS@ -I. -I../include -I$(INCDIR) $(DEBUG) $(DAEMON) $(CANLOCK) @CPPFLAGS@
+-CPPOPTS       = @DEFS@ -I. -I../include -I$(top_builddir)/pcre -I$(top_srcdir)/pcre -DLOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -I$(INCDIR) $(DEBUG) $(CANLOCK) @CPPFLAGS@
++CPPOPTS = @DEFS@ -I. -I../include -DLOCALEDIR=\"$(prefix)/@DATADIRNAME@/\"
  CFLAGS        = @CFLAGS@
  
  LD    = $(CC)
-@@ -28,7 +28,7 @@
+@@ -58,7 +58,7 @@
  YACC  = @YACC@
  
  CANLIB        = # -L../libcanlock -lcanlock
--LIBS  = -L../pcre -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@
-+LIBS  = -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@
+-LIBS  = -L../pcre -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@ @INTLDIR_MAKE@ @INTLLIBS@
++LIBS  = -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@ @INTLDIR_MAKE@ @INTLLIBS@
  
  # Where do you want the binary & manual page installed?
- INSTALL_PREFIX        = @INSTALL_PREFIX@
-@@ -138,7 +138,7 @@
+ DESTDIR       = @DESTDIR@
+@@ -178,7 +178,7 @@
  
  EXTRAOBJS = @EXTRAOBJS@
  
--EXTRALIBS = ../pcre/$(PRELIB)pcre.a
-+EXTRALIBS = 
+-EXTRALIBS = ../pcre/$(PRELIB)pcre.a @INTLDIR_MAKE@ @INTLLIBS@
++EXTRALIBS = @INTLDIR_MAKE@ @INTLLIBS@
  
  OFILES        = @ALLOCA@ $(EXTRAOBJS) \
        $(OBJDIR)/active.o \
-@@ -315,7 +315,7 @@
+@@ -380,7 +380,7 @@
  
  cflow:
        @$(ECHO) "Creating cflow for $(PROJECT)..."
@@ -37,7 +37,7 @@ diff -Nru tin-1.4.3/src/Makefile.in tin-1.4.3.new/src/Makefile.in
  
  cscope:
        @$(ECHO) "Creating cscope database $(PROJECT)..."
-@@ -334,10 +334,6 @@
+@@ -399,10 +399,6 @@
        $(INCDIR)/nntplib.h \
        $(INCDIR)/proto.h
  
@@ -46,5 +46,5 @@ diff -Nru tin-1.4.3/src/Makefile.in tin-1.4.3.new/src/Makefile.in
 -      @$(ECHO) "Building Philip Hazel's Perl regular expressions library..."
 -      @$(CD) ../pcre && $(MAKE) @cf_cv_makeflags@ $(PRELIB)pcre.a
  
- tincfg.h:                     $(SRCDIR)/tincfg.tbl \
-                               makecfg$x
+ @INTLDIR_MAKE@@INTLLIBS@:
+ @INTLDIR_MAKE@        @$(ECHO) "Building GNU gettext library..."