diff options
| author | rillig <rillig@pkgsrc.org> | 2006-07-06 16:27:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-07-06 16:27:28 +0000 |
| commit | 14df305b25206981edbc9ab9d01d6978556519f2 (patch) | |
| tree | 952cfd6bbd2161c3e45595c7788495bab5019c28 | |
| parent | 50170b85af631f3fbe691ce5bb8420137a1cd1d0 (diff) | |
| download | pkgsrc-14df305b25206981edbc9ab9d01d6978556519f2.tar.gz | |
Fixed pkglint warnings.
| -rw-r--r-- | comms/openobex/Makefile | 6 | ||||
| -rw-r--r-- | x11/py-gnome2-extras/buildlink3.mk | 15 | ||||
| -rw-r--r-- | x11/py-gnome2-extras/patches/patch-aa | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile index 3a9e61544bd..6ccba5a83de 100644 --- a/comms/openobex/Makefile +++ b/comms/openobex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/07/03 19:18:57 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2006/07/06 16:31:39 rillig Exp $ # DISTNAME= openobex-1.0.1 @@ -19,13 +19,15 @@ PKGCONFIG_OVERRIDE= openobex-config.in .include "../../mk/bsd.prefs.mk" .if (${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h)) -SUBST_CLASSES+= bt bt2 +SUBST_CLASSES+= bt SUBST_STAGE.bt= post-patch SUBST_FILES.bt= configure SUBST_SED.bt= -e "s|bluetooth/bluetooth.h|bluetooth.h|g" SUBST_SED.bt+= -e "s|bluetooth/rfcomm.h|netbt/rfcomm.h|g" SUBST_SED.bt+= -e "s|sockaddr_rc|sockaddr_bt|g" SUBST_MESSAGE.bt= Fixing bluetooth detection. + +SUBST_CLASSES+= bt2 SUBST_STAGE.bt2= post-patch SUBST_FILES.bt2= src/obex.h SUBST_SED.bt2= -e "s|ifndef SOL_RFCOMM|ifdef SOL_RFCOMM|" diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk index bf81aa82d23..8d3a6cd7c02 100644 --- a/x11/py-gnome2-extras/buildlink3.mk +++ b/x11/py-gnome2-extras/buildlink3.mk @@ -1,22 +1,21 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:12 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2006/07/06 16:27:28 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GNOME2EX_BUILDLINK3_MK:= ${PY_GNOME2EX_BUILDLINK3_MK}+ +PYGNOME2EX_BUILDLINK3_MK:= ${PYGNOME2EX_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= pygnome2ex .endif BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygnome2ex} BUILDLINK_PACKAGES+= pygnome2ex -.if !empty(PY_GNOME2EX_BUILDLINK3_MK:M+) +.if ${PYGNOME2EX_BUILDLINK3_MK} == "+" +.include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3 -BUILDLINK_ABI_DEPENDS.pygnome2ex?= py24-gnome2-extras>=2.12.0nb7 +BUILDLINK_ABI_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb7 BUILDLINK_PKGSRCDIR.pygnome2ex?= ../../x11/py-gnome2-extras -.endif # PY_GNOME2EX_BUILDLINK3_MK +.endif # PYGNOME2EX_BUILDLINK3_MK .include "../../x11/py-gnome2/buildlink3.mk" diff --git a/x11/py-gnome2-extras/patches/patch-aa b/x11/py-gnome2-extras/patches/patch-aa index 25a6f45e794..0513af2270c 100644 --- a/x11/py-gnome2-extras/patches/patch-aa +++ b/x11/py-gnome2-extras/patches/patch-aa @@ -1,4 +1,4 @@ -1;5C$NetBSD: patch-aa,v 1.1 2006/07/04 15:15:01 joerg Exp $ +$NetBSD: patch-aa,v 1.2 2006/07/06 16:27:28 rillig Exp $ --- gtop/gtop.c.orig 2006-07-04 15:05:29.000000000 +0000 +++ gtop/gtop.c |