Attachment #78087 for bug #112321

Lines 7-12 Link Here

(-)ports/comms/obexapp/Makefile (-6 / +10 lines)
7		7
8	PORTNAME= obexapp	8	PORTNAME= obexapp
9	PORTVERSION= 1.4.6	9	PORTVERSION= 1.4.6
		10	PORTREVISION= 1
10	CATEGORIES= comms net	11	CATEGORIES= comms net
11	MASTER_SITES= http://www.geocities.com/m_evmenkin/	12	MASTER_SITES= http://www.geocities.com/m_evmenkin/
12		13
Lines 18-31 Link Here
18	WRKSRC= ${WRKDIR}/${PORTNAME}	19	WRKSRC= ${WRKDIR}/${PORTNAME}
19		20
20	USE_ICONV= yes	21	USE_ICONV= yes
		22	PLIST_FILES= bin/obexapp
		23
		24	.if !defined(NO_INSTALL_MANPAGES)
21	MAN1= obexapp.1	25	MAN1= obexapp.1
22	MANCOMPRESSED= yes	26	MANCOMPRESSED= yes
23	PLIST_FILES= bin/obexapp	27	.else
		28	MAKE_ENV+= NO_MAN=yes
		29	.endif
		30
		31	MAKE_ENV+= NO_WERROR=yes
24		32
25	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
26		34
27	.if ${OSVERSION} < 502101	35	.if ${OSVERSION} < 502101
28	IGNORE= Needs 5.x from 20 Jan 2004 or later (sdpd)	36	IGNORE= needs 5.x from 20 Jan 2004 or later (sdpd)
29	.endif	37	.endif
30		38
31	.if ${OSVERSION} < 502121	39	.if ${OSVERSION} < 502121
Lines 33-40 Link Here
33	ONLY_FOR_ARCHS= i386	41	ONLY_FOR_ARCHS= i386
34	.endif	42	.endif
35		43
36	post-patch:
37	@${FIND} ${WRKSRC} -name \*.c \| ${XARGS} \
38	${REINPLACE_CMD} -e 's\|<sdp.h>\|</usr/include/sdp.h>\|'
39
40	.include <bsd.port.post.mk>	44	.include <bsd.port.post.mk>




--- Makefile.orig	Mon Apr 23 20:29:18 2007
+++ Makefile	Thu May  3 13:48:19 2007
@@ -3,4 +3,7 @@
 # $Id: Makefile,v 1.11 2007/04/23 18:29:18 max Exp $
 # $FreeBSD$
 
-BINDIR=		/usr/local/bin
-MANDIR=		/usr/local/man/man
+PREFIX?=	/usr/local
+LOCALBASE?=	/usr/local
+
+BINDIR=		${PREFIX}/bin
+MANDIR=		${PREFIX}/man/man
 PROG=		obexapp
@@ -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>
-

Return to bug 112321

Lines 1-15 Link Here

(-)ports/comms/obexapp/files/patch-Makefile (-5 / +17 lines)
1	--- Makefile.orig Mon Apr 23 20:29:18 2007	1	--- Makefile.orig Mon Apr 23 20:29:18 2007
2	+++ Makefile Wed Apr 25 20:41:52 2007	2	+++ Makefile Thu May 3 13:48:19 2007
3	@@ -1,8 +1,10 @@	3	@@ -3,4 +3,7 @@
4	# $Id: Makefile,v 1.11 2007/04/23 18:29:18 max Exp $
5	# $FreeBSD$
6		4
7	-BINDIR= /usr/local/bin	5	-BINDIR= /usr/local/bin
8	-MANDIR= /usr/local/man/man	6	-MANDIR= /usr/local/man/man
9	+PREFIX?= /usr/local	7	+PREFIX?= /usr/local
		8	+LOCALBASE?= /usr/local
10	+	9	+
11	+BINDIR= ${PREFIX}/bin	10	+BINDIR= ${PREFIX}/bin
12	+MANDIR= ${PREFIX}/man/man	11	+MANDIR= ${PREFIX}/man/man
13	PROG= obexapp	12	PROG= obexapp
14	MAN1= obexapp.1	13	@@ -15,4 +18,4 @@
15		14
		15	-CFLAGS+= -I/usr/local/include \
		16	- -I/usr/local/include/openobex \
		17	+CFLAGS+= -idirafter ${LOCALBASE}/include \
		18	+ -I${LOCALBASE}/include/openobex \
		19	-fno-strict-aliasing
		20	@@ -20,3 +23,3 @@
		21	DPADD= ${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE}
		22	-LDADD= -L/usr/lib -L/usr/local/lib \
		23	+LDADD= -L/usr/lib -L${LOCALBASE}/lib \
		24	-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv
		25	@@ -24,2 +27 @@
		26	.include <bsd.prog.mk>
		27	-