new MULTI_PACKAGES

lang/python/2.3/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2006/11/01 20:02:06 alek Exp $
+# $OpenBSD: Makefile,v 1.22 2006/11/24 20:48:23 steven Exp $
 
 .if ${MACHINE_ARCH} == "hppa"
 BROKEN=			"compiler hangs on py-Checker for example"
@@ -6,7 +6,7 @@ BROKEN=			"compiler hangs on py-Checker for example"
 
 VERSION=		2.3
 PATCHLEVEL=		.5
-PKG_PATCHLEVEL=		p5
+PKG_PATCHLEVEL=		p6
 SHARED_LIBS=		python2.3 0.0
 
 # needed for www/zope

lang/python/2.3/pkg/PFRAG.mm-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.mm,v 1.3 2006/11/01 20:02:06 alek Exp $
+@comment $OpenBSD: PFRAG.mm-main,v 1.1 2006/11/24 20:48:23 steven Exp $
 lib/python2.3/lib-dynload/audioop.so
 lib/python2.3/lib-dynload/dl.so
 lib/python2.3/lib-dynload/imageop.so

lang/python/2.3/pkg/PLIST-main

@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.6 2006/11/01 20:02:06 alek Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 20:48:23 steven Exp $
 @option no-default-conflict
 @conflict python->=2.3,<2.4
+@pkgpath lang/python/2.3
 bin/pydoc2.3
 bin/python2.3
 include/python2.3/

lang/python/2.4/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2006/11/01 20:38:37 alek Exp $
+# $OpenBSD: Makefile,v 1.10 2006/11/24 20:48:23 steven Exp $
 
 VERSION=		2.4
 PATCHLEVEL=		.4
-PKG_PATCHLEVEL=	
+PKG_PATCHLEVEL=		p0
 SHARED_LIBS=		python2.4 0.0
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"

lang/python/2.4/pkg/PFRAG.mm-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.mm,v 1.1 2006/11/01 20:38:37 alek Exp $
+@comment $OpenBSD: PFRAG.mm-main,v 1.1 2006/11/24 20:48:23 steven Exp $
 lib/python2.4/lib-dynload/dl.so
 lib/python2.4/lib-dynload/imageop.so
 lib/python2.4/lib-dynload/rgbimg.so

lang/python/2.4/pkg/PLIST-main

@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.4 2006/11/01 20:38:37 alek Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 20:48:23 steven Exp $
 @option no-default-conflict
 @conflict python->=2.4,<2.5
+@pkgpath lang/python/2.4
 %%mm%%
 bin/pydoc2.4
 bin/python2.4

lang/python/2.5/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2006/11/08 19:00:19 djm Exp $
+# $OpenBSD: Makefile,v 1.3 2006/11/24 20:48:23 steven Exp $
 
 VERSION=		2.5
 PATCHLEVEL=
-PKG_PATCHLEVEL=		p0
+PKG_PATCHLEVEL=		p1
 SHARED_LIBS=		python2.5 0.0
 
 # PSUBDIR=		python/${VERSION}

lang/python/2.5/pkg/PFRAG.ctypes-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.ctypes,v 1.1 2006/11/09 17:36:29 alek Exp $
+@comment $OpenBSD: PFRAG.ctypes-main,v 1.1 2006/11/24 20:48:23 steven Exp $
 lib/python2.5/ctypes/
 lib/python2.5/ctypes/__init__.py
 lib/python2.5/ctypes/__init__.pyc

lang/python/2.5/pkg/PFRAG.mm-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.mm,v 1.1 2006/11/01 20:59:18 alek Exp $
+@comment $OpenBSD: PFRAG.mm-main,v 1.1 2006/11/24 20:48:23 steven Exp $
 lib/python2.5/lib-dynload/dl.so
 lib/python2.5/lib-dynload/imageop.so
 lib/python2.5/lib-dynload/rgbimg.so

lang/python/2.5/pkg/PLIST-main

@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/11/08 19:00:19 djm Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 20:48:23 steven Exp $
 @option no-default-conflict
 @conflict python->=2.5,<2.6
+@pkgpath lang/python/2.5
 bin/idle2.5
 bin/pydoc2.5
 bin/python-config

lang/python/Makefile.inc

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.43 2006/11/13 11:20:25 steven Exp $
+# $OpenBSD: Makefile.inc,v 1.44 2006/11/24 20:48:23 steven Exp $
 
 # IMPORTANT!  If you make any changes to the Python ports, be sure
 # to also update files/CHANGES.OpenBSD for your change.  This is a
@@ -7,7 +7,7 @@
 
 SHARED_ONLY=	Yes
 
-COMMENT=	"interpreted object-oriented programming language"
+COMMENT-main=	"interpreted object-oriented programming language"
 COMMENT-expat=	"expat module for Python"
 COMMENT-bsddb=	"Berkeley db module for Python"
 COMMENT-gdbm=	"GNU dbm module for Python"
@@ -19,7 +19,7 @@ COMMENT-tools=	"extra tools for Python"
 COMMENT-sqlite=	"sqlite database module for Python"
 COMMENT-bz2=	"bz2 module for Python"
 
-PKGNAME=	python-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
+PKGNAME-main=	python-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
 DISTNAME=	Python-${VERSION}${PATCHLEVEL}
 CATEGORIES=	lang
 MASTER_SITES=	http://www.python.org/ftp/${PSUBDIR}/ \
@@ -42,19 +42,26 @@ PSEUDO_FLAVORS=	no_expat no_gdbm no_idle no_mpz no_tkinter no_bsddb no_bz2 \
 		no_sqlite
 FLAVOR?=
 
-MULTI_PACKAGES=	-tests -tools
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -tests -tools
 
 # All subpackages depend on the main python package.
 
-.if defined(PACKAGING)
-.  if !empty(SUBPACKAGE)
-RUN_DEPENDS=	:python-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}:lang/python/${VERSION}
+RUN_DEPENDS=	:python-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}:lang/python/${VERSION},-main
 LIB_DEPENDS=
-.  else
-WANTLIB=	ssl panel m crypto c util z readline pthread ncurses
-.  endif 
-.endif
+
+RUN_DEPENDS-main=
+WANTLIB-main=	ssl panel m crypto c util z readline pthread ncurses
+
+LIB_DEPENDS-bsddb=	lib/db4/db.=4:db-4.*:databases/db/v4
+LIB_DEPENDS-gdbm=	gdbm.>=3::databases/gdbm
+LIB_DEPENDS-bz2=	bz2::archivers/bzip2
+RUN_DEPENDS-idle=	${RUN_DEPENDS} \
+			::lang/python/${VERSION},-tkinter
+LIB_DEPENDS-tkinter=	tk84:tk-8.4.*:x11/tk/8.4
+WANTLIB-tkinter=	tcl84 X11
+LIB_DEPENDS-mpz=	gmp::devel/gmp
+LIB_DEPENDS-expat=	expat.>=4.0:expat->=1.95.6:textproc/expat
+LIB_DEPENDS-sqlite=	sqlite3.>=8.7::databases/sqlite3
 
 SETUP_PY=	"s,!!LOCALBASE!!,${LOCALBASE},g" \
 		"s,!!X11BASE!!,${X11BASE},g"
@@ -62,9 +69,6 @@ SETUP_PY=	"s,!!LOCALBASE!!,${LOCALBASE},g" \
 .if empty(FLAVOR:L:Mno_bsddb)
 SETUP_PY+=	"s,!!USE_BSDDB!!,1,g"
 MULTI_PACKAGES+=-bsddb
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-bsddb"
-LIB_DEPENDS+=	lib/db4/db.=4:db-4.*:databases/db/v4
-.  endif
 .else
 SETUP_PY+=	"s,!!USE_BSDDB!!,0,g"
 .endif
@@ -72,9 +76,6 @@ SETUP_PY+=	"s,!!USE_BSDDB!!,0,g"
 .if empty(FLAVOR:L:Mno_gdbm)
 SETUP_PY+=	"s,!!USE_GDBM!!,1,g"
 MULTI_PACKAGES+=-gdbm
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-gdbm"
-LIB_DEPENDS+=	gdbm.>=3::databases/gdbm
-.  endif
 .else
 SETUP_PY+=	"s,!!USE_GDBM!!,0,g"
 .endif
@@ -82,9 +83,6 @@ SETUP_PY+=	"s,!!USE_GDBM!!,0,g"
 .if empty(FLAVOR:L:Mno_bz2)
 SETUP_PY+=	"s,!!USE_BZ2!!,1,g"
 MULTI_PACKAGES+=-bz2
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-bz2"
-LIB_DEPENDS+=	bz2::archivers/bzip2
-.  endif
 .else
 SETUP_PY+=	"s,!!USE_BZ2!!,0,g"
 .endif
@@ -93,24 +91,10 @@ SETUP_PY+=	"s,!!USE_BZ2!!,0,g"
 MULTI_PACKAGES+=-idle
 .endif
 
-.if defined(PACKAGING)
-.  if ${SUBPACKAGE} == "-idle"
-RUN_DEPENDS+=	::lang/python/${VERSION},-tkinter
-LIB_DEPENDS=
-.  endif
-.  if ${SUBPACKAGE} == "-tools" || ${SUBPACKAGE} == "-test"
-LIB_DEPENDS=
-.  endif
-.endif
-
 .if empty(FLAVOR:L:Mno_tkinter)
 USE_X11=	Yes
 SETUP_PY+=	"s,!!USE_TKINTER!!,1,g"
 MULTI_PACKAGES+=-tkinter
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-tkinter"
-LIB_DEPENDS+=	tk84:tk-8.4.*:x11/tk/8.4
-WANTLIB=	tcl84 X11
-.  endif
 .else
 SETUP_PY+=	"s,!!USE_TKINTER!!,0,g"
 .endif
@@ -118,9 +102,6 @@ SETUP_PY+=	"s,!!USE_TKINTER!!,0,g"
 .if empty(FLAVOR:L:Mno_mpz) && ${VERSION} == "2.3"
 SETUP_PY+=	"s,!!USE_MPZ!!,1,g"
 MULTI_PACKAGES+=-mpz
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-mpz"
-LIB_DEPENDS+=	gmp::devel/gmp
-.  endif
 .else
 SETUP_PY+=	"s,!!USE_MPZ!!,0,g"
 .endif
@@ -128,9 +109,6 @@ SETUP_PY+=	"s,!!USE_MPZ!!,0,g"
 .if empty(FLAVOR:L:Mno_expat)
 SETUP_PY+=	"s,!!USE_EXPAT!!,1,g"
 MULTI_PACKAGES+=-expat
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-expat"
-LIB_DEPENDS+=	expat.>=4.0:expat->=1.95.6:textproc/expat
-.  endif
 .else
 SETUP_PY+=	"s,!!USE_EXPAT!!,0,g"
 .endif
@@ -138,9 +116,6 @@ SETUP_PY+=	"s,!!USE_EXPAT!!,0,g"
 .if empty(FLAVOR:L:Mno_sqlite) && ${VERSION} == "2.5"
 SETUP_PY+=	"s,!!USE_SQLITE!!,1,g"
 MULTI_PACKAGES+=-sqlite
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-sqlite"
-LIB_DEPENDS+=	sqlite3.>=8.7::databases/sqlite3
-.  endif
 .else
 SETUP_PY+=	"s,!!USE_SQLITE!!,0,g"
 .endif