Use sed in a pre-configure target in order to drop most required patches

for external libgadu support.

No objection from Aleksander Piotrowski (MAINTAINER).
This commit is contained in:
fcambus 2017-06-13 07:43:15 +00:00
parent 1f935e16ed
commit 9bbaf65200
19 changed files with 11 additions and 266 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2017/05/30 15:29:39 fcambus Exp $
# $OpenBSD: Makefile,v 1.10 2017/06/13 07:43:15 fcambus Exp $
COMMENT= Gadu-Gadu IM protocol client
@ -31,4 +31,8 @@ CONFIGURE_ARGS= --enable-dynamic \
NO_TEST= Yes
pre-configure:
# External libgadu support
@cd ${WRKSRC}/src && sed -i 's|"libgadu.h"|<libgadu.h>|' *.c *.h
.include <bsd.port.mk>

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_commands_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/commands.c.orig Sat Apr 28 21:02:22 2007
+++ src/commands.c Tue Mar 29 22:40:31 2011
@@ -52,7 +52,7 @@
#include "configfile.h"
#include "dynstuff.h"
#include "events.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "log.h"
#include "msgqueue.h"
#ifdef HAVE_OPENSSL

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_dynstuff_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/dynstuff.c.orig Sun Mar 11 12:27:18 2007
+++ src/dynstuff.c Tue Mar 29 22:40:31 2011
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
-#include "libgadu.h"
+#include <libgadu.h>
#include "dynstuff.h"
#include "stuff.h"
#include "xmalloc.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_ekg_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/ekg.c.orig Sat Apr 28 21:02:23 2007
+++ src/ekg.c Tue Mar 29 22:40:31 2011
@@ -60,7 +60,7 @@
#include "configfile.h"
#include "emoticons.h"
#include "events.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "log.h"
#include "mail.h"
#include "msgqueue.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_events_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/events.c.orig Sat Apr 28 21:02:24 2007
+++ src/events.c Tue Mar 29 22:40:31 2011
@@ -40,7 +40,7 @@
#include "commands.h"
#include "emoticons.h"
#include "events.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "log.h"
#include "msgqueue.h"
#ifdef HAVE_OPENSSL

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_events_h,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/events.h.orig Fri Feb 18 14:06:17 2005
+++ src/events.h Tue Mar 29 22:40:31 2011
@@ -21,7 +21,7 @@
#ifndef __EVENTS_H
#define __EVENTS_H
-#include "libgadu.h"
+#include <libgadu.h>
#include "userlist.h"
struct handler {

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_log_h,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/log.h.orig Mon Dec 5 20:20:08 2005
+++ src/log.h Tue Mar 29 22:40:31 2011
@@ -28,7 +28,7 @@
#include <time.h>
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
struct last {
int type; /* 0 - przychodz?ca, 1 - wychodz?ca */

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_msgqueue_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/msgqueue.c.orig Sat Aug 5 17:02:52 2006
+++ src/msgqueue.c Tue Mar 29 22:40:31 2011
@@ -32,7 +32,7 @@
#include <unistd.h>
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "msgqueue.h"
#include "stuff.h"
#include "xmalloc.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_msgqueue_h,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/msgqueue.h.orig Mon Dec 5 20:20:08 2005
+++ src/msgqueue.h Tue Mar 29 22:40:31 2011
@@ -25,7 +25,7 @@
#include <time.h>
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
struct msg_queue {
int msg_class;

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_python_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/python.c.orig Thu Aug 24 19:57:56 2006
+++ src/python.c Tue Mar 29 22:40:31 2011
@@ -27,7 +27,7 @@
#include <string.h>
#include "commands.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "stuff.h"
#include "themes.h"
#include "ui.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_simlite_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/simlite.c.orig Sat Aug 5 17:02:52 2006
+++ src/simlite.c Tue Mar 29 22:40:31 2011
@@ -35,7 +35,7 @@
#include <string.h>
#include <time.h>
-#include "libgadu.h"
+#include <libgadu.h>
#include "simlite.h"
#ifndef PATH_MAX

View File

@ -1,17 +1,13 @@
$OpenBSD: patch-src_stuff_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
$OpenBSD: patch-src_stuff_c,v 1.2 2017/06/13 07:43:15 fcambus Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/stuff.c.orig Sat Apr 28 21:02:24 2007
+++ src/stuff.c Wed Mar 30 00:32:56 2011
@@ -53,9 +53,8 @@
Index: src/stuff.c
--- src/stuff.c.orig
+++ src/stuff.c
@@ -53,7 +53,6 @@
#include <unistd.h>
#include "commands.h"
-#include "compat.h"
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "libgadu.h"
#ifdef HAVE_OPENSSL
# include "simlite.h"
#endif

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_stuff_h,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/stuff.h.orig Sat Apr 28 21:02:25 2007
+++ src/stuff.h Tue Mar 29 22:40:31 2011
@@ -35,7 +35,7 @@
#include <time.h>
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "ioctld.h"
#define DEBUG_MAX_LINES 50 /* ile linii z debug zrzuca? do pliku */

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_ui-ncurses_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/ui-ncurses.c.orig Sun Mar 11 12:27:21 2007
+++ src/ui-ncurses.c Tue Mar 29 22:40:31 2011
@@ -66,7 +66,7 @@
#include <unistd.h>
#include "commands.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "mail.h"
#ifndef HAVE_STRLCAT
# include "../compat/strlcat.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_userlist_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/userlist.c.orig Sat Apr 28 21:02:26 2007
+++ src/userlist.c Tue Mar 29 22:40:31 2011
@@ -38,7 +38,7 @@
#include "commands.h"
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
#ifndef HAVE_STRLCAT
# include "../compat/strlcat.h"
#endif

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_userlist_h,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/userlist.h.orig Sat Apr 28 21:02:26 2007
+++ src/userlist.h Tue Mar 29 22:40:31 2011
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <time.h>
-#include "libgadu.h"
+#include <libgadu.h>
#include "dynstuff.h"
#include "stuff.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_vars_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/vars.c.orig Sat Apr 28 21:02:26 2007
+++ src/vars.c Tue Mar 29 22:40:31 2011
@@ -28,7 +28,7 @@
#include <unistd.h>
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
#include "mail.h"
#ifndef HAVE_STRLCAT
# include "../compat/strlcat.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_voice_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/voice.c.orig Sun Mar 11 12:27:24 2007
+++ src/voice.c Tue Mar 29 22:40:31 2011
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "libgadu.h"
+#include <libgadu.h>
#include "voice.h"
#include "stuff.h"
#include "xmalloc.h"

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_xmalloc_c,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- src/xmalloc.c.orig Thu Apr 3 14:39:07 2003
+++ src/xmalloc.c Tue Mar 29 22:40:31 2011
@@ -28,7 +28,7 @@
#include "configfile.h"
#include "stuff.h"
#include "userlist.h"
-#include "libgadu.h"
+#include <libgadu.h>
void ekg_oom_handler()
{