diff options
| -rw-r--r-- | x11/wxGTK26-contrib/Makefile | 6 | ||||
| -rw-r--r-- | x11/wxGTK26-contrib/buildlink3.mk | 6 | ||||
| -rw-r--r-- | x11/wxGTK26/Makefile.common | 6 | ||||
| -rw-r--r-- | x11/wxGTK26/buildlink3.mk | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/x11/wxGTK26-contrib/Makefile b/x11/wxGTK26-contrib/Makefile index a3b311676a8..c22c6dc4de9 100644 --- a/x11/wxGTK26-contrib/Makefile +++ b/x11/wxGTK26-contrib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/09/22 19:45:54 joerg Exp $ +# $NetBSD: Makefile,v 1.2 2008/09/22 19:58:52 joerg Exp $ # -.include "../../x11/wxGTK/Makefile.common" +.include "../../x11/wxGTK26/Makefile.common" PKGNAME= ${DISTNAME:S/wxGTK/wxGTK-contrib/} PKGREVISION= 2 @@ -14,6 +14,6 @@ BUILD_DIRS= contrib/src BUILDLINK_DEPMETHOD.libXt?= build -.include "../../x11/wxGTK/buildlink3.mk" +.include "../../x11/wxGTK26/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk index 0a8a3aab184..1bb7ae18b39 100644 --- a/x11/wxGTK26-contrib/buildlink3.mk +++ b/x11/wxGTK26-contrib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/22 19:45:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/09/22 19:58:52 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WXGTK_CONTRIB_BUILDLINK3_MK:= ${WXGTK_CONTRIB_BUILDLINK3_MK}+ @@ -14,7 +14,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK-contrib .if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wxGTK-contrib+= wxGTK-contrib>=2.6.0nb2 BUILDLINK_ABI_DEPENDS.wxGTK-contrib?= wxGTK-contrib>=2.6.3nb1 -BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK-contrib +BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK26-contrib .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" @@ -22,7 +22,7 @@ BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK-contrib .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/wxGTK/buildlink3.mk" +.include "../../x11/wxGTK26/buildlink3.mk" .endif # WXGTK_CONTRIB_BUILDLINK3_MK diff --git a/x11/wxGTK26/Makefile.common b/x11/wxGTK26/Makefile.common index 2dd2949cab0..513f6345286 100644 --- a/x11/wxGTK26/Makefile.common +++ b/x11/wxGTK26/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $ +# $NetBSD: Makefile.common,v 1.2 2008/09/22 19:58:52 joerg Exp $ # DISTNAME= wxGTK-2.6.3 @@ -9,8 +9,8 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.wxwidgets.org/ -PATCHDIR= ${.CURDIR}/../../x11/wxGTK/patches -DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK/distinfo +PATCHDIR= ${.CURDIR}/../../x11/wxGTK26/patches +DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK26/distinfo PATCHFILES= ${DISTNAME}-libtool.diff3.bz2 PATCH_SITES= ${MASTER_SITE_LOCAL} diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk index 8ff5d5beeb2..259f2dc7111 100644 --- a/x11/wxGTK26/buildlink3.mk +++ b/x11/wxGTK26/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/09/22 19:58:52 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+ @@ -14,7 +14,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK .if !empty(WXGTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wxGTK+= wxGTK>=2.6.0nb2 BUILDLINK_ABI_DEPENDS.wxGTK+= wxGTK>=2.6.3nb1 -BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK +BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26 .endif # WXGTK_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" |