Date: Mon, 17 Apr 2000 04:00:03 -0700 (PDT) From: "KATO Tsuguru" <tkato@prontomail.ne.jp> To: freebsd-ports@FreeBSD.org Subject: Re: ports/18041: Update ftp/downloader to version 1.14 (supersedes ports/17229) Message-ID: <200004171100.EAA90432@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/18041; it has been noted by GNATS. From: "KATO Tsuguru" <tkato@prontomail.ne.jp> To: FreeBSD-gnats-submit@freebsd.org Cc: lioux@uol.com.br Subject: Re: ports/18041: Update ftp/downloader to version 1.14 (supersedes ports/17229) Date: Mon, 17 Apr 2000 19:59:03 +0900 > Didn't do anything new about the patches. Just updated them to the new > version. I suppose there is many point needed to touch up in current d4x port. Following patch has fixed them besides upgrading to the latest version. New patch: patches/patch-ap patches/patch-aq diff -urN /usr/ports/ftp/downloader/Makefile ftp/downloader/Makefile --- /usr/ports/ftp/downloader/Makefile Wed Apr 12 21:21:24 2000 +++ ftp/downloader/Makefile Wed Apr 12 21:22:18 2000 @@ -6,7 +6,7 @@ # PORTNAME= downloader -PORTVERSION= 1.11 +PORTVERSION= 1.14 CATEGORIES= ftp MASTER_SITES= ftp://ftp.server51.freshmeat.net/pub/d4x/ \ ftp://ftp.lonyay.edu.hu/pub/software/nt/ \ @@ -17,8 +17,10 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + WRKSRC= ${WRKDIR}/${DISTNAME}/main -CFLAGS= -pedantic +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff -urN /usr/ports/ftp/downloader/files/md5 ftp/downloader/files/md5 --- /usr/ports/ftp/downloader/files/md5 Mon Feb 21 01:08:13 2000 +++ ftp/downloader/files/md5 Sat Apr 8 21:00:00 2000 @@ -1 +1 @@ -MD5 (nt-1.11.tar.gz) = 6d76906c39e156704ec85670411ad715 +MD5 (nt-1.14.tar.gz) = 0e7d9f4bc82c47b8a8f400c62c7f1e28 diff -urN /usr/ports/ftp/downloader/patches/patch-aa ftp/downloader/patches/patch-aa --- /usr/ports/ftp/downloader/patches/patch-aa Mon Feb 21 01:08:14 2000 +++ ftp/downloader/patches/patch-aa Sat Apr 8 21:00:00 2000 @@ -1,26 +1,67 @@ ---- Makefile.orig Sat Jan 29 05:02:17 2000 -+++ Makefile Sun Feb 13 13:18:26 2000 -@@ -1,21 +1,15 @@ +--- Makefile.orig Thu Mar 30 17:41:31 2000 ++++ Makefile Sat Apr 8 21:00:00 2000 +@@ -1,34 +1,20 @@ -CXX = c++ ++CXX ?= c++ NLS=-DENABLE_NLS # Remove or comment this line to disable gettext -ifeq ($(DEST),) -DEST=/usr/local -endif -+DEST?=$(PREFIX) ++DEST=${PREFIX} LOCALEDIR=$(DEST)/share/locale - PTHREAD=-lpthread +-PTHREAD=-lpthread -GTKCONFIG=gtk-config - GLIBCONFIG=glib-config +-GLIBCONFIG=glib-config +-MAKE=make #next strings were added for BSD support -ifeq ($(OSTYPE),BSD) PTHREAD=-pthread - GTKCONFIG=gtk12-config +-GTKCONFIG=gtk12-config +-MAKE=gmake -endif ++GTKCONFIG=${GTK_CONFIG} ++MAKE?=gmake +-ifeq ($(OSTYPE),FreeBSD) +-PTHREAD=-pthread +-GTKCONFIG=gtk12-config +-MAKE=gmake +-endif +- -CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -+CFLAGS+=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ++CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS GTKLIBS=`$(GTKCONFIG) --libs` - GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags` +-GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags` ++GTKFLAGS=`$(GTKCONFIG) --cflags` LIBS=$(PTHREAD) $(GTKLIBS) + +-EXECC=$(CXX) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" ++EXECC=$(CXX) $(CXXFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" + + MODULES=base64.o addr.o queue.o liststr.o dlist.o mdlist.o locstr.o log.o sort.o meter.o socket.o history.o hproxy.o speed.o srvclt.o html.o + MODULES2=client.o ftp.o http.o download.o ftpd.o httpd.o signal.o main.o config.o savelog.o mainlog.o \ +@@ -42,9 +28,8 @@ + rm -f nt || test -z "" + $(MAKE) nt + if [ "$(NLS)" != "" ] ; then \ +- cd po && make ; \ ++ cd po && $(MAKE) all; \ + fi +- $(MAKE) strip + + nt:nt.cc $(MODULES) $(MODULES2) var.h + cd face && NLS=$(NLS) EXECC="$(EXECC)" GTKFLAGS="$(GTKFLAGS)" $(MAKE) +@@ -55,9 +40,9 @@ + + + install: all +- install -c -m755 nt $(DEST)/bin ++ ${BSD_INSTALL_PROGRAM} nt $(DEST)/bin + if [ "$(NLS)" != "" ] ; then \ +- cd po && LOCALEDIR=$(LOCALEDIR) make install; \ ++ cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install; \ + fi + + main.o: main.cc main.h var.h diff -urN /usr/ports/ftp/downloader/patches/patch-ae ftp/downloader/patches/patch-ae --- /usr/ports/ftp/downloader/patches/patch-ae Mon Feb 21 01:08:15 2000 +++ ftp/downloader/patches/patch-ae Sat Apr 8 21:00:00 2000 @@ -1,10 +1,21 @@ ---- main.cc.orig Thu Jan 27 05:29:34 2000 -+++ main.cc Sun Feb 13 14:12:44 2000 -@@ -12,6 +12,7 @@ - #include <sys/types.h> +--- main.cc.orig Thu Mar 30 15:50:11 2000 ++++ main.cc Sat Apr 8 21:00:00 2000 +@@ -13,14 +13,14 @@ #include <sys/stat.h> #include <sys/ipc.h> -+#include <sys/param.h> ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ #if (defined(BSD) && (BSD >= 199306)) #include <sys/msgbuf.h> + #else + #include <sys/msg.h> +-#endif +- +-#if (defined(__unix__) || defined(unix)) && !defined(USG) +-#include <sys/param.h> + #endif + + #include <sys/timeb.h> diff -urN /usr/ports/ftp/downloader/patches/patch-ap ftp/downloader/patches/patch-ap --- /usr/ports/ftp/downloader/patches/patch-ap Thu Jan 1 09:00:00 1970 +++ ftp/downloader/patches/patch-ap Sat Apr 8 21:00:00 2000 @@ -0,0 +1,16 @@ +--- srvclt.cc.orig Tue Mar 28 11:34:36 2000 ++++ srvclt.cc Sat Apr 8 21:00:00 2000 +@@ -27,6 +27,13 @@ + typedef int socklen_t; + #endif + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if __FreeBSD_version <= 340000 ++typedef int socklen_t; ++#endif ++#endif ++ + void *server_thread_run(void *what){ + tMsgServer *srv=(tMsgServer *)what; + srv->init(); diff -urN /usr/ports/ftp/downloader/patches/patch-aq ftp/downloader/patches/patch-aq --- /usr/ports/ftp/downloader/patches/patch-aq Thu Jan 1 09:00:00 1970 +++ ftp/downloader/patches/patch-aq Sat Apr 8 21:00:00 2000 @@ -0,0 +1,13 @@ +--- po/Makefile.orig Tue Jan 11 11:28:32 2000 ++++ po/Makefile Fri Feb 25 05:51:40 2000 +@@ -5,8 +5,8 @@ + + install: + for i in `ls *.gmo` ; do \ +- mkdirhier $(LOCALEDIR)/`echo $$i|sed -e s/.gmo//`/LC_MESSAGES;\ +- install -c -m644 $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/nt.mo ; \ ++ mkdir -p $(LOCALEDIR)/`echo $$i|sed -e s/.gmo//`/LC_MESSAGES;\ ++ ${BSD_INSTALL_DATA} $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/nt.mo ; \ + done + + uninstall: diff -urN /usr/ports/ftp/downloader/pkg/PLIST ftp/downloader/pkg/PLIST --- /usr/ports/ftp/downloader/pkg/PLIST Mon Feb 21 01:08:19 2000 +++ ftp/downloader/pkg/PLIST Sat Apr 8 21:00:00 2000 @@ -2,8 +2,10 @@ share/locale/bg/LC_MESSAGES/nt.mo share/locale/cs/LC_MESSAGES/nt.mo share/locale/de/LC_MESSAGES/nt.mo +share/locale/el_GR/LC_MESSAGES/nt.mo share/locale/es/LC_MESSAGES/nt.mo share/locale/fr/LC_MESSAGES/nt.mo +share/locale/hu/LC_MESSAGES/nt.mo share/locale/id/LC_MESSAGES/nt.mo share/locale/it/LC_MESSAGES/nt.mo share/locale/ja/LC_MESSAGES/nt.mo @@ -11,28 +13,3 @@ share/locale/pt_BR/LC_MESSAGES/nt.mo share/locale/ru/LC_MESSAGES/nt.mo share/locale/zh_CN.GBK/LC_MESSAGES/nt.mo -@unexec rmdir %D/share/locale/zh_CN.GBK/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN.GBK 2>/dev/null || true -@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ru 2>/dev/null || true -@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true -@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nl 2>/dev/null || true -@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ja 2>/dev/null || true -@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it 2>/dev/null || true -@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/id 2>/dev/null || true -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/es 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bg 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -- KATO Tsuguru / tkato@prontomail.ne.jp Sent by Japanese ProntoMail To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200004171100.EAA90432>