new MULTI_PACKAGES, cpan module

x11/p5-Tk/Makefile

@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.26 2006/09/18 10:21:49 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2006/11/21 20:58:51 espie Exp $
 
-NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
+SHARED_ONLY=	Yes
 
-COMMENT=	"Tk 8.4 bindings for Perl"
+COMMENT-main=	"Tk 8.4 bindings for Perl"
 COMMENT-demo=	"demonstrate the features of ptk"
 
+MODULES=	cpan
 VERSION=	804.027
 DISTNAME=	Tk-${VERSION}
-PKGNAME=	p5-Tk-${VERSION}p0
-PKGNAME-demo=	p5-Tk-demo-${VERSION}
-CATEGORIES=	x11 devel perl5
+PKGNAME-main=	p5-Tk-${VERSION}p1
+PKGNAME-demo=	p5-Tk-demo-${VERSION}p0
+CATEGORIES=	x11 devel
 
 # GPL + custom
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,18 +18,19 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tk/}
+MULTI_PACKAGES=	-main -demo
 
-MULTI_PACKAGES=	-demo
-SUBPACKAGE?=
+WANTLIB-main=	X11 m z
+LIB_DEPENDS-main=png.>=4::graphics/png
 
-LIB_DEPENDS=	png.>=4::graphics/png
 RUN_DEPENDS=	:p5-HTML-Parser-*:www/p5-HTML-Parser
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-USE_X11=	Yes
 
-CONFIGURE_STYLE= perl
+RUN_DEPENDS-demo=	::x11/p5-Tk
+PKG_ARCH-demo=		*
+
+USE_X11=	Yes
 
 REGRESS_IS_INTERACTIVE=	Yes
 REGRESS_FLAGS=	DISPLAY="${DISPLAY}" XAUTHORITY="${HOME}/.Xauthority"
@@ -41,13 +43,5 @@ pre-regress:
 	@echo requires access to X11; exit 1
 .endif
 
-.if empty(SUBPACKAGE)
-WANTLIB=		X11 m z
-.endif
-
-.if defined(PACKAGING) && !empty(SUBPACKAGE)
-LIB_DEPENDS=
-RUN_DEPENDS=	::x11/p5-Tk
-.endif
 
 .include <bsd.port.mk>

x11/p5-Tk/pkg/PLIST-main

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.11 2005/01/13 03:23:10 kevlo Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 20:58:51 espie Exp $
+@pkgpath x11/p5-Tk
 bin/gedi
 bin/ptked
 bin/ptksh