2 files changed, 325 insertions, 3 deletions

diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 6663762a106f..b2b09aad12a8 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -68,6 +68,14 @@ PLIST_GMP=	${PKGDIR}/pkg-plist.gmp
 PLIST_TOOLS=	${PKGDIR}/pkg-plist.Tools
 .endif
 
+#
+# Install Demo/ by default.
+#
+.if !defined(WITHOUT_DEMO)
+PLIST_DEMO=	${PKGDIR}/pkg-plist.Demo
+DEMODIR=	${PREFIX}/share/examples/python
+.endif
+
 post-configure:
 	${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup
 .for file in ${SETUP_LOCAL}
@@ -107,16 +115,21 @@ pre-install:
 		${PREFIX}/lib/${PYTHON_VERSION}/${platform}/
 .endfor
 .endfor
-	@sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist
+	@sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_DEMO} ${PKGDIR}/pkg-plist
 
 post-install:
 	strip ${PREFIX}/bin/python
 	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
-	@${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
+	@${MKDIR} ${PYTHON_SITELIBDIR}
 .if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -)
+		(cd ${PYTHON_LIBDIR}; tar xf -)
+.endif
+.if !defined(WITHOUT_DEMO)
+	@${MKDIR} ${DEMODIR}
+	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
+		(cd ${DEMODIR}; tar xf -)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/python31/pkg-plist.Demo b/lang/python31/pkg-plist.Demo
new file mode 100644
index 000000000000..9823b28cbc6f
--- /dev/null
+++ b/lang/python31/pkg-plist.Demo
@@ -0,0 +1,309 @@
+share/examples/python/Makefile
+share/examples/python/README
+share/examples/python/classes/Complex.py
+share/examples/python/classes/Dates.py
+share/examples/python/classes/Dbm.py
+share/examples/python/classes/README
+share/examples/python/classes/Range.py
+share/examples/python/classes/Rat.py
+share/examples/python/classes/Rev.py
+share/examples/python/classes/Vec.py
+share/examples/python/classes/bitvec.py
+share/examples/python/classes/class.doc
+share/examples/python/comparisons/README
+share/examples/python/comparisons/patterns
+share/examples/python/comparisons/regextest.py
+share/examples/python/comparisons/sortingtest.py
+share/examples/python/comparisons/systemtest.py
+share/examples/python/dns/README
+share/examples/python/dns/asgethost.py
+share/examples/python/dns/dnsclass.py
+share/examples/python/dns/dnslib.py
+share/examples/python/dns/dnsopcode.py
+share/examples/python/dns/dnstype.py
+share/examples/python/embed/Makefile
+share/examples/python/embed/README
+share/examples/python/embed/demo.c
+share/examples/python/extend/README
+share/examples/python/extend/make_clean
+share/examples/python/extend/make_shared
+share/examples/python/extend/make_static
+share/examples/python/imputil/importers.py
+share/examples/python/md5test/README
+share/examples/python/md5test/foo
+share/examples/python/md5test/md5driver.py
+share/examples/python/metaclasses/Eiffel.py
+share/examples/python/metaclasses/Enum.py
+share/examples/python/metaclasses/Meta.py
+share/examples/python/metaclasses/Simple.py
+share/examples/python/metaclasses/Synch.py
+share/examples/python/metaclasses/Trace.py
+share/examples/python/metaclasses/index.html
+share/examples/python/metaclasses/meta-vladimir.txt
+share/examples/python/parser/FILES
+share/examples/python/parser/Makefile
+share/examples/python/parser/README
+share/examples/python/parser/docstring.py
+share/examples/python/parser/example.py
+share/examples/python/parser/parser.tex
+share/examples/python/parser/simple.py
+share/examples/python/parser/source.py
+share/examples/python/parser/test_parser.py
+share/examples/python/parser/texipre.dat
+share/examples/python/pdist/FSProxy.py
+share/examples/python/pdist/RCSProxy.py
+share/examples/python/pdist/README
+share/examples/python/pdist/client.py
+share/examples/python/pdist/cmdfw.py
+share/examples/python/pdist/cmptree.py
+share/examples/python/pdist/cvslib.py
+share/examples/python/pdist/cvslock.py
+share/examples/python/pdist/mac.py
+share/examples/python/pdist/makechangelog.py
+share/examples/python/pdist/rcsbump
+share/examples/python/pdist/rcsclient.py
+share/examples/python/pdist/rcslib.py
+share/examples/python/pdist/rcvs
+share/examples/python/pdist/rcvs.py
+share/examples/python/pdist/rrcs
+share/examples/python/pdist/rrcs.py
+share/examples/python/pdist/security.py
+share/examples/python/pdist/server.py
+share/examples/python/pdist/sumtree.py
+share/examples/python/pysvr/Makefile
+share/examples/python/pysvr/README
+share/examples/python/pysvr/pysvr.c
+share/examples/python/pysvr/pysvr.py
+share/examples/python/rpc/MANIFEST
+share/examples/python/rpc/README
+share/examples/python/rpc/T.py
+share/examples/python/rpc/mountclient.py
+share/examples/python/rpc/nfsclient.py
+share/examples/python/rpc/rnusersclient.py
+share/examples/python/rpc/rpc.py
+share/examples/python/rpc/test
+share/examples/python/rpc/xdr.py
+share/examples/python/scripts/README
+share/examples/python/scripts/beer.py
+share/examples/python/scripts/eqfix.py
+share/examples/python/scripts/fact.py
+share/examples/python/scripts/from.py
+share/examples/python/scripts/ftpstats.py
+share/examples/python/scripts/lpwatch.py
+share/examples/python/scripts/makedir.py
+share/examples/python/scripts/markov.py
+share/examples/python/scripts/mboxconvert.py
+share/examples/python/scripts/mkrcs.py
+share/examples/python/scripts/morse.py
+share/examples/python/scripts/mpzpi.py
+share/examples/python/scripts/newslist.doc
+share/examples/python/scripts/newslist.py
+share/examples/python/scripts/pi.py
+share/examples/python/scripts/pp.py
+share/examples/python/scripts/primes.py
+share/examples/python/scripts/script.py
+share/examples/python/scripts/unbirthday.py
+share/examples/python/scripts/update.py
+share/examples/python/scripts/wh.py
+share/examples/python/sgi/README
+share/examples/python/sgi/al/README
+share/examples/python/sgi/al/alwatch.py
+share/examples/python/sgi/al/broadcast.py
+share/examples/python/sgi/al/cmpaf.py
+share/examples/python/sgi/al/cmpaf_form.fd
+share/examples/python/sgi/al/intercom.py
+share/examples/python/sgi/al/listen.py
+share/examples/python/sgi/al/names.py
+share/examples/python/sgi/al/playaiff.py
+share/examples/python/sgi/al/playback.py
+share/examples/python/sgi/al/playold.py
+share/examples/python/sgi/al/radio.py
+share/examples/python/sgi/al/rec_play.py
+share/examples/python/sgi/al/record.py
+share/examples/python/sgi/al/unicast.py
+share/examples/python/sgi/al/x.py
+share/examples/python/sgi/audio/README
+share/examples/python/sgi/audio/play.py
+share/examples/python/sgi/cd/CD.doc
+share/examples/python/sgi/cd/README
+share/examples/python/sgi/cd/cdaiff.py
+share/examples/python/sgi/cd/listcd.py
+share/examples/python/sgi/cd/playcd.py
+share/examples/python/sgi/cd/recvcd.py
+share/examples/python/sgi/cd/sendcd.py
+share/examples/python/sgi/flp/tcache.fd
+share/examples/python/sgi/flp/tcache.py
+share/examples/python/sgi/flp/test_cb.fd
+share/examples/python/sgi/flp/test_cb.py
+share/examples/python/sgi/flp/test_nocb.fd
+share/examples/python/sgi/flp/test_nocb.py
+share/examples/python/sgi/gl/README
+share/examples/python/sgi/gl/backface.py
+share/examples/python/sgi/gl/glinfo.py
+share/examples/python/sgi/gl/kites.py
+share/examples/python/sgi/gl/kunst.py
+share/examples/python/sgi/gl/mclock.doc
+share/examples/python/sgi/gl/mclock.py
+share/examples/python/sgi/gl/mixing.py
+share/examples/python/sgi/gl/nurbs.py
+share/examples/python/sgi/gl/zrgb.py
+share/examples/python/sgi/sv/README
+share/examples/python/sgi/sv/burstcapt.py
+share/examples/python/sgi/sv/contcapt.py
+share/examples/python/sgi/sv/rgbgrab.py
+share/examples/python/sgi/sv/simpleinput.py
+share/examples/python/sgi/video/DisplayVideoIn.py
+share/examples/python/sgi/video/Dsend.py
+share/examples/python/sgi/video/LiveVideoIn.py
+share/examples/python/sgi/video/LiveVideoOut.py
+share/examples/python/sgi/video/OldVcopy.py
+share/examples/python/sgi/video/README
+share/examples/python/sgi/video/VCR.py
+share/examples/python/sgi/video/VFile.py
+share/examples/python/sgi/video/VGrabber.py
+share/examples/python/sgi/video/Vaddcache.py
+share/examples/python/sgi/video/Vb.py
+share/examples/python/sgi/video/VbForm.fd
+share/examples/python/sgi/video/Vcopy.py
+share/examples/python/sgi/video/VcrIndex.py
+share/examples/python/sgi/video/Vedit.py
+share/examples/python/sgi/video/VeditForm.fd
+share/examples/python/sgi/video/Vfix.py
+share/examples/python/sgi/video/Vgeneric.py
+share/examples/python/sgi/video/Viewer.py
+share/examples/python/sgi/video/Vinfo.py
+share/examples/python/sgi/video/Vmkjpeg.py
+share/examples/python/sgi/video/Vplay.py
+share/examples/python/sgi/video/Vrec.py
+share/examples/python/sgi/video/Vrecb.py
+share/examples/python/sgi/video/Vreceive.py
+share/examples/python/sgi/video/Vsend.py
+share/examples/python/sgi/video/Vstat.py
+share/examples/python/sgi/video/Vtime.py
+share/examples/python/sgi/video/Vunjpeg.py
+share/examples/python/sgi/video/aplay.py
+share/examples/python/sgi/video/cmif-film.ms
+share/examples/python/sgi/video/imgconv.py
+share/examples/python/sgi/video/rgb2video.py
+share/examples/python/sgi/video/senddefs.py
+share/examples/python/sgi/video/svgrab24.c
+share/examples/python/sgi/video/video.doc
+share/examples/python/sgi/video/video2rgb.py
+share/examples/python/sgi/video/watchcursor.py
+share/examples/python/sockets/README
+share/examples/python/sockets/broadcast.py
+share/examples/python/sockets/echosvr.py
+share/examples/python/sockets/finger.py
+share/examples/python/sockets/ftp.py
+share/examples/python/sockets/gopher.py
+share/examples/python/sockets/mcast.py
+share/examples/python/sockets/radio.py
+share/examples/python/sockets/rpython.py
+share/examples/python/sockets/rpythond.py
+share/examples/python/sockets/telnet.py
+share/examples/python/sockets/throughput.py
+share/examples/python/sockets/udpecho.py
+share/examples/python/sockets/unicast.py
+share/examples/python/sockets/unixclient.py
+share/examples/python/sockets/unixserver.py
+share/examples/python/threads/Generator.py
+share/examples/python/threads/README
+share/examples/python/threads/bug.py
+share/examples/python/threads/find.py
+share/examples/python/threads/sync.py
+share/examples/python/threads/telnet.py
+share/examples/python/tkinter/README
+share/examples/python/tkinter/guido/AttrDialog.py
+share/examples/python/tkinter/guido/ManPage.py
+share/examples/python/tkinter/guido/MimeViewer.py
+share/examples/python/tkinter/guido/ShellWindow.py
+share/examples/python/tkinter/guido/brownian.py
+share/examples/python/tkinter/guido/canvasevents.py
+share/examples/python/tkinter/guido/dialog.py
+share/examples/python/tkinter/guido/electrons.py
+share/examples/python/tkinter/guido/hanoi.py
+share/examples/python/tkinter/guido/hello.py
+share/examples/python/tkinter/guido/imagedraw.py
+share/examples/python/tkinter/guido/imageview.py
+share/examples/python/tkinter/guido/kill.py
+share/examples/python/tkinter/guido/listtree.py
+share/examples/python/tkinter/guido/mbox.py
+share/examples/python/tkinter/guido/newmenubardemo.py
+share/examples/python/tkinter/guido/optionmenu.py
+share/examples/python/tkinter/guido/paint.py
+share/examples/python/tkinter/guido/rmt.py
+share/examples/python/tkinter/guido/solitaire.py
+share/examples/python/tkinter/guido/sortvisu.py
+share/examples/python/tkinter/guido/svkill.py
+share/examples/python/tkinter/guido/switch.py
+share/examples/python/tkinter/guido/tkman.py
+share/examples/python/tkinter/guido/wish.py
+share/examples/python/tkinter/matt/00-HELLO-WORLD.py
+share/examples/python/tkinter/matt/README
+share/examples/python/tkinter/matt/animation-simple.py
+share/examples/python/tkinter/matt/animation-w-velocity-ctrl.py
+share/examples/python/tkinter/matt/bind-w-mult-calls-p-type.py
+share/examples/python/tkinter/matt/canvas-demo-simple.py
+share/examples/python/tkinter/matt/canvas-gridding.py
+share/examples/python/tkinter/matt/canvas-moving-or-creating.py
+share/examples/python/tkinter/matt/canvas-moving-w-mouse.py
+share/examples/python/tkinter/matt/canvas-mult-item-sel.py
+share/examples/python/tkinter/matt/canvas-reading-tag-info.py
+share/examples/python/tkinter/matt/canvas-w-widget-draw-el.py
+share/examples/python/tkinter/matt/canvas-with-scrollbars.py
+share/examples/python/tkinter/matt/dialog-box.py
+share/examples/python/tkinter/matt/entry-simple.py
+share/examples/python/tkinter/matt/entry-with-shared-variable.py
+share/examples/python/tkinter/matt/killing-window-w-wm.py
+share/examples/python/tkinter/matt/menu-all-types-of-entries.py
+share/examples/python/tkinter/matt/menu-simple.py
+share/examples/python/tkinter/matt/not-what-you-might-think-1.py
+share/examples/python/tkinter/matt/not-what-you-might-think-2.py
+share/examples/python/tkinter/matt/packer-and-placer-together.py
+share/examples/python/tkinter/matt/packer-simple.py
+share/examples/python/tkinter/matt/placer-simple.py
+share/examples/python/tkinter/matt/pong-demo-1.py
+share/examples/python/tkinter/matt/printing-coords-of-items.py
+share/examples/python/tkinter/matt/radiobutton-simple.py
+share/examples/python/tkinter/matt/rubber-band-box-demo-1.py
+share/examples/python/tkinter/matt/rubber-line-demo-1.py
+share/examples/python/tkinter/matt/slider-demo-1.py
+share/examples/python/tkinter/matt/subclass-existing-widgets.py
+share/examples/python/tkinter/matt/two-radio-groups.py
+share/examples/python/tkinter/matt/window-creation-more.py
+share/examples/python/tkinter/matt/window-creation-simple.py
+share/examples/python/tkinter/matt/window-creation-w-location.py
+share/examples/python/xml/elem_count.py
+share/examples/python/xml/roundtrip.py
+share/examples/python/xml/rss2html.py
+share/examples/python/zlib/minigzip.py
+share/examples/python/zlib/zlibdemo.py
+@dirrm share/examples/python/zlib
+@dirrm share/examples/python/xml
+@dirrm share/examples/python/tkinter/matt
+@dirrm share/examples/python/tkinter/guido
+@dirrm share/examples/python/tkinter
+@dirrm share/examples/python/threads
+@dirrm share/examples/python/sockets
+@dirrm share/examples/python/sgi/video
+@dirrm share/examples/python/sgi/sv
+@dirrm share/examples/python/sgi/gl
+@dirrm share/examples/python/sgi/flp
+@dirrm share/examples/python/sgi/cd
+@dirrm share/examples/python/sgi/audio
+@dirrm share/examples/python/sgi/al
+@dirrm share/examples/python/sgi
+@dirrm share/examples/python/scripts
+@dirrm share/examples/python/rpc
+@dirrm share/examples/python/pysvr
+@dirrm share/examples/python/pdist
+@dirrm share/examples/python/parser
+@dirrm share/examples/python/metaclasses
+@dirrm share/examples/python/md5test
+@dirrm share/examples/python/imputil
+@dirrm share/examples/python/extend
+@dirrm share/examples/python/embed
+@dirrm share/examples/python/dns
+@dirrm share/examples/python/comparisons
+@dirrm share/examples/python/classes
+@dirrm share/examples/python