Index: /trunk/fink/main/finkinfo/macathena-libxj.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-libxj.info (revision 80) +++ /trunk/fink/main/finkinfo/macathena-libxj.info (revision 84) @@ -8,8 +8,11 @@ Description: Widget library used by many Athena programs. Source-MD5: 2a65781fb7171c82b78f7ca4aa213604 +DocFiles: athena-copyright BuildDepends: automake1.9, macathena-base (>= 76-1) UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -18,8 +21,2 @@ 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-machtype.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-machtype.info (revision 80) +++ /trunk/fink/main/finkinfo/macathena-machtype.info (revision 84) @@ -8,4 +8,5 @@ Description: Print Athena machine type to standard output Source-MD5: f03f88e7ae085b16979d4ecd5a5f75d9 +DocFiles: athena-copyright Depends: macathena-base @@ -16,4 +17,6 @@ PatchScript: patch -p0 < %{PatchFile} CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -22,8 +25,2 @@ 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-hesiod.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-hesiod.info (revision 81) +++ /trunk/fink/main/finkinfo/macathena-hesiod.info (revision 84) @@ -11,4 +11,5 @@ Depends: macathena-libhesiod +BuildDepends: fink (>= 0.24.12) PatchFile: %n.patch PatchFile-MD5: d1d16eb7a8cc4a7f14d4e6edd8c14aac Index: /trunk/fink/main/finkinfo/macathena-athdir.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-athdir.info (revision 81) +++ /trunk/fink/main/finkinfo/macathena-athdir.info (revision 84) @@ -11,4 +11,5 @@ << Source-MD5: 88bbdd4a68d673a7bc8529b4ba9b04c2 +DocFiles: athena-copyright Depends: macathena-libathdir @@ -16,4 +17,6 @@ UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -22,8 +25,2 @@ 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 80) +++ /trunk/fink/main/finkinfo/macathena-attachandrun.info (revision 84) @@ -13,4 +13,5 @@ << Source-MD5: 9312e52dbd055c62861d9c5d0a076d9e +DocFiles: athena-copyright Depends: macathena-attach @@ -18,4 +19,6 @@ UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -28,6 +31,3 @@ 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-discuss.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-discuss.info (revision 84) +++ /trunk/fink/main/finkinfo/macathena-discuss.info (revision 84) @@ -0,0 +1,70 @@ +Package: macathena-discuss +Version: 22713 +Revision: 1 +Source: http://macathena.mit.edu/dist/discuss-svn%v.tar.gz +Maintainer: SIPB MacAthena Project +HomePage: http://macathena.mit.edu/ +License: BSD +Description: A conferencing and mail archiving system +DescDetail: << + Discuss is a user-interface front end to a networked conferencing + system. +<< +Source-MD5: 1739bec176df8f31b23ac56b98c71a50 +DocFiles: athena-copyright + +Depends: libss +BuildDepends: fink (>= 0.24.12), automake1.9, macathena-base (>= 76-1) +UpdateConfigGuess: true +PatchFile: %n.patch +PatchFile-MD5: dfd9f5a28f4a01ca59d2f8fb2e18e7a5 +ConfigureParams: --with-krb5 --with-ss=%p +CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + + cp %p/share/automake-1.9/install-sh %b/ + cp %p/share/automake-1.9/mkinstalldirs %b/ + autoconf + env TERM=vt100 ./configure %c + make +<< + +SplitOff: << + Package: macathena-discuss-server + DocFiles: athena-copyright + Depends: macathena-discuss + Files: bin/create_mtg_dir sbin/discussd sbin/disserve + DescPackaging: This package contains the discuss server. +<< +SplitOff2: << + Package: macathena-libdsk-dev + DocFiles: athena-copyright + Depends: macathena-libusp-dev + Files: include/discuss lib/libdsk.a + Description: Development files for discuss library + DescPackaging: << + This package contains libdsk headers and static libraries for + development. + << +<< +SplitOff3: << + Package: macathena-libusp-dev + DocFiles: athena-copyright + Files: include/usp lib/libusp.a + Description: Library files for Unified Stream Protocol + DescPackaging: << + This package contains libusp headers and static libraries for + development. + << +<< +SplitOff4: << + Package: macathena-discuss-emacs + DocFiles: athena-copyright + Depends: macathena-discuss + Recommends: emacsen + Files: share/emacs/site-lisp + Description: Emacs interface to discuss + DescPackaging: << + This package contains an Emacs interface to discuss. + << +<< Index: /trunk/fink/main/finkinfo/macathena-libgms.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-libgms.info (revision 83) +++ /trunk/fink/main/finkinfo/macathena-libgms.info (revision 84) @@ -13,4 +13,5 @@ << Source-MD5: ec1c32a06b11224f995c8c72029921f6 +DocFiles: athena-copyright BuildDepends: automake1.9, macathena-base (>= 76-1) @@ -18,4 +19,6 @@ PatchScript: sed -i ".bak" -e 's|/usr/tmp/.messages|%p/var/cache/macathena-libgms/messages|g' globalmessage.h CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -24,8 +27,2 @@ 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-getcluster.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-getcluster.info (revision 80) +++ /trunk/fink/main/finkinfo/macathena-getcluster.info (revision 84) @@ -15,4 +15,5 @@ << Source-MD5: 662aa267d3c555019007dac9b243a9b7 +DocFiles: athena-copyright Depends: macathena-libhesiod @@ -20,4 +21,6 @@ UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -26,8 +29,2 @@ 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-discuss.patch =================================================================== --- /trunk/fink/main/finkinfo/macathena-discuss.patch (revision 84) +++ /trunk/fink/main/finkinfo/macathena-discuss.patch (revision 84) @@ -0,0 +1,343 @@ +diff -ur discuss-svn22699/server/rpproc.c discuss-svn22699-orig/server/rpproc.c +--- discuss-svn22699-orig/server/rpproc.c 2008-01-28 23:27:37.000000000 -0500 ++++ discuss-svn22699/server/rpproc.c 2008-01-28 23:27:56.000000000 -0500 +@@ -116,7 +116,7 @@ + USPCardinal bt; + #endif + +- init_rpc_err_tbl(); ++ initialize_rpc_error_table(); + + #ifdef INETD + d = open ("/dev/null", 2); +@@ -485,7 +485,7 @@ + int i; + { + if (USP_put_long_integer(us, i) != SUCCESS) { +- rpc_err = errno + rpc_err_base; ++ rpc_err = errno + ERROR_TABLE_BASE_rpc; + } + } + +@@ -500,7 +500,7 @@ + if (str == NULL) + str = ""; + if (USP_put_string(us, str) != SUCCESS) { +- rpc_err = rpc_err_base + errno; ++ rpc_err = ERROR_TABLE_BASE_rpc + errno; + return; + } + } +@@ -514,7 +514,7 @@ + bool b; + { + if (USP_put_boolean(us, (USPBoolean)b) != SUCCESS) { +- rpc_err = rpc_err_base + errno; ++ rpc_err = ERROR_TABLE_BASE_rpc + errno; + return; + } + } +@@ -527,7 +527,7 @@ + sendreply() + { + if (USP_end_block(us) != SUCCESS) { +- rpc_err = rpc_err_base + errno; ++ rpc_err = ERROR_TABLE_BASE_rpc + errno; + return; + } + return; +@@ -542,7 +542,7 @@ + { + USP_begin_block(us,UNKNOWN_CALL); + if (USP_end_block(us) != SUCCESS) { +- rpc_err = rpc_err_base + errno; ++ rpc_err = ERROR_TABLE_BASE_rpc + errno; + return; + } + return; +diff -ur discuss-svn22699-orig/server/Makefile.in discuss-svn22699/client/Makefile.in +--- discuss-svn22699-orig/server/Makefile.in 2007-01-30 23:54:16.0000 +00000 -0500 ++++ discuss-svn22699/server/Makefile.in 2007-01-30 23:54:30.000000000 -0 +500 +@@ -41,7 +41,7 @@ + install: + ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} + ${INSTALL_PROGRAM} discussd ${DESTDIR}${sbindir} +- ${INSTALL} -o discuss -m 4755 disserve ${DESTDIR}${sbindir} ++ ${INSTALL} disserve ${DESTDIR}${sbindir} + + discussd: $(DISCUSSD_OBJS) + ${CC} ${LDFLAGS} -o $@ $(DISCUSSD_OBJS) ${LIBS} +diff -ur discuss-svn22699-orig/client/discuss.c discuss-svn22699/client/discuss.c +--- discuss-svn22699-orig/client/discuss.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/client/discuss.c 2008-01-28 22:51:10.000000000 -0500 +@@ -154,8 +154,8 @@ + ss_perror(sci_idx, code, INFO_DIR); + } + +- init_disc_err_tbl(); +- init_dsc_err_tbl(); ++ initialize_disc_error_table(); ++ initialize_dsc_error_table(); + + temp_file = malloc(64); + pgm = malloc(64); +diff -ur discuss-svn22699-orig/client/trn_expr.y discuss-svn22699/client/trn_expr.y +--- discuss-svn22699-orig/client/trn_expr.y 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/client/trn_expr.y 2008-01-28 22:10:42.000000000 -0500 +@@ -69,7 +69,7 @@ + * + */ + +-static yyerror(msg) ++yyerror(msg) + char *msg; + { + #ifdef lint +@@ -97,7 +97,7 @@ + return(1); + } + +-static yylex() ++yylex() + { + if (!*cp) return -1; + if(isdigit(*cp)) { +diff -ur discuss-svn22699-orig/edsc/edsc.c discuss-svn22699/edsc/edsc.c +--- discuss-svn22699-orig/edsc/edsc.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/edsc/edsc.c 2008-01-28 22:53:24.000000000 -0500 +@@ -122,7 +122,7 @@ + char *cp,*op,delim,*args; + struct rlimit limit; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + + temp_file = malloc(64); + pgm = malloc(64); +diff -ur discuss-svn22699-orig/include/config.h.sed discuss-svn22699/include/config.h.sed +--- discuss-svn22699-orig/include/config.h.sed 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/include/config.h.sed 2008-01-28 22:58:28.000000000 -0500 +@@ -53,7 +53,7 @@ + + /* Server to exec (assumed to be in SERVERDIR) */ + #ifndef SERVER +-#define SERVER "/usr/athena/etc/disserve" ++#define SERVER "SERVERDIR/disserve" + #endif + #ifndef SERVER_LOCAL + /* this one is path-searched if it doesn't begin with slash... */ +@@ -65,7 +65,7 @@ + + /* Info directory */ + #ifndef INFO_DIR +-#define INFO_DIR "/usr/athena/share/discuss/info" ++#define INFO_DIR "INFODIR" + #endif + + /* Name server / Kerberos realm */ +@@ -80,7 +80,7 @@ + + /* Place where dsmail can find dspipe */ + #ifndef DSPIPE +-#define DSPIPE "/usr/athena/bin/dspipe" ++#define DSPIPE "BINDIR/dspipe" + #endif + + /* dsc_setup command */ +diff -ur discuss-svn22699-orig/libds/auth_krb.c discuss-svn22699/libds/auth_krb.c +--- discuss-svn22699-orig/libds/auth_krb.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/libds/auth_krb.c 2008-01-28 22:51:35.000000000 -0500 +@@ -74,7 +74,7 @@ + exit(1); + } + +- init_krb_err_tbl(); ++ initialize_krb_error_table(); + + realmp = strchr (service_id, '@'); + if (realmp == NULL || realmp - service_id >= sizeof (serv)) { +@@ -131,7 +131,7 @@ + + static KTEXT_ST ticket; + +- init_krb_err_tbl(); ++ initialize_krb_error_table(); + + realmp = strchr (service_id, '@'); + if (realmp == NULL || realmp - service_id >= sizeof (serv)) { +@@ -159,7 +159,7 @@ + } else { + *authl = 0; + *authp = NULL; +- *result = rem + krb_err_base; ++ *result = rem + ERROR_TABLE_BASE_krb; + } + } + +diff -ur discuss-svn22699-orig/libds/rpcall.c discuss-svn22699/libds/rpcall.c +--- discuss-svn22699-orig/libds/rpcall.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/libds/rpcall.c 2008-01-28 22:52:31.000000000 -0500 +@@ -146,10 +146,10 @@ + + /* + * +- * sendfile(tf) -- Send a file in an RPC call. ++ * rpc_sendfile(tf) -- Send a file in an RPC call. + * + */ +-void sendfile(tf) ++void rpc_sendfile(tf) + tfile tf; + { + int tfs; +@@ -181,8 +181,8 @@ + */ + void init_rpc () + { +- init_rpc_err_tbl(); +- init_usp_err_tbl(); ++ initialize_rpc_error_table(); ++ initialize_usp_error_table(); + } + + /* +diff -ur discuss-svn22699-orig/libds/stubs.c discuss-svn22699/libds/stubs.c +--- discuss-svn22699-orig/libds/stubs.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/libds/stubs.c 2008-01-28 21:24:02.000000000 -0500 +@@ -51,7 +51,7 @@ + startsend(ADD_TRN); + if (rpc_err) { *result = rpc_err; return; } + sendstr(mtg_name); +- sendfile(source_file); ++ rpc_sendfile(source_file); + sendstr(subject); + sendint(reply_trn); + sendit(discuss); +@@ -85,7 +85,7 @@ + startsend(ADD_TRN2); + if (rpc_err) { *result = rpc_err; return; } + sendstr(mtg_name); +- sendfile(source_file); ++ rpc_sendfile(source_file); + sendstr(subject); + sendstr(signature); + sendint(reply_trn); +@@ -342,7 +342,7 @@ + if (rpc_err) { *result = rpc_err; return; } + sendstr(mtg_name); + sendint(trn); +- sendfile(dest_file); ++ rpc_sendfile(dest_file); + sendit(discuss); + if (rpc_err) { *result = rpc_err; return; } + recvdata(dest_file); +diff -ur discuss-svn22699-orig/mclient/crmtgs.c discuss-svn22699/mclient/crmtgs.c +--- discuss-svn22699-orig/mclient/crmtgs.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/mclient/crmtgs.c 2008-01-28 22:53:24.000000000 -0500 +@@ -37,7 +37,7 @@ + char **aliasv; + int naliases; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + + dsc_expand_mtg_set(NULL, "*", &set, &n_matches, &code); + +diff -ur discuss-svn22699-orig/mclient/dsmail.c discuss-svn22699/mclient/dsmail.c +--- discuss-svn22699-orig/mclient/dsmail.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/mclient/dsmail.c 2008-01-28 22:53:24.000000000 -0500 +@@ -89,7 +89,7 @@ + int i,ok_prev=0,iscont = 0, have_signature = 0, len, d; + char filename[60], signature[35], field_name[100]; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + + PRS(argc,argv); /* Parse args */ + +diff -ur discuss-svn22699-orig/mclient/dspipe.c discuss-svn22699/mclient/dspipe.c +--- discuss-svn22699-orig/mclient/dspipe.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/mclient/dspipe.c 2008-01-28 22:53:24.000000000 -0500 +@@ -44,7 +44,7 @@ + tfile tf; + int i,nread,d,exit_code; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + for (i = 1; i < argc; i++) { + if (*argv[i] == '-') + switch (argv[i][1]) { +diff -ur discuss-svn22699-orig/mclient/mkds.c discuss-svn22699/mclient/mkds.c +--- discuss-svn22699-orig/mclient/mkds.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/mclient/mkds.c 2008-01-28 22:53:24.000000000 -0500 +@@ -63,7 +63,7 @@ + tfile tf; + char hostname[256]; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + + nbsrc.user_id = malloc(132); + +diff -ur discuss-svn22699-orig/mclient/pmtg.c discuss-svn22699/mclient/pmtg.c +--- discuss-svn22699-orig/mclient/pmtg.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/mclient/pmtg.c 2008-01-28 22:53:24.000000000 -0500 +@@ -35,7 +35,7 @@ + tfile tfstdout; + char machine [50],mtg_name[100]; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + argc--; argv++; + if (argc != 1) + goto lusage; +diff -ur discuss-svn22699-orig/server/expunge.c discuss-svn22699/server/expunge.c +--- discuss-svn22699-orig/server/expunge.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/server/expunge.c 2008-01-28 22:53:24.000000000 -0500 +@@ -72,7 +72,7 @@ + static struct flock lock; + + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + + for (i = 1; i < argc; i++) { + if (*argv[i] == '-') switch (argv[i][1]) { +diff -ur discuss-svn22699-orig/server/expunge2.c discuss-svn22699/server/expunge2.c +--- discuss-svn22699-orig/server/expunge2.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/server/expunge2.c 2008-01-28 22:53:24.000000000 -0500 +@@ -55,7 +55,7 @@ + char control_name[256]; + int control_fd; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + + for (i = 1; i < argc; i++) { + if (*argv[i] == '-') switch (argv[i][1]) { +diff -ur discuss-svn22699-orig/server/recover.c discuss-svn22699/server/recover.c +--- discuss-svn22699-orig/server/recover.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/server/recover.c 2008-01-28 22:53:24.000000000 -0500 +@@ -101,7 +101,7 @@ + has_privs = TRUE; + use_zephyr = 0; + +- init_dsc_err_tbl(); ++ initialize_dsc_error_table(); + + for (i = 1; i < argc; i++) { + if (*argv[i] == '-') switch (argv[i][1]) { +diff -ur discuss-svn22699-orig/server/rpproc.c discuss-svn22699/server/rpproc.c +--- discuss-svn22699-orig/server/rpproc.c 2008-01-28 21:21:46.000000000 -0500 ++++ discuss-svn22699/server/rpproc.c 2008-01-28 22:53:24.000000000 -0500 +@@ -316,7 +316,7 @@ + result = krb_rd_req (&ticket, service, instance, haddr, &kdata, + filename); + if (result) { +- result += krb_err_base; ++ result += ERROR_TABLE_BASE_krb; + goto punt_kerberos; + } + #ifdef KERBEROS5 Index: /trunk/fink/main/finkinfo/e2fsprogs-libs.info =================================================================== --- /trunk/fink/main/finkinfo/e2fsprogs-libs.info (revision 83) +++ /trunk/fink/main/finkinfo/e2fsprogs-libs.info (revision 84) @@ -1,5 +1,5 @@ Package: e2fsprogs-libs Version: 1.40.4 -Revision: 1 +Revision: 2 Source: mirror:sourceforge:e2fsprogs/%n-%v.tar.gz Maintainer: Evan Broder @@ -11,4 +11,7 @@ Depends: libss (= %v-%r), libcomerr (= %v-%r), libblkid (= %v-%r), libuuid (= %v-%r) + +PatchFile: %n.patch +PatchFile-MD5: 7f934a671ac597defa64fc5866be68cb SplitOff: << Index: /trunk/fink/main/finkinfo/macathena-just.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-just.info (revision 83) +++ /trunk/fink/main/finkinfo/macathena-just.info (revision 84) @@ -8,8 +8,11 @@ Description: Simple text formatting utilities on Athena Source-MD5: 1a6e81a33ba97f1109ccdb7299c1a695 +DocFiles: athena-copyright BuildDepends: automake1.9, macathena-base (>= 76-1) UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -18,8 +21,2 @@ 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/e2fsprogs-libs.patch =================================================================== --- /trunk/fink/main/finkinfo/e2fsprogs-libs.patch (revision 84) +++ /trunk/fink/main/finkinfo/e2fsprogs-libs.patch (revision 84) @@ -0,0 +1,12 @@ +diff -ur e2fsprogs-libs-1.40.5-orig/lib/ss/Makefile.in e2fsprogs-libs-1.40.5/lib/ss/Makefile.in +--- e2fsprogs-libs-1.40.5-orig/lib/ss/Makefile.in 2008-01-28 21:01:43.000000000 -0500 ++++ e2fsprogs-libs-1.40.5/lib/ss/Makefile.in 2008-01-28 21:01:58.000000000 -0500 +@@ -28,7 +28,7 @@ + BSDLIB_INSTALL_DIR = $(root_libdir) + + TAGS=etags +-COMPILE_ET=../et/compile_et --build-tree ++COMPILE_ET=compile_et --build-tree + MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds + + # -I.. is so that ss/ss_err.h works Index: /trunk/fink/main/finkinfo/macathena-athinfo.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-athinfo.info (revision 80) +++ /trunk/fink/main/finkinfo/macathena-athinfo.info (revision 84) @@ -15,8 +15,11 @@ << Source-MD5: 12043897f54c0c7a955b0600175ac6bb +DocFiles: athena-copyright BuildDepends: automake1.9, macathena-base (>= 76-1) UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -25,8 +28,2 @@ 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-standard.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-standard.info (revision 66) +++ /trunk/fink/main/finkinfo/macathena-standard.info (revision 84) @@ -8,3 +8,3 @@ Description: Metapackage providing MacAthena standard environment -Depends: pyhesiodfs, macathena-athrun, macathena-getcluster, macathena-libxj, macathena-moira, macathena-machtype, macathena-athinfo, macathena-update +Depends: pyhesiodfs, macathena-athinfo, macathena-athrun, macathena-delete, macathena-discuss, macathena-getcluster, macathena-just, macathena-lilbgms, macathena-libxj, macathena-moira, macathena-machtype, macathena-update Index: /trunk/fink/main/finkinfo/macathena-athrun.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-athrun.info (revision 80) +++ /trunk/fink/main/finkinfo/macathena-athrun.info (revision 84) @@ -13,4 +13,5 @@ << Source-MD5: a7426af81c089db2b63a6336482a713c +DocFiles: athena-copyright Depends: macathena-attachandrun @@ -18,4 +19,6 @@ UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -28,6 +31,3 @@ 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-delete.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-delete.info (revision 83) +++ /trunk/fink/main/finkinfo/macathena-delete.info (revision 84) @@ -16,8 +16,11 @@ << Source-MD5: d7753f3b6735d5dd544ed05cf5d027dc +DocFiles: athena-copyright BuildDepends: automake1.9, macathena-base (>= 76-1) UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -26,8 +29,2 @@ 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-libathdir.info =================================================================== --- /trunk/fink/main/finkinfo/macathena-libathdir.info (revision 80) +++ /trunk/fink/main/finkinfo/macathena-libathdir.info (revision 84) @@ -11,8 +11,11 @@ << Source-MD5: 270130665f1075650735187a459c11d3 +DocFiles: athena-copyright BuildDepends: automake1.9, macathena-base (>= 76-1) UpdateConfigGuess: true CompileScript: << + cp %p/share/macathena-base/athena-copyright %b/ + cp %p/share/automake-1.9/install-sh %b/ cp %p/share/automake-1.9/mkinstalldirs %b/ @@ -21,8 +24,2 @@ make << -InstallScript: << - make install prefix=%i - - %b/mkinstalldirs %i/share/doc/%n/ - cp /sw/share/macathena-base/athena-copyright %i/share/doc/%n/copyright -<<