From 3e67804d709e34d749caa36729ea54b374435d71 Mon Sep 17 00:00:00 2001 From: ade Date: Fri, 4 Aug 2000 01:34:38 +0000 Subject: Extensive patchfile cleanups using sobomax's wonderful post-extract rule --- news/pan/Makefile | 7 +++++++ news/pan/files/patch-ag | 12 ++---------- news/pan/files/patch-ah | 25 ++----------------------- 3 files changed, 11 insertions(+), 33 deletions(-) (limited to 'news/pan') diff --git a/news/pan/Makefile b/news/pan/Makefile index 0f9df8ffd037..567df59f9183 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -30,4 +30,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -luu" +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include diff --git a/news/pan/files/patch-ag b/news/pan/files/patch-ag index 2da6709bc5d3..92dbb4022ab7 100644 --- a/news/pan/files/patch-ag +++ b/news/pan/files/patch-ag @@ -1,16 +1,8 @@ --- Makefile.in.orig Thu May 18 02:27:35 2000 +++ Makefile.in Tue Jun 13 17:15:02 2000 -@@ -111,11 +111,11 @@ +@@ -111,4 +111,4 @@ cxxflags_set = @cxxflags_set@ l = @l@ -SUBDIRS = macros po intl uulib pan docs -+SUBDIRS = macros po intl pan docs - - EXTRA_DIST = CREDITS ChangeLog pan.desktop pan.spec pan.png - --Productivitydir = $(datadir)/gnome/apps/Internet -+Productivitydir = $(datadir)/apps/Internet - Productivity_DATA = pan.desktop - - icon_DATA = pan.png ++SUBDIRS = macros po pan docs diff --git a/news/pan/files/patch-ah b/news/pan/files/patch-ah index 30528e35151a..014f34bb831f 100644 --- a/news/pan/files/patch-ah +++ b/news/pan/files/patch-ah @@ -1,29 +1,8 @@ --- pan/Makefile.in.orig Thu May 18 02:27:48 2000 +++ pan/Makefile.in Tue Jun 13 17:07:18 2000 -@@ -115,7 +115,7 @@ - - SUBDIRS = dialogs xpm - --INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/uulib -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(GNOME_INCLUDEDIR) $(GLIB_CFLAGS) @CPPFLAGS@ -+INCLUDES = -I$(top_srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(prefix)/share/locale\" $(GNOME_INCLUDEDIR) $(GLIB_CFLAGS) @CPPFLAGS@ - - - bin_PROGRAMS = pan -@@ -123,7 +123,7 @@ - pan_SOURCES = acache.c acache.h article.c article.h article-toolbar.c article-toolbar.h article-find.c article-find.h article-db.c article-db.h article-thread.c article-thread.h articlelist.c articlelist.h date.c date.h debug.c debug.h decode.c decode.h folder.c folder.h folderlist.c folderlist.h fnmatch.c fnmatch.h globals.h group.c group.h grouplist.c grouplist.h gui.c gui.h gui-notebook.c gui-notebook.h gui-paned.c gui-paned.h log.c log.h message.c message.h message-filter.c message-filter.h message-send.c message-send.h message-window.c message-window.h msort.c nntp.c nntp.h pan.c pan.h pan-callback.c pan-callback.h pan-db.c pan-db.h pan-object.c pan-object.h prefs.c prefs.h print.c print.h queue.c queue.h task.c task.h task-bodies.c task-bodies.h task-body.c task-body.h task-decode.c task-decode.h task-grouplist.c task-grouplist.h task-headers.c task-headers.h task-send.c task-send.h task-manager.c task-manager.h rfc822.c rfc822.h save.c save.h server.c server.h smtp.c smtp.h sockets.c sockets.h status-item.c status-item.h status-item-view.c status-item-view.h text.c text.h util.c util.h - - +@@ -126,1 +126,1 @@ -pan_LDADD = dialogs/libdialogs.a $(INTLLIBS) $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(GLIB_LIBS) $(top_builddir)/uulib/libuu.a +pan_LDADD = dialogs/libdialogs.a $(INTLLIBS) $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(GLIB_LIBS) - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h -@@ -144,7 +144,7 @@ - task-body.o task-decode.o task-grouplist.o task-headers.o task-send.o \ - task-manager.o rfc822.o save.o server.o smtp.o sockets.o status-item.o \ - status-item-view.o text.o util.o +@@ -147,1 +147,1 @@ -pan_DEPENDENCIES = dialogs/libdialogs.a $(top_builddir)/uulib/libuu.a +pan_DEPENDENCIES = dialogs/libdialogs.a - pan_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- cgit