diff options
| author | tg <tg@FreeBSD.org> | 1997-11-24 23:12:44 +0800 |
|---|---|---|
| committer | tg <tg@FreeBSD.org> | 1997-11-24 23:12:44 +0800 |
| commit | f5097e6b14be065ef062161f730991b7ba234052 (patch) | |
| tree | 8c1fd97dd6464cd313a252b14d26c7d92a8b551b /lang/python15 | |
| parent | 3706c7bf08c8617b7d7a7b8a8b5620ff9a15e406 (diff) | |
| download | freebsd-ports-gnome-f5097e6b14be065ef062161f730991b7ba234052.tar.gz freebsd-ports-gnome-f5097e6b14be065ef062161f730991b7ba234052.tar.zst freebsd-ports-gnome-f5097e6b14be065ef062161f730991b7ba234052.zip | |
Use an option to disable the Tk extension (WITH_TK). Don't use
libc_r if we're not building the thread module. Respect options
given in the environment.
The defaults (build with Tk and thread support) don't change.
Diffstat (limited to 'lang/python15')
| -rw-r--r-- | lang/python15/Makefile | 31 | ||||
| -rw-r--r-- | lang/python15/files/Setup | 4 |
2 files changed, 27 insertions, 8 deletions
diff --git a/lang/python15/Makefile b/lang/python15/Makefile index 74dccf93bca3..387b83d84d3a 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.16 1997/08/06 06:40:27 tg Exp $ +# $Id: Makefile,v 1.17 1997/08/29 07:04:17 tg Exp $ # DISTNAME= python1.4 @@ -13,11 +13,11 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ \ ftp://www.python.org/pub/python/contrib/Graphics/Tkinter/ \ ftp://ftp.cwi.nl/pub/python/contrib/Graphics/Tkinter/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} _tkinter1.4.c +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${TKINTER} MAINTAINER= tg@FreeBSD.org -LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= ${TK_DEPENDS} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/Python-1.4 @@ -28,22 +28,41 @@ INSTALL_TARGET= install MAN1= python.1 # +# The standard setup file +# +SETUP_FILE= Setup + +# +# Support for Tk is compiled in by default. +# +WITH_TK?= yes +.if defined(WITH_TK) && $(WITH_TK) == yes +TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TKINTER= _tkinter1.4.c +SETUP_LOCAL+= Setup.tk +.endif + +# # If you want to use Python's thread module, you need to set WITH_THREADS # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -WITH_THREADS= yes -SETUP_FILE= Setup +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread -SETUP_FILE= Setup.thread +SETUP_LOCAL+= Setup.thread .endif post-extract: +.if defined(WITH_TK) && $(WITH_TK) == yes ${CP} ${DISTDIR}/_tkinter1.4.c ${WRKSRC}/Modules/_tkinter.c +.endif post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup +.for file in ${SETUP_LOCAL} + ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local +.endfor post-install: strip ${PREFIX}/bin/python diff --git a/lang/python15/files/Setup b/lang/python15/files/Setup index cab0cf57b1a5..6e6861c369e4 100644 --- a/lang/python15/files/Setup +++ b/lang/python15/files/Setup @@ -243,14 +243,14 @@ md5 md5module.c md5c.c # Change the -l arguments to use Tcl 7.4 and Tk 4.0! # *** ALWAYS enable this line: -TKPATH=:$(DESTLIB)/tkinter +#TKPATH=:$(DESTLIB)/tkinter # *** Enable *one* of the following lines: # For Solaris: #_tkinter _tkinter.c -I/usr/openwin/include -I/usr/local/include -L/usr/openwin/lib -L/usr/local/lib -ltk4.1 -ltcl7.5 -lX11 # For generic system (may have to add -I/-L options to find X11): #_tkinter _tkinter.c -I/usr/local/include -L/usr/local/lib -ltk4.1 -ltcl7.5 -lX11 -_tkinter _tkinter.c -I${PREFIX}/include/tk8.0 -I${PREFIX}/include/tcl8.0 -I${X11BASE}/include -L${PREFIX}/lib -L${X11BASE}/lib -ltk80 -ltcl80 -lX11 +#_tkinter _tkinter.c -I${PREFIX}/include/tk8.0 -I${PREFIX}/include/tcl8.0 -I${X11BASE}/include -L${PREFIX}/lib -L${X11BASE}/lib -ltk80 -ltcl80 -lX11 # Lance Ellinghaus's modules: |