From owner-freebsd-ports Mon Nov 13 4:20:25 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0E5C237B4D7 for ; Mon, 13 Nov 2000 04:20:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id EAA90287; Mon, 13 Nov 2000 04:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A5C137B4CF; Mon, 13 Nov 2000 04:12:57 -0800 (PST) Message-Id: <20001113121257.6A5C137B4CF@hub.freebsd.org> Date: Mon, 13 Nov 2000 04:12:57 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/22813: Update port: ftp/moxftp Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22813 >Category: ports >Synopsis: Update port: ftp/moxftp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 13 04:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Fix MASTER_SITES - Support CFLAGS propely New file: files/patch-ag files/patch-ah files/patch-ai files/patch-aj Remove file: files/patch-af >How-To-Repeat: >Fix: diff -urN /usr/ports/ftp/moxftp/Makefile ftp/moxftp/Makefile --- /usr/ports/ftp/moxftp/Makefile Wed Nov 8 21:27:31 2000 +++ ftp/moxftp/Makefile Sat Nov 11 09:30:27 2000 @@ -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 diff -urN /usr/ports/ftp/moxftp/files/patch-ab ftp/moxftp/files/patch-ab --- /usr/ports/ftp/moxftp/files/patch-ab Thu Dec 29 22:04:33 1994 +++ ftp/moxftp/files/patch-ab Sat Nov 11 08:26:53 2000 @@ -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 -urN /usr/ports/ftp/moxftp/files/patch-ac ftp/moxftp/files/patch-ac --- /usr/ports/ftp/moxftp/files/patch-ac Thu Dec 29 22:04:34 1994 +++ ftp/moxftp/files/patch-ac Sat Nov 11 03:56:48 2000 @@ -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 - #include - #ifdef R5 -- #include - #include - #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 + #include + #ifdef R5 +-#include + #include + #endif /*R5*/ + diff -urN /usr/ports/ftp/moxftp/files/patch-ad ftp/moxftp/files/patch-ad --- /usr/ports/ftp/moxftp/files/patch-ad Sat Dec 12 10:48:39 1998 +++ ftp/moxftp/files/patch-ad Sat Nov 11 03:58:42 2000 @@ -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 -urN /usr/ports/ftp/moxftp/files/patch-ae ftp/moxftp/files/patch-ae --- /usr/ports/ftp/moxftp/files/patch-ae Wed Oct 4 08:15:23 1995 +++ ftp/moxftp/files/patch-ae Sat Nov 11 03:57:03 2000 @@ -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 -urN /usr/ports/ftp/moxftp/files/patch-af ftp/moxftp/files/patch-af --- /usr/ports/ftp/moxftp/files/patch-af Mon Aug 30 00:32:39 1999 +++ ftp/moxftp/files/patch-af Thu Jan 1 09:00:00 1970 @@ -1,115 +0,0 @@ ---- ListSWP.h~ Fri Oct 11 11:03:57 1996 -+++ ListSWP.h Fri Oct 11 11:04:21 1996 -@@ -69,7 +69,7 @@ - - #if defined(MOTIF) - #include --#if XmREVISION==2 -+#if XmVERSION==2 - #include - #endif - #endif ---- List.c.~ Fri May 20 15:10:09 1994 -+++ List.c Fri Aug 27 18:57:06 1999 -@@ -53,6 +53,6 @@ - - * 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 - #include --#if XmREVISION==2 -+#if XmVERSION==2 - #include - #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 - } ---- LabelQUICK.c~ Fri Oct 11 11:11:04 1996 -+++ LabelQUICK.c Fri Oct 11 11:11:46 1996 -@@ -40,7 +40,7 @@ - #if defined(MOTIF) - #include - #include --#if XmREVISION==2 -+#if XmVERSION==2 - #include - #endif - #endif ---- LabelQUICKP.h~ Fri Oct 11 11:12:00 1996 -+++ LabelQUICKP.h Fri Oct 11 11:12:12 1996 -@@ -49,7 +49,7 @@ - - #if defined(MOTIF) - #include --#if XmREVISION==2 -+#if XmVERSION==2 - #include - #endif - #endif diff -urN /usr/ports/ftp/moxftp/files/patch-ag ftp/moxftp/files/patch-ag --- /usr/ports/ftp/moxftp/files/patch-ag Thu Jan 1 09:00:00 1970 +++ ftp/moxftp/files/patch-ag Sat Nov 11 03:54:41 2000 @@ -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 + #include +-#if XmREVISION==2 ++#if XmVERSION==2 + #include + #endif + #endif diff -urN /usr/ports/ftp/moxftp/files/patch-ah ftp/moxftp/files/patch-ah --- /usr/ports/ftp/moxftp/files/patch-ah Thu Jan 1 09:00:00 1970 +++ ftp/moxftp/files/patch-ah Sat Nov 11 03:54:55 2000 @@ -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 +-#if XmREVISION==2 ++#if XmVERSION==2 + #include + #endif + #endif diff -urN /usr/ports/ftp/moxftp/files/patch-ai ftp/moxftp/files/patch-ai --- /usr/ports/ftp/moxftp/files/patch-ai Thu Jan 1 09:00:00 1970 +++ ftp/moxftp/files/patch-ai Sat Nov 11 03:55:09 2000 @@ -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 + #include +-#if XmREVISION==2 ++#if XmVERSION==2 + #include + #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 -urN /usr/ports/ftp/moxftp/files/patch-aj ftp/moxftp/files/patch-aj --- /usr/ports/ftp/moxftp/files/patch-aj Thu Jan 1 09:00:00 1970 +++ ftp/moxftp/files/patch-aj Sat Nov 11 03:55:26 2000 @@ -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 +-#if XmREVISION==2 ++#if XmVERSION==2 + #include + #endif + #endif >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message