mp3d license statement (19mar11)

git-svn-id: svn://tug.org/texlive/trunk@21771 c570f23f-e606-0410-a88d-b1316a301751

31 files changed, 44 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/metapost/mp3d/README b/Master/texmf-dist/doc/metapost/mp3d/README
index 499a872c0b1..aedb625ec4e 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/README
+++ b/Master/texmf-dist/doc/metapost/mp3d/README
@@ -1,6 +1,9 @@
               3d/3dgeom version 1.34
               ======================
 
+This entire package is released under the LPPL, version 1 or (at your
+option) any later version.
+
 This release is a intermediary release of the 3d metapost package.
 It updates the 3d package (CTAN:graphics/metapost/macros/3d)
 and adds features facilitating the creation of space geometry drawings.
diff --git a/Master/texmf-dist/doc/metapost/mp3d/README.doc b/Master/texmf-dist/doc/metapost/mp3d/README.doc
new file mode 100644
index 00000000000..bddb42dd8de
--- /dev/null
+++ b/Master/texmf-dist/doc/metapost/mp3d/README.doc
@@ -0,0 +1,23 @@
+tb57roeg:
+
+  Denis Roegel: Creating 3D animations with METAPOST,
+     TUGboat volume 18, number 4 (December 1997), pages 274-283. 
+
+    The tb57roeg files in this directory were provided to me on April 8th, 1998
+    by Mimi Burbank. These files were used for the production of the
+    final version of the paper, as it has appeared.
+
+paper1997corrected.pdf: uptodate version of tb57roeg
+
+tugboat-geometry-space.pdf:
+
+  TUGboat (volume 22, number 4, December 2001, pages 298-314)
+
+gut2001.pdf:
+
+  Denis Roegel: La géométrie dans l'espace avec METAPOST, 
+  Cahiers GUTenberg numéro 39-40, May 2001, pages 107-138. 
+  (Original version of tugboat-geometry-space)
+
+
+Denis Roegel, August 17, 2003.
diff --git a/Master/texmf-dist/metapost/mp3d/create_animation.sh b/Master/texmf-dist/doc/metapost/mp3d/create_animation.sh
index e99ca7383ca..e99ca7383ca 100644
--- a/Master/texmf-dist/metapost/mp3d/create_animation.sh
+++ b/Master/texmf-dist/doc/metapost/mp3d/create_animation.sh
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/cube10.mp b/Master/texmf-dist/doc/metapost/mp3d/cube10.mp
index 7cc6cb78731..7cc6cb78731 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/cube10.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/cube10.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/cube4-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/cube4-eng.mp
index 7a841d2e8b4..7a841d2e8b4 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/cube4-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/cube4-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/cube5.mp b/Master/texmf-dist/doc/metapost/mp3d/cube5.mp
index 9c3370744ee..9c3370744ee 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/cube5.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/cube5.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/cube6.mp b/Master/texmf-dist/doc/metapost/mp3d/cube6.mp
index 228cd35f9da..228cd35f9da 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/cube6.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/cube6.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/cube7.mp b/Master/texmf-dist/doc/metapost/mp3d/cube7.mp
index 28df75f1e85..28df75f1e85 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/cube7.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/cube7.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/cube8.mp b/Master/texmf-dist/doc/metapost/mp3d/cube8.mp
index f555a2637cb..f555a2637cb 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/cube8.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/cube8.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/cube9.mp b/Master/texmf-dist/doc/metapost/mp3d/cube9.mp
index 1e52203a811..1e52203a811 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/cube9.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/cube9.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp1-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp1-eng.mp
index bf144e1eeae..bf144e1eeae 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp1-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp1-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp1.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp1.mp
index 82a76d2c042..82a76d2c042 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp1.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp1.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp2-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp2-eng.mp
index 7ff4e581013..7ff4e581013 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp2-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp2-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp2.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp2.mp
index b2e3453f029..b2e3453f029 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp2.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp2.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp3-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp3-eng.mp
index a4b3cb81736..a4b3cb81736 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp3-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp3-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp3.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp3.mp
index 8b66eac58bb..8b66eac58bb 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp3.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp3.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp4-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp4-eng.mp
index 93e3cfba01c..93e3cfba01c 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp4-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp4-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp4.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp4.mp
index b97426f8196..b97426f8196 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp4.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp4.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp5-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp5-eng.mp
index 5bf58829948..5bf58829948 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp5-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp5-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp5.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp5.mp
index 3063c260839..3063c260839 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp5.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp5.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp6-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp6-eng.mp
index c11e44391a9..c11e44391a9 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp6-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp6-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp6.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp6.mp
index a63a1b08474..a63a1b08474 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp6.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp6.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp7-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp7-eng.mp
index 45865eae0f0..45865eae0f0 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp7-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp7-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp7.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp7.mp
index 784d8a2cfcc..784d8a2cfcc 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp7.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp7.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp8-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp8-eng.mp
index b46031931b9..b46031931b9 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp8-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp8-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp8.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp8.mp
index fc342bb301c..fc342bb301c 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp8.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp8.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp9.mp b/Master/texmf-dist/doc/metapost/mp3d/gutmp9.mp
index a419516aff4..a419516aff4 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/gutmp9.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/gutmp9.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/monge-eng.mp b/Master/texmf-dist/doc/metapost/mp3d/monge-eng.mp
index 09516765684..09516765684 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/monge-eng.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/monge-eng.mp
diff --git a/Master/texmf-dist/doc/metapost/mp3d/examples/monge.mp b/Master/texmf-dist/doc/metapost/mp3d/monge.mp
index 67fc60a0e5f..67fc60a0e5f 100644
--- a/Master/texmf-dist/doc/metapost/mp3d/examples/monge.mp
+++ b/Master/texmf-dist/doc/metapost/mp3d/monge.mp
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 81ccef25ddd..00c368f3d95 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -514,6 +514,7 @@ $Master = "$mydir/../..";
  'morehelp',	"die 'skipping, nonfree license'",
  'morse',	"die 'skipping, nosell license'",
  'movie15',	"&MAKEflatten",
+ 'mp3d',	"&MAKEflatten",
  'mpattern',	"&MAKEmpattern",
  'mpdinbrief',	"die 'skipping, nosell license'",
  'mptopdf',	"die 'skipping, not ready, sorry'", #"&MAKEflatten",
@@ -836,6 +837,7 @@ $Master = "$mydir/../..";
  'cm-super'		=> '&PREHOOK_cm_super',
  'fixme'		=> '&PREHOOK_fixme',
  'ibygrk'		=> '&PREHOOK_ibygrk',
+ 'mp3d'			=> '&PREHOOK_mp3d',
  'skb'			=> '&PREHOOK_flatten1',
  'suftesi'		=> '&PREHOOK_flatten1',
  'vhistory'		=> '&PREHOOK_vhistory',
@@ -1682,6 +1684,7 @@ $standardmp = '\.mp$';
  'hatching',	'[^e].mp',	# no htchuse.mp
  'latexmp',	'latexmp.mp',
  'mpattern',	'mpattern.mp',	# don't install test.mp
+ 'mp3d',	'^(3d|ani)',	# not examples
  'mpman-ru',	'NULL',		# doc package
  'pdfslide',	'NULL',		# no meta.mp
  'polski',	'NULL',		# no sample-*.mp
@@ -3969,8 +3972,7 @@ sub MAKEphonetic
   &donormal ("nosetup");
 }
 
-sub MAKEpict2e
-{
+sub MAKEpict2e {
  &setup;
  chdir("$DEST/doc/$whichdocformat/$package");
    &setup;
@@ -3995,8 +3997,7 @@ sub MAKEpict2e
 }
 
 
-sub MAKEpictex
-{
+sub MAKEpictex {
  &setup;
  chdir ($DOCDIR) || die "chdir($DOCDIR) failed: $!";
  &SYSTEM("rm -rf mathspic");  # separate package
@@ -4006,40 +4007,34 @@ sub MAKEpictex
 
 
 
-sub PREHOOK_cals
-{
+sub PREHOOK_cals {
   print "PREHOOK_$package - flatten only cals subdir\n";
   &SYSTEM ("$MV cals/* .");
 }
 
-sub PREHOOK_chess
-{
+sub PREHOOK_chess {
   print "PREHOOK_$package - no babel inputs\n";
   &SYSTEM ("$MV inputs/chess.sty .");
   &SYSTEM ("$RM -rf inputs pkfonts.zip");
 }
 
-sub PREHOOK_cm_super
-{
+sub PREHOOK_cm_super {
   print "PREHOOK_$package - remove dvipdfm map files\n";
   # We generate our own dvipdfm (not to mention pdftex) map files.
   &SYSTEM ("$RM -rf dvipdfm");
 }
 
-sub PREHOOK_fixme
-{
+sub PREHOOK_fixme {
   print "PREHOOK_$package - create dtx subdirs\n";
   &xmkdir ("themes", "layouts", "layouts/env", "layouts/target");
 }
 
-sub PREHOOK_flatten1
-{
+sub PREHOOK_flatten1 {
   print "PREHOOK_$package - move files up one level\n";
   &SYSTEM ("$MV */* .");
 }
 
-sub PREHOOK_ibygrk
-{
+sub PREHOOK_ibygrk {
   print "PREHOOK_$package - handle ibycus4.map\n";
   # ibygrk has two instances of the same file ibycus4.map; it is
   # both tex source and mf source.  the usual method cannot deal, of course.
@@ -4047,14 +4042,17 @@ sub PREHOOK_ibygrk
   &SYSTEM ("$RM tex/generic/ibycus4/ibycus4.map");
 }
 
-sub PREHOOK_vhistory
-{
+sub PREHOOK_mp3d {
+  print "PREHOOK_$package - rm 1.0\n";
+  &SYSTEM ("$RM -rf v1.0");
+}
+
+sub PREHOOK_vhistory {
   print "PREHOOK_$package - rm dup file\n";
   &SYSTEM ("$RM doc/sets.sty");
 }
 
-sub PREHOOK_wsuipa
-{
+sub PREHOOK_wsuipa {
   print "PREHOOK_$package - rearrange directories, except for doc\n";
   # we can't use flatten because we want to preserve the subdirs inside doc.
   # annoyingly, the same filenames are repeated.
diff --git a/Master/tlpkg/tlpsrc/mp3d.tlpsrc b/Master/tlpkg/tlpsrc/mp3d.tlpsrc
index 66b162d8280..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/mp3d.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mp3d.tlpsrc
@@ -1 +0,0 @@
-catalogue threed