mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

- counterpatch proposed by mm@ (maintainer approved)

Browse Source 
- fixed build on i386 if devel/readline installed
- fixed build on FreeBSD 5.5
- added NO_INSTALL_MANPAGES knob

PR:		ports/112321
Approved by:	garga (mentor)
This commit is contained in:
Martin Matuska 2007-05-25 10:50:47 +00:00
parent 212583e0fd
commit dbc3a63caa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=191756
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
comms/obexapp/Makefile
View File

@ -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 @@ LIB_DEPENDS= openobex:${PORTSDIR}/comms/openobex
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 @@ IGNORE= Needs 5.x from 20 Jan 2004 or later (sdpd)
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>

22
comms/obexapp/files/patch-Makefile
View File

@ -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>
-