- link with -pthread, not -lpthread

- regen WANTLIB and PLISTs while here

"go ahead" robert@
This commit is contained in:
ajacoutot 2009-01-26 10:59:14 +00:00
parent d9f485a8a3
commit 7f25d3f6c0
4 changed files with 22 additions and 13 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2008/06/01 17:33:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.19 2009/01/26 10:59:14 ajacoutot Exp $
COMMENT= tools to talk to GSM cellular phones
DISTNAME= gnokii-0.6.14
PKGNAME= ${DISTNAME}p7
PKGNAME= ${DISTNAME}p8
CATEGORIES= comms x11
SHARED_LIBS += gnokii 2.7 # .3.0
@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --without-x
USE_X11= Yes
CONFIGURE_ARGS+= --with-x
WANTLIB+= X11 Xau Xdmcp Xpm Xrender fontconfig freetype z \
Xcomposite Xdamage pixman-1 \
Xcomposite Xdamage pixman-1 gio-2.0 \
m pthread pcre atk-1.0.>=800.0 glib-2.0.>=400.8 \
gmodule-2.0.>=400.8 gobject-2.0.>=400.8 \
pango-1.0.>=600.0 pangoft2-1.0.>=600.0 \

View File

@ -1,6 +1,15 @@
$OpenBSD: patch-configure,v 1.1 2007/10/17 14:37:34 ajacoutot Exp $
--- configure.orig Wed Oct 17 13:24:31 2007
+++ configure Wed Oct 17 13:25:45 2007
$OpenBSD: patch-configure,v 1.2 2009/01/26 10:59:14 ajacoutot Exp $
--- configure.orig Mon Aug 28 00:37:13 2006
+++ configure Mon Jan 26 11:47:19 2009
@@ -27413,7 +27413,7 @@ fi;
USE_LIBICAL="no"
OLD_LIBS="$LIBS"
OLD_CFLAGS="$CFLAGS"
-LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
+LIBS="$LIBS $ICAL_LIBS -pthread -lical"
CFLAGS="$CFLAGS $ICAL_CFLAGS"
echo "$as_me:$LINENO: checking whether libical is installed" >&5
echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6
@@ -32748,7 +32748,7 @@ s,@LIBOBJS@,$LIBOBJS,;t t
s,@SET_RELOCATABLE@,$SET_RELOCATABLE,;t t
s,@RELOCATABLE_VIA_LD_TRUE@,$RELOCATABLE_VIA_LD_TRUE,;t t

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.4 2008/06/01 17:33:36 ajacoutot Exp $
bin/xgnokii
@comment $OpenBSD: PFRAG.no-no_x11,v 1.5 2009/01/26 10:59:14 ajacoutot Exp $
@bin bin/xgnokii
lib/pkgconfig/xgnokii.pc
@man man/man1/xgnokii.1
share/applications/xgnokii.desktop

View File

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.5 2007/10/16 12:44:50 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2009/01/26 10:59:14 ajacoutot Exp $
@conflict smstools-*
%%SHARED%%
!%%no_x11%%
bin/gnokii
@bin bin/gnokii
bin/ppm2nokia
bin/sendsms
bin/todologo
bin/waitcall
@bin bin/waitcall
include/gnokii/
include/gnokii.h
include/gnokii/bitmaps.h
@ -27,8 +27,8 @@ lib/libgnokii.la
lib/pkgconfig/
lib/pkgconfig/gnokii.pc
@man man/man1/gnokii.1
sbin/gnokiid
sbin/mgnokiidev
@bin sbin/gnokiid
@bin sbin/mgnokiidev
share/doc/gnokii/
share/doc/gnokii/gnapplet.sis
share/examples/gnokii/