From 15079c37401ac1740a92b7a5eb57fc7148b6fb92 Mon Sep 17 00:00:00 2001 From: bernd Date: Fri, 27 Apr 2007 19:03:53 +0000 Subject: [PATCH] Use xenocara expat. --- net/ser/Makefile | 9 ++++----- net/ser/patches/patch-modules_jabber_Makefile | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/net/ser/Makefile b/net/ser/Makefile index d55ff7df08a..16e3444ebe5 100644 --- a/net/ser/Makefile +++ b/net/ser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2006/11/22 10:09:22 jakob Exp $ +# $OpenBSD: Makefile,v 1.10 2007/04/27 19:03:53 bernd Exp $ COMMENT= "SIP Express Router" @@ -6,9 +6,9 @@ ONLY_FOR_ARCHS= i386 sparc VERSION= 0.8.10 DISTNAME= ser-${VERSION}_src -PKGNAME= ser-${VERSION}p0 +PKGNAME= ser-${VERSION}p1 CATEGORIES= net -WANTLIB= c z +WANTLIB= c expat z MASTER_SITES= ${MASTER_SITE_BERLIOS:=ser/} @@ -26,8 +26,7 @@ USE_GMAKE= Yes ALL_TARGET= all ser.cfg -LIB_DEPENDS= lib/mysql/mysqlclient.>=10::databases/mysql \ - expat.>=2::textproc/expat +LIB_DEPENDS= lib/mysql/mysqlclient.>=10::databases/mysql do-install: cd ${WRKDIST}; ${MAKE_PROGRAM} PREFIX=${WRKINST}${TRUEPREFIX} install diff --git a/net/ser/patches/patch-modules_jabber_Makefile b/net/ser/patches/patch-modules_jabber_Makefile index c783ddd732b..b195fc5940e 100644 --- a/net/ser/patches/patch-modules_jabber_Makefile +++ b/net/ser/patches/patch-modules_jabber_Makefile @@ -1,4 +1,4 @@ -$OpenBSD: patch-modules_jabber_Makefile,v 1.2 2003/01/15 22:45:20 jakob Exp $ +$OpenBSD: patch-modules_jabber_Makefile,v 1.3 2007/04/27 19:03:53 bernd Exp $ --- modules/jabber/Makefile.orig Mon Nov 11 15:34:53 2002 +++ modules/jabber/Makefile Wed Jan 15 12:22:53 2003 @@ -8,7 +8,9 @@ @@ -7,8 +7,8 @@ $OpenBSD: patch-modules_jabber_Makefile,v 1.2 2003/01/15 22:45:20 jakob Exp $ # expat.h location -DEFS+=-I/usr/local/include -LIBS=-L/usr/local/lib -lexpat -+DEFS+=-I${LOCALBASE}/include -+LIBS=-L${LOCALBASE}/lib -lexpat ++DEFS+=-I${X11BASE}/include ++LIBS=-L${X11BASE}/lib -lexpat include ../../Makefile.modules +