Date: Sun, 13 Feb 2000 18:07:14 +0100 (CET) From: Alexander Langer <alex@cichlids.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16701: update ftp/downloader to 1.11 Message-ID: <200002131707.SAA09606@cichlids.cichlids.com>
next in thread | raw e-mail | index | archive | help
>Number: 16701 >Category: ports >Synopsis: update ftp/downloader to 1.11 >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: Sun Feb 13 09:10:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Alexander Langer >Release: FreeBSD 4.0-CURRENT i386 >Organization: This space is intentionally left blank. >Environment: n/a >Description: Update Port to version 1.11 Since we are not allowed to patch the sources (license), I removed all the patches the maintainer added (some menuitem stuff). Others of our fixes have been integrated by the author himself. So, all of the patch-files are gone, except patch-aa and patch-ae. patch-aa patches the Makefile, which we are allowed to patch (not covered by the license :) patch-ae includes sys/param.h in the main.cc file, since this is needed for the #ifdef BSD things. This does not add any functionality, so I think this should be ok. imura put the distfile on his site and supplied the PLIST. >How-To-Repeat: >Fix: diff -ru /usr/ports/ftp/downloader/Makefile downloader/Makefile --- /usr/ports/ftp/downloader/Makefile Fri Dec 31 21:16:28 1999 +++ downloader/Makefile Sun Feb 13 17:58:15 2000 @@ -6,15 +6,19 @@ # $FreeBSD: ports/ftp/downloader/Makefile,v 1.9 1999/12/31 20:16:28 steve Exp $ # -DISTNAME= nt-1.07.1 -PKGNAME= downloader-1.07.1 +DISTNAME= nt-1.11 +PKGNAME= downloader-1.11 CATEGORIES= ftp -MASTER_SITES= http://www.krasu.ru/soft/chuchelo/files/ +MASTER_SITES= ftp://ftp.server51.freshmeat.net/pub/d4x/ \ + ftp://ftp.lonyay.edu.hu/pub/software/nt/ \ + http://people.FreeBSD.org/~imura/distfiles/ MAINTAINER= ijliao@csie.nctu.edu.tw LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/${DISTNAME}/main + +CFLAGS= -pedantic .include <bsd.port.mk> diff -ru /usr/ports/ftp/downloader/files/md5 downloader/files/md5 --- /usr/ports/ftp/downloader/files/md5 Fri Dec 31 21:16:34 1999 +++ downloader/files/md5 Sun Feb 13 12:39:46 2000 @@ -1 +1 @@ -MD5 (nt-1.07.1.tar.gz) = 85b8152bd1cf7186533cf23c527239b5 +MD5 (nt-1.11.tar.gz) = 6d76906c39e156704ec85670411ad715 diff -ru /usr/ports/ftp/downloader/patches/patch-aa downloader/patches/patch-aa --- /usr/ports/ftp/downloader/patches/patch-aa Sun Feb 13 02:49:16 2000 +++ downloader/patches/patch-aa Sun Feb 13 18:00:45 2000 @@ -1,24 +1,26 @@ -diff -ru ./Makefile ../../nt-1.07.1/main/Makefile ---- ./Makefile Wed Nov 3 05:20:49 1999 -+++ ../../nt-1.07.1/main/Makefile Thu Nov 25 22:18:21 1999 -@@ -1,13 +1,13 @@ --CC = gcc --CCPLUS = c++ -+CC = $(CC) -+CCPLUS = $(CXX) +--- Makefile.orig Sat Jan 29 05:02:17 2000 ++++ Makefile Sun Feb 13 13:18:26 2000 +@@ -1,21 +1,15 @@ +-CXX = c++ NLS=-DENABLE_NLS # Remove or comment this line to disable gettext +-ifeq ($(DEST),) -DEST=/usr/local -+DEST=$(PREFIX) +-endif ++DEST?=$(PREFIX) LOCALEDIR=$(DEST)/share/locale --LIBS=-lpthread --CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS --GTKLIBS=`gtk-config --libs` --GTKFLAGS=`gtk-config --cflags` -+GTKLIBS=`gtk12-config --libs` -+GTKFLAGS=`gtk12-config --cflags` -+LIBS=-pthread -+CFLAGS+=-Wall -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS + PTHREAD=-lpthread +-GTKCONFIG=gtk-config + GLIBCONFIG=glib-config - EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" + #next strings were added for BSD support +-ifeq ($(OSTYPE),BSD) + PTHREAD=-pthread + GTKCONFIG=gtk12-config +-endif +-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ++CFLAGS+=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS + GTKLIBS=`$(GTKCONFIG) --libs` + GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags` + LIBS=$(PTHREAD) $(GTKLIBS) Only in /usr/ports/ftp/downloader/patches: patch-ab Only in /usr/ports/ftp/downloader/patches: patch-ac Only in /usr/ports/ftp/downloader/patches: patch-ad diff -ru /usr/ports/ftp/downloader/patches/patch-ae downloader/patches/patch-ae --- /usr/ports/ftp/downloader/patches/patch-ae Fri Dec 31 21:16:36 1999 +++ downloader/patches/patch-ae Sun Feb 13 14:12:55 2000 @@ -1,40 +1,10 @@ -diff -ru ./main.cc ../../nt-1.07.1/main/main.cc ---- ./main.cc Thu Nov 4 10:28:18 1999 -+++ ../../nt-1.07.1/main/main.cc Thu Nov 25 22:18:21 1999 -@@ -9,11 +9,20 @@ - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ +--- 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> #include <sys/stat.h> #include <sys/ipc.h> -+#if (defined(BSD) && (BSD >= 199306)) -+#include <sys/msgbuf.h> -+#include <sys/time.h> -+#else - #include <sys/msg.h> - #include <sys/timeb.h> -+#endif - #include <unistd.h> - #include <fcntl.h> - #include <stdio.h> -@@ -865,9 +874,15 @@ - }; - - unsigned int tMain::get_precise_time(){ -+#if (defined(BSD) && (BSD >= 199306)) -+ struct timeval tp; -+ gettimeofday(&tp, NULL); -+ return(tp.tv_sec*1000+tp.tv_usec); -+#else - struct timeb tp; - ftime(&tp); - return(tp.time*1000+tp.millitm); -+#endif - }; ++#include <sys/param.h> - void tMain::speed() { + #if (defined(BSD) && (BSD >= 199306)) + #include <sys/msgbuf.h> Only in /usr/ports/ftp/downloader/patches: patch-af Only in /usr/ports/ftp/downloader/patches: patch-ag Only in /usr/ports/ftp/downloader/patches: patch-ah Only in /usr/ports/ftp/downloader/patches: patch-ai Only in /usr/ports/ftp/downloader/patches: patch-aj Only in /usr/ports/ftp/downloader/patches: patch-ak Only in /usr/ports/ftp/downloader/patches: patch-al Only in /usr/ports/ftp/downloader/patches: patch-am Only in /usr/ports/ftp/downloader/patches: patch-an Only in /usr/ports/ftp/downloader/patches: patch-ao Only in /usr/ports/ftp/downloader/pkg: CVS diff -ru /usr/ports/ftp/downloader/pkg/PLIST downloader/pkg/PLIST --- /usr/ports/ftp/downloader/pkg/PLIST Fri Dec 31 21:16:39 1999 +++ downloader/pkg/PLIST Sun Feb 13 17:57:50 2000 @@ -1,5 +1,6 @@ bin/nt share/locale/bg/LC_MESSAGES/nt.mo +share/locale/cs/LC_MESSAGES/nt.mo share/locale/de/LC_MESSAGES/nt.mo share/locale/es/LC_MESSAGES/nt.mo share/locale/fr/LC_MESSAGES/nt.mo @@ -9,4 +10,29 @@ share/locale/nl/LC_MESSAGES/nt.mo share/locale/pt_BR/LC_MESSAGES/nt.mo share/locale/ru/LC_MESSAGES/nt.mo -share/locale/zh_CN.EUC/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 >Release-Note: >Audit-Trail: >Unformatted: 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?200002131707.SAA09606>