- use the external libgadu library, instead of the bundled one.

from pld linux, via mikolaj kucharski
maintainer timed-out
This commit is contained in:
jasper 2011-04-06 09:35:03 +00:00
parent 13a6b49772
commit 957ce66fef
23 changed files with 385 additions and 17 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:47 espie Exp $
# $OpenBSD: Makefile,v 1.5 2011/04/06 09:35:03 jasper Exp $
COMMENT= Gadu-Gadu IM protocol client
DISTNAME= ekg-1.7
REVISION= 0
CATEGORIES= net
HOMEPAGE= http://ekg.chmurka.net/
@ -15,21 +16,23 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
WANTLIB= ncurses ssl crypto z c pthread
WANTLIB= c crypto gadu ncurses pthread ssl z
MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= net/libgadu
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
CONFIGURE_ARGS= --disable-shared \
CONFIGURE_ARGS= --enable-dynamic \
--with-pthread \
--without-libjpeg \
--without-libgsm \
--without-libungif
USE_GROFF = Yes
USE_GROFF= Yes
NO_REGRESS= Yes
.include <bsd.port.mk>

View File

@ -0,0 +1,72 @@
$OpenBSD: patch-Makefile_in,v 1.1 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
--- Makefile.in.orig Sat Aug 5 16:46:21 2006
+++ Makefile.in Tue Mar 29 22:40:31 2011
@@ -15,11 +15,8 @@ INSTALL = @INSTALL@
#
-all: configure libgadu @ekg@ @make_ekgwap@
+all: configure @ekg@ @make_ekgwap@
-libgadu:
- cd lib && $(MAKE) all
-
ekg:
cd src && $(MAKE) all
@@ -31,11 +28,8 @@ examples:
#
-dep: dep-libgadu @dep_ekg@
+dep: @dep_ekg@
-dep-libgadu:
- cd lib && $(MAKE) dep
-
dep-ekg:
cd src && $(MAKE) dep
@@ -46,11 +40,8 @@ configure: configure.in m4/*
#
-install: all install-libgadu @install_ekg@ @install_ekgwap@
+install: all @install_ekg@ @install_ekgwap@
-install-libgadu:
- cd lib && $(MAKE) install
-
install-ekg: install-ekg-data install-ekg-man
cd src && $(MAKE) install
@@ -93,11 +84,8 @@ uninstall-ekg:
#
-clean: clean-libgadu @clean_ekg@ clean-examples clean-compat
+clean: @clean_ekg@ clean-examples clean-compat
-clean-libgadu:
- cd lib && $(MAKE) clean
-
clean-ekg:
cd src && $(MAKE) clean
@@ -109,12 +97,9 @@ clean-compat:
#
-distclean: distclean-libgadu @distclean_ekg@ distclean-examples distclean-compat
+distclean: @distclean_ekg@ distclean-examples distclean-compat
rm -f *~ config.log config.cache config.status config.h Makefile
rm -f config.h.in configure aclocal.m4
-
-distclean-libgadu:
- cd lib && $(MAKE) distclean
distclean-ekg:
cd src && $(MAKE) distclean

View File

@ -1,4 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.3 2008/10/15 14:59:37 ajacoutot Exp $
$OpenBSD: patch-lib_Makefile_in,v 1.4 2011/04/06 09:35:03 jasper Exp $
- build without gnu make
--- lib/Makefile.in.orig Tue Apr 18 21:05:11 2006
+++ lib/Makefile.in Mon Oct 13 13:59:13 2008
@@ -11,7 +11,7 @@ VERSION_MAJOR=3

View File

@ -1,13 +1,36 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2008/10/15 14:59:37 ajacoutot Exp $
--- src/Makefile.in.orig Sat Apr 28 22:02:22 2007
+++ src/Makefile.in Mon Oct 13 13:58:12 2008
@@ -64,9 +64,3 @@ clean:
$OpenBSD: patch-src_Makefile_in,v 1.3 2011/04/06 09:35:03 jasper Exp $
- external libgadu support, from cvs.pld-linux.org
- build without gnu make
--- src/Makefile.in.orig Sat Apr 28 21:02:22 2007
+++ src/Makefile.in Wed Mar 30 00:25:28 2011
@@ -10,7 +10,7 @@ libexecdir = @libexecdir@
sysconfdir = @sysconfdir@
CC = @CC@
-CFLAGS = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
+CFLAGS = -I.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -28,7 +28,7 @@ all: dep ekg @ioctld@
ekg: $(OBJS) comptime.c @libgadu_a@
$(CC) $(CFLAGS) -c -o comptime.o comptime.c
- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
+ $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
ioctld: ioctld.c
$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
@@ -63,10 +63,4 @@ clean:
distclean: clean
rm -f *~ Makefile
-
-#
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif
-

View File

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,17 @@
$OpenBSD: patch-src_stuff_c,v 1.1 2011/04/06 09:35:03 jasper 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 @@
#include <unistd.h>
#include "commands.h"
-#include "compat.h"
#include "dynstuff.h"
-#include "libgadu.h"
+#include <libgadu.h>
#ifdef HAVE_OPENSSL
# include "simlite.h"
#endif

View File

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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

@ -0,0 +1,15 @@
$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()
{

View File

@ -1,10 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2008/10/15 14:59:37 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/04/06 09:35:03 jasper Exp $
@bin bin/ekg
@comment include/libgadu-config.h
@comment include/libgadu.h
@comment lib/libgadu.a
@comment lib/pkgconfig/
@comment lib/pkgconfig/libgadu.pc
@man man/man1/ekg.1
man/pl/
man/pl/man1/