diff options
Diffstat (limited to 'ftp/moxftp')
| -rw-r--r-- | ftp/moxftp/Makefile | 19 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-ab | 30 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-ac | 22 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-ad | 13 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-ae | 30 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-ag | 11 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-ah | 11 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-ai | 83 | ||||
| -rw-r--r-- | ftp/moxftp/files/patch-aj | 11 |
9 files changed, 171 insertions, 59 deletions
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile index da22eadb1b0b..918357bf0dad 100644 --- a/ftp/moxftp/Makefile +++ b/ftp/moxftp/Makefile @@ -8,32 +8,31 @@ PORTNAME= moxftp PORTVERSION= 2.2 CATEGORIES= ftp -MASTER_SITES= ftp://metalab.unc.edu/pub/X11/contrib/applications/ \ - ftp://ftp.inria.fr/X/contrib-R5/applications/ \ - ftp://ftp.tk.mesh.ad.jp/pub/X/contrib/applications/ +MASTER_SITES= ftp://ftp.ibiblio.org/pub/X11/contrib/applications/ \ + ftp://ftp.inria.fr/X/contrib-R5/applications/ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org -GNU_CONFIGURE= yes USE_X_PREFIX= yes +GNU_CONFIGURE= yes MAN1= ${PROGRAM_NAME}.1 PLIST_SUB= PROGRAM_NAME=${PROGRAM_NAME} RESOURCE_NAME=${RESOURCE_NAME} -STRIP= +STRIP= # empty .if !defined(WANT_ATHENA_VERSION) USE_MOTIF= yes CONFIGURE_ARGS= motif -PROGRAM_NAME=mftp -RESOURCE_NAME=Mftp +PROGRAM_NAME= mftp +RESOURCE_NAME= Mftp .else CONFIGURE_ARGS= athena -PROGRAM_NAME=xftp -RESOURCE_NAME=Xftp +PROGRAM_NAME= xftp +RESOURCE_NAME= Xftp .endif post-install: @strip ${PREFIX}/bin/${PROGRAM_NAME} - @${INSTALL_MAN} ${WRKSRC}/${PROGRAM_NAME}.man ${PREFIX}/man/man1/${PROGRAM_NAME}.1 + ${INSTALL_MAN} ${WRKSRC}/${PROGRAM_NAME}.man ${MANPREFIX}/man/man1/${PROGRAM_NAME}.1 .include <bsd.port.mk> diff --git a/ftp/moxftp/files/patch-ab b/ftp/moxftp/files/patch-ab index 34981ecdea1f..08f61146e8fa 100644 --- a/ftp/moxftp/files/patch-ab +++ b/ftp/moxftp/files/patch-ab @@ -1,16 +1,14 @@ -*** popen.c.orig Tue Dec 20 17:22:12 1994 ---- popen.c Tue Dec 20 17:22:51 1994 -*************** -*** 117,127 **** - } - (void) close(pdes[1]); - } -- #if defined(SVR4)||defined(HAVE_UNISTD_H)||!defined(BSD) -- setpgrp(); -- #else - setpgrp(0, getpid()); -- #endif - execl("/bin/sh", "sh", "-c", program, NULL); - _exit(127); - /* NOTREACHED */ ---- 117,123 ---- +--- popen.c.orig Sat May 21 05:40:23 1994 ++++ popen.c Sat Nov 11 08:26:42 2000 +@@ -117,11 +117,7 @@ + } + (void) close(pdes[1]); + } +-#if defined(SVR4)||defined(HAVE_UNISTD_H)||!defined(BSD) +- setpgrp(); +-#else + setpgrp(0, getpid()); +-#endif + execl("/bin/sh", "sh", "-c", program, NULL); + _exit(127); + /* NOTREACHED */ diff --git a/ftp/moxftp/files/patch-ac b/ftp/moxftp/files/patch-ac index c75611280b78..3783272c4be5 100644 --- a/ftp/moxftp/files/patch-ac +++ b/ftp/moxftp/files/patch-ac @@ -1,12 +1,10 @@ -*** X11/Xp/XpAthena.h.orig Tue Dec 20 17:59:12 1994 ---- X11/Xp/XpAthena.h Tue Dec 20 18:00:14 1994 -*************** -*** 43,49 **** - #include <X11/Xaw3d/StripChart.h> - #include <X11/Xaw3d/Text.h> - #ifdef R5 -- #include <X11/Xaw3d/Mailbox.h> - #include <X11/Xaw3d/Panner.h> - #endif /*R5*/ - ---- 43,48 ---- +--- X11/Xp/XpAthena.h.orig Fri May 6 06:05:58 1994 ++++ X11/Xp/XpAthena.h Sat Nov 11 03:53:49 2000 +@@ -43,7 +43,6 @@ + #include <X11/Xaw3d/StripChart.h> + #include <X11/Xaw3d/Text.h> + #ifdef R5 +-#include <X11/Xaw3d/Mailbox.h> + #include <X11/Xaw3d/Panner.h> + #endif /*R5*/ + diff --git a/ftp/moxftp/files/patch-ad b/ftp/moxftp/files/patch-ad index e11778ea031d..e1687e730906 100644 --- a/ftp/moxftp/files/patch-ad +++ b/ftp/moxftp/files/patch-ad @@ -1,5 +1,5 @@ ---- configure.orig Mon Mar 21 16:43:36 1994 -+++ configure Fri Dec 11 20:36:18 1998 +--- configure.orig Tue Mar 22 06:43:36 1994 ++++ configure Sat Nov 11 03:58:32 2000 @@ -165,7 +165,7 @@ ANAME=Mftp TYPE="-DMOTIF" @@ -27,3 +27,12 @@ else if test "x${HP_X11}" != "x" && test -f "${x_libraries}/${HP_X11}/libXmu.a" ; then +@@ -1078,7 +1078,7 @@ + DEFS="$DEFS -Wf,-XNl4096" + fi + +-OPT=" -O " ++OPT=" ${CFLAGS} " + # + # Are we a HP macine + # diff --git a/ftp/moxftp/files/patch-ae b/ftp/moxftp/files/patch-ae index 381e8030b4df..a8df8e1aa494 100644 --- a/ftp/moxftp/files/patch-ae +++ b/ftp/moxftp/files/patch-ae @@ -1,19 +1,11 @@ -*** oldarchie.c Mon Oct 2 14:02:08 1995 ---- archie.c Mon Oct 2 14:09:28 1995 -*************** -*** 163,169 **** - char *host; - int i; - -! archie = lpopen("type archie", "r"); - if (fgets(string, sizeof(string), archie) != NULL) { - if ((cp = bsdstrstr(string, "not found")) != NULL) { - lpclose(archie); ---- 163,169 ---- - char *host; - int i; - -! archie = lpopen("which archie", "r"); - if (fgets(string, sizeof(string), archie) != NULL) { - if ((cp = bsdstrstr(string, "not found")) != NULL) { - lpclose(archie); +--- archie.c.orig Sat May 21 05:11:43 1994 ++++ archie.c Sat Nov 11 03:53:49 2000 +@@ -160,7 +160,7 @@ + char *host; + int i; + +- archie = lpopen("type archie", "r"); ++ archie = lpopen("which archie", "r"); + if (fgets(string, sizeof(string), archie) != NULL) { + if ((cp = bsdstrstr(string, "not found")) != NULL) { + lpclose(archie); diff --git a/ftp/moxftp/files/patch-ag b/ftp/moxftp/files/patch-ag new file mode 100644 index 000000000000..a6f9fd5a12f8 --- /dev/null +++ b/ftp/moxftp/files/patch-ag @@ -0,0 +1,11 @@ +--- LabelQUICK.c.orig Sat May 21 05:09:24 1994 ++++ LabelQUICK.c Sat Nov 11 03:53:50 2000 +@@ -40,7 +40,7 @@ + #if defined(MOTIF) + #include <Xm/XmP.h> + #include <Xm/Xm.h> +-#if XmREVISION==2 ++#if XmVERSION==2 + #include <Xm/PrimitiveP.h> + #endif + #endif diff --git a/ftp/moxftp/files/patch-ah b/ftp/moxftp/files/patch-ah new file mode 100644 index 000000000000..156adf2eea12 --- /dev/null +++ b/ftp/moxftp/files/patch-ah @@ -0,0 +1,11 @@ +--- LabelQUICKP.h.orig Tue Mar 15 03:58:19 1994 ++++ LabelQUICKP.h Sat Nov 11 03:53:50 2000 +@@ -49,7 +49,7 @@ + + #if defined(MOTIF) + #include <Xm/XmP.h> +-#if XmREVISION==2 ++#if XmVERSION==2 + #include <Xm/PrimitiveP.h> + #endif + #endif diff --git a/ftp/moxftp/files/patch-ai b/ftp/moxftp/files/patch-ai new file mode 100644 index 000000000000..93a9bd53e843 --- /dev/null +++ b/ftp/moxftp/files/patch-ai @@ -0,0 +1,83 @@ +--- List.c.orig Sat May 21 05:10:09 1994 ++++ List.c Sat Nov 11 03:53:50 2000 +@@ -52,7 +52,7 @@ + + /* $Log: List.c,v $ + * Revision 1.2 1994/03/21 21:30:28 jones +- * Use XmREVISION instead of XmUPDATE_LEVEL. ++ * Use XmVERSION instead of XmUPDATE_LEVEL. + * + * Revision 1.1 1994/03/14 18:55:53 jones + * Initial revision +@@ -93,7 +93,7 @@ + #if defined(MOTIF) + #include <Xm/XmP.h> + #include <Xm/Xm.h> +-#if XmREVISION==2 ++#if XmVERSION==2 + #include <Xm/PrimitiveP.h> + #endif + #endif +@@ -339,8 +339,8 @@ + #endif + #if defined(MOTIF) + { +-#if defined(XmREVISION) +-#if XmREVISION>=2&&defined(XmInheritBorderHighlight) ++#if defined(XmVERSION) ++#if XmVERSION>=2&&defined(XmInheritBorderHighlight) + XmInheritBorderHighlight, /* border_highlight */ + XmInheritBorderUnhighlight, /* border_unhighlight */ + #else +@@ -402,10 +402,10 @@ + String * params; + Cardinal *num_params; + { +-#if XmREVISION==1 ++#if XmVERSION==1 && !defined(LESSTIF_REVISION) && LESSTIF_REVISION<88 + _XmPrimitiveFocusIn((XmPrimitiveWidget)w, (XEvent*)event); + #endif +-#if XmREVISION==2 ++#if XmVERSION==2 + _XmPrimitiveFocusIn((XmPrimitiveWidget)w, (XEvent*)event, NULL, 0); + #endif + } +@@ -417,10 +417,10 @@ + String * params; + Cardinal *num_params; + { +-#if XmREVISION==1 ++#if XmVERSION==1 && !defined(LESSTIF_REVISION) && LESSTIF_REVISION<88 + _XmPrimitiveFocusOut((XmPrimitiveWidget)w, event); + #endif +-#if XmREVISION==2 ++#if XmVERSION==2 + _XmPrimitiveFocusOut((XmPrimitiveWidget)w, event, NULL, 0); + #endif + } +@@ -433,10 +433,10 @@ + Cardinal *num_params; + { + XmProcessTraversal(w, XmTRAVERSE_CURRENT); +-#if XmREVISION==1 ++#if XmVERSION==1 && !defined(LESSTIF_REVISION) && LESSTIF_REVISION<88 + _XmPrimitiveEnter((XmPrimitiveWidget)w, (XEvent*)event); + #endif +-#if XmREVISION==2 ++#if XmVERSION==2 + _XmPrimitiveEnter((XmPrimitiveWidget)w, (XEvent*)event, NULL, 0); + #endif + } +@@ -448,10 +448,10 @@ + String * params; + Cardinal *num_params; + { +-#if XmREVISION==1 ++#if XmVERSION==1 && !defined(LESSTIF_REVISION) && LESSTIF_REVISION<88 + _XmPrimitiveLeave((XmPrimitiveWidget)w, (XEvent*)event); + #endif +-#if XmREVISION==2 ++#if XmVERSION==2 + _XmPrimitiveLeave((XmPrimitiveWidget)w, (XEvent*)event, NULL, 0); + #endif + } diff --git a/ftp/moxftp/files/patch-aj b/ftp/moxftp/files/patch-aj new file mode 100644 index 000000000000..aef6a15b0298 --- /dev/null +++ b/ftp/moxftp/files/patch-aj @@ -0,0 +1,11 @@ +--- ListSWP.h.orig Tue Mar 15 03:58:20 1994 ++++ ListSWP.h Sat Nov 11 03:53:50 2000 +@@ -69,7 +69,7 @@ + + #if defined(MOTIF) + #include <Xm/XmP.h> +-#if XmREVISION==2 ++#if XmVERSION==2 + #include <Xm/ManagerP.h> + #endif + #endif |