head	1.9;
access;
symbols
	pkgsrc-2013Q2:1.9.0.4
	pkgsrc-2013Q2-base:1.9
	pkgsrc-2012Q4:1.9.0.2
	pkgsrc-2012Q4-base:1.9
	pkgsrc-2012Q1:1.8.0.44
	pkgsrc-2012Q1-base:1.8
	pkgsrc-2011Q4:1.8.0.42
	pkgsrc-2011Q4-base:1.8
	pkgsrc-2011Q3:1.8.0.40
	pkgsrc-2011Q3-base:1.8
	pkgsrc-2011Q2:1.8.0.38
	pkgsrc-2011Q2-base:1.8
	pkgsrc-2011Q1:1.8.0.36
	pkgsrc-2011Q1-base:1.8
	pkgsrc-2010Q4:1.8.0.34
	pkgsrc-2010Q4-base:1.8
	pkgsrc-2010Q3:1.8.0.32
	pkgsrc-2010Q3-base:1.8
	pkgsrc-2010Q2:1.8.0.30
	pkgsrc-2010Q2-base:1.8
	pkgsrc-2010Q1:1.8.0.28
	pkgsrc-2010Q1-base:1.8
	pkgsrc-2009Q4:1.8.0.26
	pkgsrc-2009Q4-base:1.8
	pkgsrc-2009Q3:1.8.0.24
	pkgsrc-2009Q3-base:1.8
	pkgsrc-2009Q2:1.8.0.22
	pkgsrc-2009Q2-base:1.8
	pkgsrc-2009Q1:1.8.0.20
	pkgsrc-2009Q1-base:1.8
	pkgsrc-2008Q4:1.8.0.18
	pkgsrc-2008Q4-base:1.8
	pkgsrc-2008Q3:1.8.0.16
	pkgsrc-2008Q3-base:1.8
	cube-native-xorg:1.8.0.14
	cube-native-xorg-base:1.8
	pkgsrc-2008Q2:1.8.0.12
	pkgsrc-2008Q2-base:1.8
	cwrapper:1.8.0.10
	pkgsrc-2008Q1:1.8.0.8
	pkgsrc-2008Q1-base:1.8
	pkgsrc-2007Q4:1.8.0.6
	pkgsrc-2007Q4-base:1.8
	pkgsrc-2007Q3:1.8.0.4
	pkgsrc-2007Q3-base:1.8
	pkgsrc-2007Q2:1.8.0.2
	pkgsrc-2007Q2-base:1.8
	pkgsrc-2007Q1:1.7.0.4
	pkgsrc-2007Q1-base:1.7
	pkgsrc-2006Q4:1.7.0.2
	pkgsrc-2006Q4-base:1.7
	pkgsrc-2006Q3:1.6.0.2
	pkgsrc-2006Q3-base:1.6
	pkgsrc-2006Q2:1.5.0.4
	pkgsrc-2006Q2-base:1.5
	pkgsrc-2006Q1:1.5.0.2
	pkgsrc-2006Q1-base:1.5
	pkgsrc-2005Q4:1.4.0.2
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.3.0.2
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.2.0.2
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.1.1.1.0.4
	pkgsrc-2005Q1-base:1.1.1.1
	pkgsrc-2004Q4:1.1.1.1.0.2
	pkgsrc-2004Q4-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.9
date	2012.04.08.19.09.04;	author wiz;	state dead;
branches;
next	1.8;

1.8
date	2007.06.08.14.16.16;	author wiz;	state Exp;
branches;
next	1.7;

1.7
date	2006.11.03.07.15.41;	author joerg;	state Exp;
branches;
next	1.6;

1.6
date	2006.09.20.12.07.19;	author rillig;	state Exp;
branches;
next	1.5;

1.5
date	2006.01.23.08.00.02;	author recht;	state Exp;
branches;
next	1.4;

1.4
date	2005.10.01.21.12.05;	author recht;	state Exp;
branches;
next	1.3;

1.3
date	2005.08.19.05.22.04;	author grant;	state Exp;
branches;
next	1.2;

1.2
date	2005.05.09.20.37.51;	author recht;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2004.12.05.23.27.49;	author recht;	state Exp;
branches
	1.1.1.1;
next	;

1.2.2.1
date	2005.08.20.16.01.13;	author salo;	state Exp;
branches;
next	;

1.1.1.1
date	2004.12.05.23.27.49;	author recht;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Remove python24 and all traces of it from pkgsrc.
Remove devel/py-ctypes (only needed by and supporting python24).
Remove PYTHON_VERSIONS_ACCEPTED and PYTHON_VERSIONS_INCOMPATIBLE
lines that just mirror defaults now.
Miscellaneous cleanup while editing all these files.
@
text
@$NetBSD: patch-af,v 1.8 2007/06/08 14:16:16 wiz Exp $

--- Makefile.pre.in.orig	2006-10-08 17:41:25.000000000 +0000
+++ Makefile.pre.in
@@@@ -30,6 +30,7 @@@@ VPATH=		@@srcdir@@
 
 CC=		@@CC@@
 CXX=		@@CXX@@
+MAINCC=		@@MAINCC@@
 LINKCC=		@@LINKCC@@
 AR=		@@AR@@
 RANLIB=		@@RANLIB@@
@@@@ -56,7 +57,7 @@@@ MAKESETUP=      $(srcdir)/Modules/makese
 OPT=		@@OPT@@
 BASECFLAGS=	@@BASECFLAGS@@
 CFLAGS=		$(BASECFLAGS) $(OPT)
-CPPFLAGS=	-I. -I$(srcdir)/Include
+CPPFLAGS=	@@CPPFLAGS@@ -I. -I$(srcdir)/Include
 LDFLAGS=	@@LDFLAGS@@
 LDLAST=		@@LDLAST@@
 SGI_ABI=	@@SGI_ABI@@
@@@@ -157,7 +158,6 @@@@ LIBC=		@@LIBC@@
 SYSLIBS=	$(LIBM) $(LIBC)
 SHLIBS=		@@SHLIBS@@
 
-MAINOBJ=	@@MAINOBJ@@
 THREADOBJ=	@@THREADOBJ@@
 DLINCLDIR=	@@DLINCLDIR@@
 DYNLOADFILE=	@@DYNLOADFILE@@
@@@@ -312,10 +312,10 @@@@ LIBRARY_OBJS=	\
 all:		$(BUILDPYTHON) oldsharedmods sharedmods
 
 # Build the interpreter
-$(BUILDPYTHON):	Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
+$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@@ \
-			Modules/$(MAINOBJ) \
-			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+			Modules/python.o \
+			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
 
 platform: $(BUILDPYTHON)
 	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
@@@@ -355,14 +355,17 @@@@ $(LIBRARY): $(LIBRARY_OBJS)
 
 libpython$(VERSION).so: $(LIBRARY_OBJS)
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
-		$(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
+		$(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
 		$(LN) -f $(INSTSONAME) $@@; \
 	else\
-		$(LDSHARED) -o $@@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
+		$(LDSHARED) -o $@@ $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
 	fi
 
 libpython$(VERSION).sl: $(LIBRARY_OBJS)
-	$(LDSHARED) -o $@@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
+	$(LDSHARED) -o $@@ $(LDFLAGS) $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+
+libpython2.4.2.dylib: $(LIBRARY_OBJS)
+	$(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@@ -current_version 2.4.2 -compatibility_version 2.4 -o $@@ -flat_namespace -undefined suppress $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
 
 # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
 # minimal framework (not including the Lib directory and such) in the current
@@@@ -450,8 +453,8 @@@@ Modules/getpath.o: $(srcdir)/Modules/get
 		-DVPATH='"$(VPATH)"' \
 		-o $@@ $(srcdir)/Modules/getpath.c
 
-Modules/ccpython.o: $(srcdir)/Modules/ccpython.cc
-	$(CXX) -c $(PY_CFLAGS) -o $@@ $(srcdir)/Modules/ccpython.cc
+Modules/python.o: $(srcdir)/Modules/python.c
+	$(MAINCC) -c $(PY_CFLAGS) -o $@@ $(srcdir)/Modules/python.c
 
 
 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
@@@@ -533,7 +536,7 @@@@ PYTHON_HEADERS= \
 		Include/weakrefobject.h \
 		pyconfig.h
 
-$(LIBRARY_OBJS) $(MODOBJS) Modules/$(MAINOBJ): $(PYTHON_HEADERS)
+$(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
 
 
 ######################################################################
@@@@ -655,7 +658,12 @@@@ altbininstall:	$(BUILDPYTHON)
 				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
 			fi \
 		fi; \
-	else	true; \
+	else \
+		if test -f libpython2.4.2.dylib; then \
+			$(INSTALL_SHARED) libpython2.4.2.dylib $(DESTDIR)$(LIBDIR)/libpython2.4.2.dylib; \
+		else \
+			true; \
+		fi \
 	fi
 
 # Install the manual page
@@@@ -773,7 +781,7 @@@@ $(srcdir)/Lib/$(PLATDIR):
 	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
 	export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
 	export EXE; EXE="$(BUILDEXE)"; \
-	cd $(srcdir)/Lib/$(PLATDIR); ./regen
+	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
 
 # Install the include files
 INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
@@@@ -818,7 +826,7 @@@@ libainstall:	all
 		fi; \
 	fi
 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
-	$(INSTALL_DATA) Modules/$(MAINOBJ) $(DESTDIR)$(LIBPL)/$(MAINOBJ)
+	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
 	$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
 	$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
@


1.8
log
@Update to 2.4.4:

We are pleased to announce the release of Python 2.4.4 (FINAL), a
bugfix release of Python 2.4, on October 18, 2006.

Important: 2.4.4 includes a security fix (PSF-2006-001) for the
repr() of unicode strings in wide unicode builds (UCS-4) [does not
affect pkgsrc]

Python 2.4 is now in bugfix-only mode; no new features are being
added. At least 80 bugs have been squished since Python 2.4.3,
including a number of bugs and potential bugs found by with the
Coverity and Klocwork static analysis tools. We'd like to offer
our thanks to both these firms for making this available for open
source projects - see their websites if you're interested.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
@


1.7
log
@On NetBSD, assume that MKYP=no when /usr/bin/ypcat doesn't exist.
The NIS module is not available in that case.
Call the regen script with RUNSHARED, so that it finds libpython.so,
even in the DESTDIR case.

XXX The call to regen should be moved to the build phase.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- Makefile.pre.in.orig	2006-03-13 13:08:41.000000000 +0000
d22 1
a22 1
@@@@ -153,7 +154,6 @@@@ LIBC=		@@LIBC@@
d30 1
a30 1
@@@@ -308,10 +308,10 @@@@ LIBRARY_OBJS=	\
d44 1
a44 1
@@@@ -351,14 +351,18 @@@@ $(LIBRARY): $(LIBRARY_OBJS)
d57 1
a57 1
-	$(LDSHARED) -o $@@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
a61 1
+
d65 1
a65 1
@@@@ -437,8 +441,8 @@@@ Modules/getpath.o: $(srcdir)/Modules/get
d76 1
a76 1
@@@@ -520,7 +524,7 @@@@ PYTHON_HEADERS= \
d85 1
a85 1
@@@@ -629,7 +633,12 @@@@ altbininstall:	$(BUILDPYTHON)
d99 1
a99 1
@@@@ -747,7 +756,7 @@@@ $(srcdir)/Lib/$(PLATDIR):
d108 1
a108 1
@@@@ -792,7 +801,7 @@@@ libainstall:	all
@


1.6
log
@libpython needs the pkgsrc-provided LDFLAGS to resolve all dependencies
at runtime. Fixes PR 34565.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.5 2006/01/23 08:00:02 recht Exp $
d3 3
a5 3
--- Makefile.pre.in.orig	2006-03-13 14:08:41.000000000 +0100
+++ Makefile.pre.in	2006-09-20 12:51:11.139973424 +0200
@@@@ -30,6 +30,7 @@@@
d13 1
a13 1
@@@@ -56,7 +57,7 @@@@
d22 1
a22 1
@@@@ -153,7 +154,6 @@@@
d30 1
a30 1
@@@@ -308,10 +308,10 @@@@
d44 1
a44 1
@@@@ -351,14 +351,18 @@@@
d66 1
a66 1
@@@@ -437,8 +441,8 @@@@
d77 1
a77 1
@@@@ -520,7 +524,7 @@@@
d86 1
a86 1
@@@@ -629,7 +633,12 @@@@
d100 10
a109 1
@@@@ -792,7 +801,7 @@@@
@


1.5
log
@Fix module compilation / libpython build on Darwin. This enables modules
not part of the std. Python install to work again.
Secondly, add a patch from Christoph Ludwig (
http://sourceforge.net/tracker/?func=detail&aid=1324762&group_id=5470&atid=305470
)
which contains the following changes (from the SourceForge post):

1) The configure option --with-cxx is renamed
--with-cxx-main. This was done to avoid surprising the user
by the changed meaning. Furthermore, it is now possible
that CXX has a different value than provided by
--with-cxx-main, so the old name would have been
confusing.

2) The compiler used to translate python's main() function is
stored in the configure / Makefile variable MAINCC. By
default, MAINCC=$(CC). If --with-cxx-main is given (without
an appended compiler name), then MAINCC=$(CXX). If
--with-cxx-main=<compiler> is on the configure command
line, then MAINCC=<compiler>. Additionally, configure sets
CXX=<compiler> unless CXX was already set on the
configure command line.

3) The command used to link the python executable is (as
before) stored in LINKCC. By default, LINKCC='$(PURIFY)
$(MAINCC)', i.e. the linker front-end is the compiler used to
translate main(). If necessary, LINKCC can be set on the
configure command line in which case it won't be altered.

4) If CXX is not set by the user (on the command line or via
--with-cxx-main), then configure tries several likely C++
compiler names. CXX is assigned the first name that refers
to a callable program in the system. (CXX is set even if
python is built with a C compiler only, so distutils can build
C++ extensions.)

5) Modules/ccpython.cc is no longer used and can be
removed.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- Makefile.pre.in.orig	2005-12-11 23:02:31.000000000 +0100
+++ Makefile.pre.in	2005-12-11 23:02:02.000000000 +0100
d44 12
a55 1
@@@@ -360,6 +360,10 @@@@
d57 3
a59 2
 	$(LDSHARED) -o $@@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
 
d61 1
a61 2
+	$(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@@ -current_version 2.4.2 -compatibility_version 2.4 -o $@@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
+
d63 1
a65 1
 # directory.
d86 1
a86 1
@@@@ -625,7 +629,12 @@@@
d100 1
a100 1
@@@@ -788,7 +797,7 @@@@
@


1.4
log
@Update to Python 2.4.2

Python 2.4.2 is a bugfix release of Python 2.4 - Python 2.4 is now in
bugfix-only mode, no new features are being added. More than 60 bugs have
been squashed since Python 2.4.1, including bugs that prevented Python working
properly on 64 bit AIX and HP/UX.

For a detailed list of changes see:
http://python.org/2.4.2/NEWS.html
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.3 2005/08/19 05:22:04 grant Exp $
d3 11
a13 3
--- Makefile.pre.in.orig	2005-03-29 09:23:01.000000000 +1000
+++ Makefile.pre.in
@@@@ -56,7 +56,7 @@@@ MAKESETUP=      $(srcdir)/Modules/makese
d18 1
a18 1
+CPPFLAGS+=	@@CPPFLAGS@@ -I. -I$(srcdir)/Include
d22 10
a31 1
@@@@ -94,8 +94,8 @@@@ LIBP=		$(LIBDIR)/python$(VERSION)
d33 3
a35 11
 # Symbols used for using shared libraries
 SO=		@@SO@@
-LDSHARED=	@@LDSHARED@@
-BLDSHARED=	@@BLDSHARED@@
+LDSHARED=	@@LDSHARED@@ $(LDFLAGS)
+BLDSHARED=	@@BLDSHARED@@ $(LDFLAGS)
 DESTSHARED=	$(BINLIBDEST)/lib-dynload
 
 # Executable suffix (.exe on Windows and Mac OS X)
@@@@ -311,7 +311,7 @@@@ all:		$(BUILDPYTHON) oldsharedmods share
 $(BUILDPYTHON):	Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
d37 1
a37 1
 			Modules/$(MAINOBJ) \
d39 1
d44 1
a44 1
@@@@ -360,6 +360,9 @@@@ libpython$(VERSION).so: $(LIBRARY_OBJS)
d48 1
a48 1
+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
d51 1
d55 21
a75 1
@@@@ -625,7 +628,12 @@@@ altbininstall:	$(BUILDPYTHON)
d81 2
a82 2
+		if test -f libpython$(VERSION).dylib; then \
+			$(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR)/libpython$(VERSION).dylib; \
d89 9
@


1.3
log
@include LDFLAGS when linking shared libraries, so they can find their
prerequisite libraries at runtime.

fixes build on Solaris (and probably others).
@
text
@d1 1
a1 1
$NetBSD$
d39 1
a39 1
+	$(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@@ -current_version 2.4.1 -compatibility_version 2.4 -o $@@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
@


1.2
log
@update to Python 2.4.1

Highlights of this new release include:
  - Bug fixes. According to the release notes, several dozen bugs
    have been fixed, including a fix for the SimpleXMLRPCServer
    security issue (PSF-2005-001).

Also add a patch by Joerg Sonnenberger to add basic support
for DragonFly BSD.

For a detailed list of changes see:
http://python.org/2.4.1/NEWS.html
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
d3 1
a3 1
--- Makefile.pre.in.orig	Sun Sep 26 19:26:55 2004
d14 11
@


1.2.2.1
log
@Pullup ticket 697 - requested by Grant Beattie
portability fix for python24

Revisions pulled up:
- pkgsrc/lang/python24/distinfo			1.11
- pkgsrc/lang/python24/patches/patch-af		1.3

   Module Name:		pkgsrc
   Committed By:	grant
   Date:		Fri Aug 19 05:22:04 UTC 2005

   Modified Files:
   	pkgsrc/lang/python24: distinfo
   	pkgsrc/lang/python24/patches: patch-af

   Log Message:
   include LDFLAGS when linking shared libraries, so they can find their
   prerequisite libraries at runtime.

   fixes build on Solaris (and probably others).
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.3 2005/08/19 05:22:04 grant Exp $
d3 1
a3 1
--- Makefile.pre.in.orig	2005-03-29 09:23:01.000000000 +1000
a13 11
@@@@ -94,8 +94,8 @@@@ LIBP=		$(LIBDIR)/python$(VERSION)
 
 # Symbols used for using shared libraries
 SO=		@@SO@@
-LDSHARED=	@@LDSHARED@@
-BLDSHARED=	@@BLDSHARED@@
+LDSHARED=	@@LDSHARED@@ $(LDFLAGS)
+BLDSHARED=	@@BLDSHARED@@ $(LDFLAGS)
 DESTSHARED=	$(BINLIBDEST)/lib-dynload
 
 # Executable suffix (.exe on Windows and Mac OS X)
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
d28 1
a28 1
+	$(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@@ -current_version 2.4.0 -compatibility_version 2.4 -o $@@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
@


1.1.1.1
log
@initial import of Python 2.4

Python is an interpreted, interactive, object-oriented
programming language that combines remarkable power with
very clear syntax. For an introduction to programming in
Python you are referred to the Python Tutorial. The
Python Library Reference documents built-in and standard
types, constants, functions and modules. Finally, the
Python Reference Manual describes the syntax and semantics
of the core language in (perhaps too) much detail.

Python's basic power can be extended with your own modules
written in C or C++. On most systems such modules may be
dynamically loaded. Python is also adaptable as an exten-
sion language for existing applications. See the internal
documentation for hints.

This package has been compiled without support for threads.
@
text
@@
