Index: /trunk/fink/main/finkinfo/macathena-base.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-base.info (revision 81) +++ /trunk/fink/main/finkinfo/macathena-base.info (revision 121) @@ -1,5 +1,5 @@ Package: macathena-base Version: 76 -Revision: 1 +Revision: 3 Source: http://macathena.mit.edu/dist/base-svn%v.tar.gz Maintainer: SIPB MacAthena Project @@ -21,6 +21,6 @@ cp %p/share/automake-1.9/mkinstalldirs %b/ - %b/mkinstalldirs %d/etc/athena %d/usr %d/bin %i/share/%n/ - %b/install-sh %b/version %b/reactivate %d/etc/athena/ + %b/mkinstalldirs %d/private/etc/athena %d/usr %d/bin %i/share/%n/ + %b/install-sh %b/version %b/reactivate %d/private/etc/athena/ %b/install-sh -m 644 %b/athena-copyright %i/share/%n/ Index: /trunk/fink/main/finkinfo/macathena-libgms.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-libgms.info (revision 84) +++ /trunk/fink/main/finkinfo/macathena-libgms.info (revision 121) @@ -6,5 +6,5 @@ HomePage: http://macathena.mit.edu/ License: BSD -Description: A library for the global Athena message service +Description: Global Athena message service library DescDetail: << A library used by the global Athena message service Index: /trunk/fink/main/finkinfo/macathena-basic.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-basic.info (revision 102) +++ /trunk/fink/main/finkinfo/macathena-basic.info (revision 121) @@ -6,5 +6,5 @@ HomePage: http://macathena.mit.edu/ License: Public Domain -Description: Metapackage providing basic MacAthena software +Description: Metapackage for basic MacAthena software Depends: macathena-athrun, macathena-moira, macathena-pyhesiodfs, macathena-ssl-certificates, macathena-update Index: /trunk/fink/main/finkinfo/e2fsprogs-libs.info =================================================================== --- /trunk/fink/main/finkinfo/e2fsprogs-libs.info (revision 84) +++ /trunk/fink/main/finkinfo/e2fsprogs-libs.info (revision 121) @@ -11,5 +11,5 @@ Depends: libss (= %v-%r), libcomerr (= %v-%r), libblkid (= %v-%r), libuuid (= %v-%r) - +BuildDepends: fink (>= 0.24.12) PatchFile: %n.patch PatchFile-MD5: 7f934a671ac597defa64fc5866be68cb Index: /trunk/fink/main/finkinfo/macathena-standard.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-standard.info (revision 118) +++ /trunk/fink/main/finkinfo/macathena-standard.info (revision 121) @@ -6,5 +6,5 @@ HomePage: http://macathena.mit.edu/ License: Public Domain -Description: Metapackage providing MacAthena standard environment +Description: MacAthena standard environment metapackage Depends: macathena-basic, macathena-athinfo, macathena-config, macathena-delete, macathena-discuss, macathena-getcluster, macathena-just, macathena-libgms, macathena-libxj, macathena-machtype, macathena-tellme, macathena-update Index: /trunk/fink/main/finkinfo/macathena-config.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-config.info (revision 118) +++ /trunk/fink/main/finkinfo/macathena-config.info (revision 121) @@ -6,5 +6,5 @@ HomePage: http://macathena.mit.edu/ License: Public Domain -Description: Meta-package of MacAthena configuration packages +Description: Metapackage for MacAthena configuration Depends: macathena-afs-config Index: /trunk/fink/main/finkinfo/macathena-libxj.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-libxj.info (revision 84) +++ /trunk/fink/main/finkinfo/macathena-libxj.info (revision 121) @@ -6,5 +6,5 @@ HomePage: http://macathena.mit.edu/ License: BSD -Description: Widget library used by many Athena programs. +Description: Widget library used by many Athena programs Source-MD5: 2a65781fb7171c82b78f7ca4aa213604 DocFiles: athena-copyright Index: /trunk/fink/main/finkinfo/macathena-hesiod.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-hesiod.info (revision 84) +++ /trunk/fink/main/finkinfo/macathena-hesiod.info (revision 121) @@ -1,5 +1,5 @@ Package: macathena-hesiod Version: 3.1.0 -Revision: 2 +Revision: 3 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-%v.tar.gz Maintainer: SIPB MacAthena Project @@ -15,2 +15,7 @@ PatchFile-MD5: d1d16eb7a8cc4a7f14d4e6edd8c14aac PatchScript: patch -p0 < %{PatchFile} +InstallScript: << + make install prefix=%i + mkdir -p %i/share/ + mv %i/man %i/share/man +<< Index: /trunk/fink/main/finkinfo/macathena-afs-config.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-afs-config.info (revision 117) +++ /trunk/fink/main/finkinfo/macathena-afs-config.info (revision 121) @@ -1,5 +1,5 @@ Package: macathena-afs-config Version: 116 -Revision: 1s +Revision: 2 Source: http://macathena.mit.edu/dist/afs-config-svn%v.tar.gz Maintainer: SIPB MacAthena Project @@ -16,22 +16,20 @@ << InstallScript: << - mkdir -p %d/var/db/openafs/etc/config/ - cp CellAlias.macathena %d/var/db/openafs/etc/ - cp CellServDB.macathena %d/var/db/openafs/etc/ - cp ThisCell.macathena %d/var/db/openafs/etc/ - cp afs.conf.macathena %d/var/db/openafs/etc/config/ - cp settings.plist.macathena %d/var/db/openafs/etc/config/ + mkdir -p %d/private/var/db/openafs/etc/config/ + cp CellAlias.macathena %d/private/var/db/openafs/etc/ + cp CellServDB.macathena %d/private/var/db/openafs/etc/ + cp ThisCell.macathena %d/private/var/db/openafs/etc/ + cp afs.conf.macathena %d/private/var/db/openafs/etc/config/ + cp settings.plist.macathena %d/private/var/db/openafs/etc/config/ << PostInstScript: << - #!/bin/bash - source %p/share/macathena-config-common/divert.sh package=%n - divert_link /var/db/openafs/etc/CellAlias - divert_link /var/db/openafs/etc/CellServDB - divert_link /var/db/openafs/etc/ThisCell - divert_link /var/db/openafs/etc/config/afs.conf - divert_link /var/db/openafs/etc/config/settings.plist + divert_link /private/var/db/openafs/etc/CellAlias + divert_link /private/var/db/openafs/etc/CellServDB + divert_link /private/var/db/openafs/etc/ThisCell + divert_link /private/var/db/openafs/etc/config/afs.conf + divert_link /private/var/db/openafs/etc/config/settings.plist /Library/StartupItems/OpenAFS/OpenAFS restart @@ -40,13 +38,12 @@ << PreRmScript: << - #!/bin/bash source %p/share/macathena-config-common/divert.sh package=%n - undivert_unlink /var/db/openafs/etc/CellAlias - undivert_unlink /var/db/openafs/etc/CellServDB - undivert_unlink /var/db/openafs/etc/ThisCell - undivert_unlink /var/db/openafs/etc/config/afs.conf - undivert_unlink /var/db/openafs/etc/config/settings.plist + undivert_unlink /private/var/db/openafs/etc/CellAlias + undivert_unlink /private/var/db/openafs/etc/CellServDB + undivert_unlink /private/var/db/openafs/etc/ThisCell + undivert_unlink /private/var/db/openafs/etc/config/afs.conf + undivert_unlink /private/var/db/openafs/etc/config/settings.plist /Library/StartupItems/OpenAFS/OpenAFS restart Index: /trunk/fink/main/finkinfo/macathena-pyhesiodfs.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-pyhesiodfs.info (revision 102) +++ /trunk/fink/main/finkinfo/macathena-pyhesiodfs.info (revision 121) @@ -1,5 +1,5 @@ Package: macathena-pyhesiodfs Version: 77 -Revision: 2 +Revision: 3 Source: http://macathena.mit.edu/dist/pyhesiodfs-svn%v.tar.gz Maintainer: SIPB MacAthena Project @@ -21,5 +21,5 @@ cp %p/share/automake-1.9/mkinstalldirs %b/ - %b/mkinstalldirs %d/mit %d/bin %i/lib/python2.5/site-packages %i + %b/mkinstalldirs %d/mit %i/bin %i/lib/python2.5/site-packages %i python2.5 setup.py install --root=%d << Index: /trunk/fink/main/finkinfo/macathena-discuss.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-discuss.info (revision 84) +++ /trunk/fink/main/finkinfo/macathena-discuss.info (revision 121) @@ -6,5 +6,5 @@ HomePage: http://macathena.mit.edu/ License: BSD -Description: A conferencing and mail archiving system +Description: Conferencing and mail archiving system DescDetail: << Discuss is a user-interface front end to a networked conferencing Index: /trunk/fink/main/finkinfo/macathena-afs-conf-patch.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-afs-conf-patch.info (revision 110) +++ /trunk/fink/main/finkinfo/macathena-afs-conf-patch.info (revision 121) @@ -1,5 +1,5 @@ Package: macathena-afs-conf-patch Version: 109 -Revision: 1 +Revision: 2 Source: http://macathena.mit.edu/dist/afs-conf-patch-svn%v.tar.gz Maintainer: SIPB MacAthena Project @@ -15,5 +15,4 @@ << PostInstScript: << - #!/bin/bash if [ ! -e /var/db/openafs/etc/config/afs.conf ]; then printf "\n\n== ERROR: ==\n" Index: /trunk/fink/main/finkinfo/macathena-libhesiod.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-libhesiod.info (revision 81) +++ /trunk/fink/main/finkinfo/macathena-libhesiod.info (revision 121) @@ -1,5 +1,5 @@ Package: macathena-libhesiod Version: 3.1.0 -Revision: 2 +Revision: 3 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%v.tar.gz Maintainer: SIPB MacAthena Project @@ -16,2 +16,7 @@ PatchScript: patch -p0 < %{PatchFile} ConfigureParams: LIBS=-lresolv +InstallScript: << + make install prefix=%i + mkdir -p %i/share/ + mv %i/man %i/share/man +<< Index: /trunk/fink/main/finkinfo/macathena-delete.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-delete.info (revision 84) +++ /trunk/fink/main/finkinfo/macathena-delete.info (revision 121) @@ -6,5 +6,5 @@ HomePage: http://macathena.mit.edu/ License: BSD -Description: A friendlier version of rm for Athena +Description: Athena's friendlier version of rm DescDetail: << The delete utility marks files and directories for later permanent Index: /trunk/fink/main/finkinfo/macathena-ssl-certificates.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-ssl-certificates.info (revision 95) +++ /trunk/fink/main/finkinfo/macathena-ssl-certificates.info (revision 121) @@ -22,10 +22,10 @@ << PostInstScript: << - #!/bin/bash - if [ "$(/usr/bin/sw_vers -productVersion | cut -d. -f1-2)" == "10.5" ] + VERSION=`/usr/bin/sw_vers -productVersion | cut -d. -f1-2` + if [ "$VERSION" == "10.5" ] then security find-certificate -e "MIT Certification Authority" || security add-trusted-cert -d -k /Library/Keychains/System.keychain %p/share/%n/mitCA.pem else - security add-cert -k /System/Library/Keychains/X509Anchors %p/share/%n/mitCA.der || : + security find-certificate -e "MIT Certification Authority" /Library/Keychains/System.keychain /System/Library/Keychains/X509Anchors || security add-cert -k /System/Library/Keychains/X509Anchors %p/share/%n/mitCA.der fi <<