2010/9/26 Federico G. Schwindt <[email protected]>:
> On Sun, Sep 26, 2010 at 03:56:49AM +0600, Alexandr Shadchin wrote:
>> Hi!
>>
>> Simplification lang/python and switch to REVISION.
>> Comments ? OK ?
>
> Why are you bumping the ports, and have you tested the post-extract on
> 2.4 since the original didn't have the rm?
> Otherwise looks good.
>
> f.-
>
I thought any changes to the port, I'd do the bump. removed bump.
2.4 tested on amd64 and i386.
--
Alexandr Shadchin
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile.inc
--- Makefile.inc 16 Sep 2010 22:34:08 -0000 1.66
+++ Makefile.inc 26 Sep 2010 07:23:41 -0000
@@ -15,7 +15,14 @@ COMMENT-tests= Python test suite
COMMENT-tkinter=tk GUI module for Python
COMMENT-tools= extra tools for Python
-PKGNAME-main= python-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
+PKGNAME-main= python-${VERSION}${PATCHLEVEL}
+PKGNAME-bsddb= python-bsddb-${VERSION}${PATCHLEVEL}
+PKGNAME-gdbm= python-gdbm-${VERSION}${PATCHLEVEL}
+PKGNAME-idle= python-idle-${VERSION}${PATCHLEVEL}
+PKGNAME-tests= python-tests-${VERSION}${PATCHLEVEL}
+PKGNAME-tkinter=python-tkinter-${VERSION}${PATCHLEVEL}
+PKGNAME-tools= python-tools-${VERSION}${PATCHLEVEL}
+
DISTNAME= Python-${VERSION}${PATCHLEVEL}
CATEGORIES= lang
MASTER_SITES= http://www.python.org/ftp/${PSUBDIR}/ \
@@ -44,7 +51,7 @@ ONLY_FOR_ARCHS-bsddb= amd64 i386
# All subpackages depend on the main python package.
-RUN_DEPENDS=
:python-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}:lang/python/${VERSION},-main
+RUN_DEPENDS= :${FULLPKGNAME-main}:lang/python/${VERSION},-main
LIB_DEPENDS=
LIB_DEPENDS-main= bz2::archivers/bzip2
@@ -63,14 +70,9 @@ LIB_DEPENDS-tkinter= tcl84:tcl->=8.4,<8.
tk84:tk->=8.4,<8.5:x11/tk/8.4
WANTLIB-tkinter= X11
-FULLPKGNAME-bsddb= python-bsddb-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
-FULLPKGNAME-gdbm= python-gdbm-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
-FULLPKGNAME-idle= python-idle-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
-FULLPKGNAME-tests= python-tests-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
-FULLPKGNAME-tkinter= python-tkinter-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
-FULLPKGNAME-tools= python-tools-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
-
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" ||
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
+ ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
+PATCH_LIST= patch-* sup64-*
PKG_ARGS+= -Dmm=0
.else
PKG_ARGS+= -Dmm=1
@@ -92,7 +94,7 @@ PKG_ARGS+= -Dctypes=0
USE_X11= Yes
-AUTOCONF_VERSION?= 2.59
+AUTOCONF_VERSION?= 2.61
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
# --srcdir is needed for systrace to work correctly
@@ -112,6 +114,9 @@ FAKE_FLAGS+= RANLIB=:
ALL_TARGET?= everything ./Lib/plat-openbsd4
+post-extract:
+ @rm -r ${WRKDIST}/Modules/expat
+
post-configure:
@cd ${WRKSRC} && ${MAKE_PROGRAM} Makefile
@@ -136,4 +141,3 @@ REGRESS_TARGET= test
REGRESS_FLAGS= "EXTRATESTOPTS=-w"
# Some regress tests write to $HOME
PORTHOME= ${WRKDIR}
-
Index: 2.4/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.4/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- 2.4/Makefile 22 Sep 2010 13:44:12 -0000 1.30
+++ 2.4/Makefile 26 Sep 2010 07:23:41 -0000
@@ -2,14 +2,10 @@
VERSION= 2.4
PATCHLEVEL= .6
-PKG_PATCHLEVEL= p4
+REVISION= 4
SHARED_LIBS= python2.4 1.0
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
- ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
-PATCH_LIST= patch-* sup64-*
-.endif
-
+AUTOCONF_VERSION= 2.59
ALL_TARGET?= all ${WRKSRC}/Lib/plat-openbsd4
.include <bsd.port.mk>
Index: 2.5/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.5/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- 2.5/Makefile 22 Sep 2010 13:44:12 -0000 1.40
+++ 2.5/Makefile 26 Sep 2010 07:23:41 -0000
@@ -2,18 +2,9 @@
VERSION= 2.5
PATCHLEVEL= .4
-PKG_PATCHLEVEL= p6
+REVISION= 6
SHARED_LIBS= python2.5 1.0
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
- ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
-PATCH_LIST= patch-* sup64-*
-.endif
-
-AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --with-cxx_main
-
-post-extract:
- rm -r ${WRKDIST}/Modules/expat
.include <bsd.port.mk>
Index: 2.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.6/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- 2.6/Makefile 22 Sep 2010 13:44:12 -0000 1.19
+++ 2.6/Makefile 26 Sep 2010 07:23:41 -0000
@@ -4,15 +4,6 @@ VERSION = 2.6
PATCHLEVEL = .6
SHARED_LIBS = python2.6 1.0
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
- ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
-PATCH_LIST = patch-* sup64-*
-.endif
-
-AUTOCONF_VERSION = 2.61
CONFIGURE_ARGS += --with-cxx_main
-
-post-extract:
- rm -r ${WRKDIST}/Modules/expat
.include <bsd.port.mk>
