Attachment 78087 Details for Bug 112321 – obexapp-1.4.6_1.diff

[patch] obexapp-1.4.6_1.diff

obexapp-1.4.6_1.diff (text/plain), 2.38 KB, created by Martin Matuska on 2007-05-03 13:42:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2007-05-03 13:42:08 UTC

Size: 2.38 KB

patch

obsolete

>Index: ports/comms/obexapp/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/comms/obexapp/Makefile,v
>retrieving revision 1.14
>diff -u -r1.14 Makefile
>--- ports/comms/obexapp/Makefile	26 Apr 2007 19:43:59 -0000	1.14
>+++ ports/comms/obexapp/Makefile	3 May 2007 12:33:42 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	obexapp
> PORTVERSION=	1.4.6
>+PORTREVISION=	1
> CATEGORIES=	comms net
> MASTER_SITES=	http://www.geocities.com/m_evmenkin/
> 
>@@ -18,14 +19,21 @@
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> USE_ICONV=	yes
>+PLIST_FILES=	bin/obexapp
>+
>+.if !defined(NO_INSTALL_MANPAGES)
> MAN1=		obexapp.1
> MANCOMPRESSED=	yes
>-PLIST_FILES=	bin/obexapp
>+.else
>+MAKE_ENV+=	NO_MAN=yes
>+.endif
>+
>+MAKE_ENV+=	NO_WERROR=yes
> 
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 502101
>-IGNORE=		Needs 5.x from 20 Jan 2004 or later (sdpd)
>+IGNORE=		needs 5.x from 20 Jan 2004 or later (sdpd)
> .endif
> 
> .if ${OSVERSION} < 502121
>@@ -33,8 +41,4 @@
> ONLY_FOR_ARCHS=	i386
> .endif
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name \*.c | ${XARGS} \
>-		${REINPLACE_CMD} -e 's|<sdp.h>|</usr/include/sdp.h>|'
>-
> .include <bsd.port.post.mk>
>Index: ports/comms/obexapp/files/patch-Makefile
>===================================================================
>RCS file: /home/pcvs/ports/comms/obexapp/files/patch-Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 patch-Makefile
>--- ports/comms/obexapp/files/patch-Makefile	26 Apr 2007 19:43:59 -0000	1.8
>+++ ports/comms/obexapp/files/patch-Makefile	3 May 2007 12:33:42 -0000
>@@ -1,15 +1,27 @@
> --- Makefile.orig	Mon Apr 23 20:29:18 2007
>-+++ Makefile	Wed Apr 25 20:41:52 2007
>-@@ -1,8 +1,10 @@
>- # $Id: Makefile,v 1.11 2007/04/23 18:29:18 max Exp $
>- # $FreeBSD$
>++++ Makefile	Thu May  3 13:48:19 2007
>+@@ -3,4 +3,7 @@
>  
> -BINDIR=		/usr/local/bin
> -MANDIR=		/usr/local/man/man
> +PREFIX?=	/usr/local
>++LOCALBASE?=	/usr/local
> +
> +BINDIR=		${PREFIX}/bin
> +MANDIR=		${PREFIX}/man/man
>  PROG=		obexapp
>- MAN1=		obexapp.1
>+@@ -15,4 +18,4 @@
>  
>+-CFLAGS+=	-I/usr/local/include \
>+-		-I/usr/local/include/openobex \
>++CFLAGS+=	-idirafter ${LOCALBASE}/include \
>++		-I${LOCALBASE}/include/openobex \
>+ 		-fno-strict-aliasing
>+@@ -20,3 +23,3 @@
>+ DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE}
>+-LDADD=		-L/usr/lib -L/usr/local/lib \
>++LDADD=		-L/usr/lib -L${LOCALBASE}/lib \
>+ 		-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv
>+@@ -24,2 +27 @@
>+ .include <bsd.prog.mk>
>+-

Actions: View | Diff

Attachments on bug 112321: 78086 | 78087