Sat Jun 16 19:28:19 2012 UTC ()
since in recent NetBSD, the /etc/rc.d/sdpd script was merged into
/etc/rc.d/bluetooth we should try to REQUIRE the correct script.


(plunky)
diff -r1.28 -r1.29 pkgsrc/comms/obexapp/Makefile
diff -r1.2 -r1.3 pkgsrc/comms/obexapp/files/obexapp.sh
cvs diff -r1.28 -r1.29 pkgsrc/comms/obexapp/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/obexapp/Makefile 2011/07/13 20:51:41 1.28
+++ pkgsrc/comms/obexapp/Makefile 2012/06/16 19:28:19 1.29
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.28 2011/07/13 20:51:41 plunky Exp $ 1# $NetBSD: Makefile,v 1.29 2012/06/16 19:28:19 plunky Exp $
2# 2#
3 3
4DISTNAME= obexapp-1.4.15 4DISTNAME= obexapp-1.4.15
 5PKGREVISION= 1
5CATEGORIES= comms 6CATEGORIES= comms
6MASTER_SITES= http://people.freebsd.org/~emax/obexapp/ 7MASTER_SITES= http://people.freebsd.org/~emax/obexapp/
7 8
8MAINTAINER= plunky@rya-online.net 9MAINTAINER= plunky@rya-online.net
9HOMEPAGE= http://people.freebsd.org/~emax/obexapp/ 10HOMEPAGE= http://people.freebsd.org/~emax/obexapp/
10COMMENT= Obex application to transfer objects to mobile equipment 11COMMENT= Obex application to transfer objects to mobile equipment
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-[4-9].*-* 14ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-[4-9].*-*
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17BUILD_DEFS+= VARBASE 18BUILD_DEFS+= VARBASE
@@ -28,24 +29,27 @@ SUBST_FILES.paths= Makefile obexapp.1 ob @@ -28,24 +29,27 @@ SUBST_FILES.paths= Makefile obexapp.1 ob
28SUBST_STAGE.paths= post-configure 29SUBST_STAGE.paths= post-configure
29SUBST_SED.paths+= -e "s|/usr/local/man|${PREFIX}|" 30SUBST_SED.paths+= -e "s|/usr/local/man|${PREFIX}|"
30SUBST_SED.paths+= -e "s|/usr/local|${PREFIX}|" 31SUBST_SED.paths+= -e "s|/usr/local|${PREFIX}|"
31SUBST_SED.paths+= -e "s|/var|${VARBASE}|" 32SUBST_SED.paths+= -e "s|/var|${VARBASE}|"
32 33
33USE_BSD_MAKEFILE= yes 34USE_BSD_MAKEFILE= yes
34 35
35.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
36 37
37# This uses the older ServiceDiscovery API 38# This uses the older ServiceDiscovery API
38.if (${OPSYS} == "NetBSD" && \ 39.if (${OPSYS} == "NetBSD" && \
39 (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*))) 40 (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*)))
40MAKE_ENV+= HAVE_LIBSDP=no 41MAKE_ENV+= HAVE_LIBSDP=no
 42RCD_SDPD= bluetooth
41.endif 43.endif
42 44
 45FILES_SUBST+= RCD_SDPD=${RCD_SDPD:Usdpd}
 46
43# because the directory name conflicts with the rc.d script 47# because the directory name conflicts with the rc.d script
44post-extract: 48post-extract:
45 mv ${WRKDIR}/obexapp ${WRKDIR}/${DISTNAME} 49 mv ${WRKDIR}/obexapp ${WRKDIR}/${DISTNAME}
46 50
47.include "../../comms/openobex/buildlink3.mk" 51.include "../../comms/openobex/buildlink3.mk"
48.include "../../converters/libiconv/buildlink3.mk" 52.include "../../converters/libiconv/buildlink3.mk"
49.include "../../devel/readline/buildlink3.mk" 53.include "../../devel/readline/buildlink3.mk"
50.include "../../textproc/expat/buildlink3.mk" 54.include "../../textproc/expat/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/comms/obexapp/files/obexapp.sh (expand / switch to unified diff)

--- pkgsrc/comms/obexapp/files/obexapp.sh 2010/12/01 19:28:27 1.2
+++ pkgsrc/comms/obexapp/files/obexapp.sh 2012/06/16 19:28:19 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: obexapp.sh,v 1.2 2010/12/01 19:28:27 plunky Exp $ 3# $NetBSD: obexapp.sh,v 1.3 2012/06/16 19:28:19 plunky Exp $
4# 4#
5# PROVIDE: obexapp 5# PROVIDE: obexapp
6# REQUIRE: sdpd 6# REQUIRE: @RCD_SDPD@
7# 7#
8 8
9# variables used: 9# variables used:
10# 10#
11# obexapp_channel RFCOMM channel number 11# obexapp_channel RFCOMM channel number
12# obexapp_username username for -u option 12# obexapp_username username for -u option
13# obexapp_pathname pathname for -r option 13# obexapp_pathname pathname for -r option
14 14
15$rc_subr_loaded . /etc/rc.subr 15$rc_subr_loaded . /etc/rc.subr
16 16
17name="obexapp" 17name="obexapp"
18rcvar=$name 18rcvar=$name
19command="@PREFIX@/bin/${name}" 19command="@PREFIX@/bin/${name}"