Index: trunk/fink/main/finkinfo/macathena-libhesiod.patch
===================================================================
--- trunk/fink/main/finkinfo/macathena-libhesiod.patch (revision 44)
+++ trunk/fink/main/finkinfo/macathena-libhesiod.patch (revision 80)
@@ -29,2 +29,40 @@
  #include <netdb.h>
  #include <resolv.h>
+--- copyright.orig	2008-01-27 13:54:22.000000000 -0500
++++ copyright	2008-01-27 13:53:53.000000000 -0500
+@@ -0,0 +1,35 @@
++The Hesiod source code was obtained from 
++ftp://athena-dist.mit.edu/pub/ATHENA/hesiod, and is licensed as follows:
++
++  Copyright (c) 1996 by Internet Software Consortium.
++  
++  Permission to use, copy, modify, and distribute this software for any
++  purpose with or without fee is hereby granted, provided that the above
++  copyright notice and this permission notice appear in all copies.
++  
++  THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
++  ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
++  OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
++  CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
++  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
++  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
++  ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++  SOFTWARE.
++  
++  Copyright 1996, 2000 by the Massachusetts Institute of Technology.
++  
++  Permission to use, copy, modify, and distribute this
++  software and its documentation for any purpose and without
++  fee is hereby granted, provided that the above copyright
++  notice appear in all copies and that both that copyright
++  notice and this permission notice appear in supporting
++  documentation, and that the name of M.I.T. not be used in
++  advertising or publicity pertaining to distribution of the
++  software without specific, written prior permission.
++  M.I.T. makes no representations about the suitability of
++  this software for any purpose.  It is provided "as is"
++  without express or implied warranty.
++
++This fink package was created as part of the MacAthena Project 
++<http://macathena.mit.edu/> of the MIT Student Information Processing
++Board, and is released to the public domain.
Index: trunk/fink/main/finkinfo/macathena-moira.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-moira.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-moira.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-moira
 Version: 20080116
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/moira-%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -32,3 +32,6 @@
 	mv %i/share/man/man1/chfn.1 %i/share/man/man1/chfn.moira.1
 	mv %i/share/man/man1/chsh.1 %i/share/man/man1/chsh.moira.1
+	
+	%b/mkinstalldirs %i/share/doc/%n
+	cat %b/include/mit-copyright.h | python -c "import sys; print ''.join(sys.stdin.readlines()[2:-2])" >%i/share/doc/%n/copyright
 <<
Index: trunk/fink/main/finkinfo/macathena-libxj.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-libxj.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-libxj.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-libxj
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/libxj-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -9,5 +9,5 @@
 Source-MD5: 2a65781fb7171c82b78f7ca4aa213604
 
-BuildDepends: automake1.9
+BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 CompileScript: <<
@@ -20,3 +20,6 @@
 InstallScript: <<
 	make install prefix=%i
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
 <<
Index: trunk/fink/main/finkinfo/macathena-machtype.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-machtype.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-machtype.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-machtype
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/machtype-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -10,5 +10,5 @@
 
 Depends: macathena-base
-BuildDepends: fink (>= 0.24.12), automake1.9
+BuildDepends: fink (>= 0.24.12), automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 PatchFile: %n.patch
@@ -22,2 +22,8 @@
 	make
 <<
+InstallScript: <<
+	make install prefix=%i
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
+<<
Index: trunk/fink/main/finkinfo/macathena-base.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-base.info (revision 50)
+++ trunk/fink/main/finkinfo/macathena-base.info (revision 80)
@@ -1,6 +1,6 @@
 Package: macathena-base
-Version: 0.1
-Revision: 2
-Source: none
+Version: 76
+Revision: 1
+Source: http://macathena.mit.edu/dist/base-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
 HomePage: http://macathena.mit.edu/
@@ -11,4 +11,5 @@
 	/etc/athena/version and a dummy /etc/athena/reactivate
 <<
+Source-MD5: f2c007d98c970e84af9cd0c9c5a88df6
 
 BuildDepends: automake1.9
@@ -16,9 +17,12 @@
 <<
 InstallScript: <<
-	mkdir -p %d/etc/athena
-	mkdir -p %d/usr
-	mkdir -p %d/bin
-	printf "MacAthena Workstation (darwin) Version 1.0 Sun Dec 23 23:07:38 EDT 2007" >%d/etc/athena/version
-	printf "#\!/bin/sh\n\necho \"/etc/athena/reactivate is not supported on MacAthena.\" >&2\n" >%d/etc/athena/reactivate
+	cp %p/share/automake-1.9/install-sh %b/
+	cp %p/share/automake-1.9/mkinstalldirs %b/
+	
+	%b/mkinstalldirs %d/etc/athena %d/usr %d/bin %i/share/macathena-base/ %i/share/doc/macathena-base/
+	%b/install-sh %b/version %b/reactivate %d/etc/athena/
+	%b/install-sh -m 644 %b/athena-copyright %i/share/macathena-base/
+	%b/install-sh -m 644 %b/copyright %i/share/doc/macathena-base/
+	
 	ln -s /usr %d/usr/athena
 	ln -s /bin %d/bin/athena
Index: trunk/fink/main/finkinfo/macathena-hesiod.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-hesiod.info (revision 44)
+++ trunk/fink/main/finkinfo/macathena-hesiod.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-hesiod
 Version: 3.1.0
-Revision: 1
+Revision: 2
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -10,2 +10,11 @@
 
 Depends: macathena-libhesiod
+PatchFile: %n.patch
+PatchFile-MD5: d1d16eb7a8cc4a7f14d4e6edd8c14aac
+PatchScript: patch -p0 < %{PatchFile}
+InstallScript: <<
+	make install prefix=%i
+	
+	mkdir -p %i/share/doc/%n/
+	cp %b/copyright %i/share/doc/%n/
+<<
Index: trunk/fink/main/finkinfo/macathena-athdir.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-athdir.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-athdir.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-athdir
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/athdir-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -13,5 +13,5 @@
 
 Depends: macathena-libathdir
-BuildDepends: automake1.9
+BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 CompileScript: <<
@@ -22,2 +22,8 @@
 	make
 <<
+InstallScript: <<
+	make install prefix=%i
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
+<<
Index: trunk/fink/main/finkinfo/macathena-attachandrun.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-attachandrun.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-attachandrun.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-attachandrun
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/attachandrun-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -15,5 +15,5 @@
 
 Depends: macathena-attach
-BuildDepends: automake1.9
+BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 CompileScript: <<
@@ -28,3 +28,6 @@
 	mkdir -p %d/bin
 	ln -s %p/bin/attachandrun %d/bin/attachandrun
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
 <<
Index: trunk/fink/main/finkinfo/macathena-hesiod.patch
===================================================================
--- trunk/fink/main/finkinfo/macathena-hesiod.patch (revision 80)
+++ trunk/fink/main/finkinfo/macathena-hesiod.patch (revision 80)
@@ -0,0 +1,23 @@
+--- copyright.orig	2008-01-27 13:59:15.000000000 -0500
++++ copyright	2008-01-27 13:59:10.000000000 -0500
+@@ -0,0 +1,20 @@
++The source code for this package was obtained from
++ftp://athena-dist.mit.edu/pub/ATHENA/hesiod, and is licensed as follows:
++
++  Copyright 1988, 1996 by the Massachusetts Institute of Technology.
++  
++  Permission to use, copy, modify, and distribute this
++  software and its documentation for any purpose and without
++  fee is hereby granted, provided that the above copyright
++  notice appear in all copies and that both that copyright
++  notice and this permission notice appear in supporting
++  documentation, and that the name of M.I.T. not be used in
++  advertising or publicity pertaining to distribution of the
++  software without specific, written prior permission.
++  M.I.T. makes no representations about the suitability of
++  this software for any purpose.  It is provided "as is"
++  without express or implied warranty.
++
++This fink package was created as part of the MacAthena Project 
++<http://macathena.mit.edu/> of the MIT Student Information Processing
++Board, and is released to the public domain.
Index: trunk/fink/main/finkinfo/macathena-getcluster.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-getcluster.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-getcluster.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-getcluster
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/getcluster-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -17,5 +17,5 @@
 
 Depends: macathena-libhesiod
-BuildDepends: automake1.9
+BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 CompileScript: <<
@@ -28,3 +28,6 @@
 InstallScript: <<
 	make install prefix=%i
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
 <<
Index: trunk/fink/main/finkinfo/macathena-update.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-update.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-update.info (revision 80)
@@ -1,11 +1,11 @@
 Package: macathena-update
-Version: 63
+Version: 78
 Revision: 1
 Source: http://macathena.mit.edu/dist/update-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
 HomePage: http://macathena.mit.edu/
-License: BSD
+License: Public Domain
 Description: Update MacAthena packages
-Source-MD5: 69cbfebb95889f68669b2c8db2bf2916
+Source-MD5: 908e375ad7c401d1fb1beed9bfa05987
 
 PatchScript: sed -i ".bak" -e 's|@FINKPREFIX@|%p|g' macathena-update
@@ -14,4 +14,6 @@
 InstallScript: <<
 	mkdir -p %i/bin/
-	cp macathena-update %i/bin/
+	mkdir -p %i/share/doc/%n/
+	cp %b/macathena-update %i/bin/
+	cp %b/copyright %i/share/doc/%n/
 <<
Index: trunk/fink/main/finkinfo/macathena-athinfo.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-athinfo.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-athinfo.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-athinfo
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/athinfo-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -16,5 +16,5 @@
 Source-MD5: 12043897f54c0c7a955b0600175ac6bb
 
-BuildDepends: automake1.9
+BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 CompileScript: <<
@@ -25,2 +25,8 @@
 	make
 <<
+InstallScript: <<
+	make install prefix=%i
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
+<<
Index: trunk/fink/main/finkinfo/macathena-add.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-add.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-add.info (revision 80)
@@ -1,4 +1,4 @@
 Package: macathena-add
-Version: 72
+Version: 78
 Revision: 1
 Source: http://macathena.mit.edu/dist/add-svn%v.tar.gz
@@ -7,5 +7,5 @@
 License: BSD
 Description: Add a locker to the path
-Source-MD5: cb829cf009c4558fbfa8f4141f7939de
+Source-MD5: 60be60923f19ce270f83682243a1c5bf
 
 Depends: macathena-athdir, python25, pyhesiodfs
@@ -15,5 +15,6 @@
 <<
 InstallScript: <<
-	mkdir -p %i/lib/python2.5/site-packages
+	mkdir -p %i/lib/python2.5/site-packages %i/share/doc/%n/
 	python2.5 setup.py install --root=%d
+	cp %b/copyright %i/share/doc/%n/
 <<
Index: trunk/fink/main/finkinfo/pyhesiodfs.info
===================================================================
--- trunk/fink/main/finkinfo/pyhesiodfs.info (revision 75)
+++ trunk/fink/main/finkinfo/pyhesiodfs.info (revision 80)
@@ -1,5 +1,5 @@
 Package: pyhesiodfs
-Version: 53
-Revision: 2
+Version: 77
+Revision: 1
 Source: http://macathena.mit.edu/dist/%n-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -7,17 +7,20 @@
 License: GPL
 Description: Automatically mounts AFS lockers in /mit
-Source-MD5: c578c79ead4e2d1c7867edd66f6194d4
+Source-MD5: 2d321c4c4fadb67025aff9eb57e02d5f
 
 Depends: fuse-py25, pydns-py25
+BuildDepends: automake1.9
+PatchScript: sed -i ".bak" -e 's|/usr/local|%p|g' edu.mit.sipb.mit-automounter.plist
 CompileScript: <<
-	autoconf
-	./configure %c
 	python2.5 setup.py build
 <<
 InstallScript: <<
-	mkdir %d/mit
-	mkdir -p %d/bin
-	mkdir -p %i/lib/python2.5/site-packages
+	cp %p/share/automake-1.9/install-sh %b/
+	cp %p/share/automake-1.9/mkinstalldirs %b/
+	
+	%b/mkinstalldirs %d/mit %d/bin %i/lib/python2.5/site-packages %i
 	python2.5 setup.py install --root=%d
+	
+	%b/install-sh -m 644 COPYING copyright %i/share/doc/pyhesiodfs/
 <<
 PostInstScript: <<
Index: trunk/fink/main/finkinfo/macathena-athrun.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-athrun.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-athrun.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-athrun
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/athrun-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -15,5 +15,5 @@
 
 Depends: macathena-attachandrun
-BuildDepends: automake1.9
+BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 CompileScript: <<
@@ -28,3 +28,6 @@
 	mkdir -p %d/bin
 	ln -s %p/bin/athrun %d/bin/athrun
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
 <<
Index: trunk/fink/main/finkinfo/macathena-libhesiod.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-libhesiod.info (revision 44)
+++ trunk/fink/main/finkinfo/macathena-libhesiod.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-libhesiod
 Version: 3.1.0
-Revision: 1
+Revision: 2
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -12,5 +12,11 @@
 UpdateConfigGuess: true
 PatchFile: %n.patch
-PatchFile-MD5: 30652536d14b645113e3126e380dbbf3
+PatchFile-MD5: 45c91d60be7876e6d3a7fa00f8a4fc55
 PatchScript: patch -p0 < %{PatchFile}
 ConfigureParams: LIBS=-lresolv
+InstallScript: <<
+	make install prefix=%i
+	
+	mkdir -p %i/share/doc/%n/
+	cp %b/copyright %i/share/doc/%n/
+<<
Index: trunk/fink/main/finkinfo/macathena-libathdir.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-libathdir.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-libathdir.info (revision 80)
@@ -1,5 +1,5 @@
 Package: macathena-libathdir
 Version: 22699
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/libathdir-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -12,5 +12,5 @@
 Source-MD5: 270130665f1075650735187a459c11d3
 
-BuildDepends: automake1.9
+BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
 CompileScript: <<
@@ -21,2 +21,8 @@
 	make
 <<
+InstallScript: <<
+	make install prefix=%i
+	
+	%b/mkinstalldirs %i/share/doc/%n/
+	cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright
+<<
Index: trunk/fink/main/finkinfo/macathena-attach.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-attach.info (revision 74)
+++ trunk/fink/main/finkinfo/macathena-attach.info (revision 80)
@@ -1,4 +1,4 @@
 Package: macathena-attach
-Version: 57
+Version: 78
 Revision: 2
 Source: http://macathena.mit.edu/dist/attach-svn%v.tar.gz
@@ -7,5 +7,5 @@
 License: BSD
 Description: Mimic the functionality of Athena's attach
-Source-MD5: 551ce7b88a7fbb90ccfa9cdb394c5e95
+Source-MD5: 96b0fd698e653c9f2a169a6c1845e18b
 
 Depends: macathena-add, python25, pyhesiodfs
@@ -14,7 +14,9 @@
 <<
 InstallScript: <<
-	mkdir -p %i/lib/python2.5/site-packages
+	mkdir -p %i/lib/python2.5/site-packages %d/bin %i/share/doc/%n/
+	
 	python2.5 setup.py install --root=%d
-	mkdir -p %d/bin
+	
 	ln -s %p/bin/attach %d/bin/attach
+	cp %b/copyright %i/share/doc/%n/
 <<