Date: Thu, 2 Nov 2000 19:10:27 +0300 (MSK) From: andrew@chg.ru To: FreeBSD-gnats-submit@freebsd.org Subject: ports/22544: upgrade port: ftp/downloader to 1.20pre Message-ID: <200011021610.eA2GART18788@leeloo.ropnet.ru>
next in thread | raw e-mail | index | archive | help
>Number: 22544 >Category: ports >Synopsis: upgrade port: ftp/downloader to 1.20pre >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: Thu Nov 02 08:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Andrew L. Neporada >Release: FreeBSD 4.1.1-STABLE i386 >Organization: >Environment: >Description: update downloader to 1.20pre new files: patch-ab >How-To-Repeat: >Fix: diff -ruN downloader.orig/Makefile downloader/Makefile --- downloader.orig/Makefile Thu Oct 5 20:46:42 2000 +++ downloader/Makefile Sun Oct 29 02:02:56 2000 @@ -6,12 +6,12 @@ # PORTNAME= downloader -PORTVERSION= 1.19 +PORTVERSION= 1.20.p CATEGORIES= ftp MASTER_SITES= http://www.krasu.ru/soft/chuchelo/files/ \ ftp://ftp.server51.freshmeat.net/pub/d4x/ \ ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/ -DISTNAME= nt-${PORTVERSION} +DISTNAME= nt-1.20pre MAINTAINER= andrew@chg.ru diff -ruN downloader.orig/distinfo downloader/distinfo --- downloader.orig/distinfo Tue Aug 29 19:42:08 2000 +++ downloader/distinfo Sun Oct 29 02:51:16 2000 @@ -1 +1 @@ -MD5 (nt-1.19.tar.gz) = b15e66607521abd47f07a991c34eb895 +MD5 (nt-1.20pre.tar.gz) = b60fa51a498c38dc4565a840eb48518b diff -ruN downloader.orig/files/patch-aa downloader/files/patch-aa --- downloader.orig/files/patch-aa Thu Oct 5 10:36:12 2000 +++ downloader/files/patch-aa Sun Oct 29 03:17:52 2000 @@ -1,9 +1,19 @@ ---- Makefile.orig Sat Aug 26 10:16:05 2000 -+++ Makefile Mon Aug 28 20:07:43 2000 -@@ -1,39 +1,19 @@ --CXXFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS --# -ggdb +--- Makefile.orig Sun Oct 29 02:34:33 2000 ++++ Makefile Sun Oct 29 02:36:32 2000 +@@ -1,103 +1,44 @@ +-# Solaris Openwin 2.6 headers are not properly casted to for +-# compilation with C++/g++. Three files Xlib.h, Xresource.h, Xutil.h +-# need to be fixed to compile this. Or add a path to the X11R6 headers +-ifeq ($(OSTYPE),Solaris) +-SOLARIS_TYPECASTED_X11_HEADERS=-I/var/tmp/src +-endif +-ifndef CXXFLAGS +-CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS) +-endif +- +-CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS) -# -DDEBUG_ALL +-# -ggdb +CXXFLAGS += -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -export CXXFLAGS LOCALEDIR @@ -25,32 +35,47 @@ - -#next strings were added for BSD support -ifeq ($(OSTYPE),BSD) --PTHREAD=-pthread + PTHREAD=-pthread -GTKCONFIG=gtk12-config -MAKE=gmake -endif -- ++MSGFMT=${MSGFMT_CMD} + -ifeq ($(OSTYPE),FreeBSD) - PTHREAD=-pthread +-PTHREAD=-pthread -GTKCONFIG=gtk12-config -MAKE=gmake -endif -+MSGFMT=${MSGFMT_CMD} - +- -GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs) -GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags) +- +-ifeq ($(OSTYPE),Irix) +-CTKFLIBS += lintl +-MAKE=gmake +-CXXFLAGS += -fpermissive +-endif +GTKLIBS=`${GTK_CONFIG} --libs` +GTKFLAGS=`${GTK_CONFIG} --cflags` - LDFLAGS=$(PTHREAD) $(GTKLIBS) ++LDFLAGS=$(PTHREAD) $(GTKLIBS) + +-LDFLAGS=$(PTHREAD) $(GTKLIBS) -CXXFLAGS += $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" -+ +EXECC=$(CXX) $(CXXFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" FACE=face/lmenu.o face/list.o face/addd.o face/graph.o face/log.o \ face/prefs.o face/buttons.o face/about.o face/edit.o \ -@@ -47,40 +27,18 @@ + face/colors.o face/saveload.o face/limface.o face/misc.o \ + face/lod.o face/columns.o face/dndtrash.o face/passface.o \ + face/mywidget.o +-MODULES1=base64.o addr.o queue.o liststr.o dlist.o mdlist.o locstr.o \ ++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 speed.o srvclt.o html.o \ + client.o ftp.o http.o download.o ftpd.o httpd.o hproxy.o signal.o \ + main.o config.o savelog.o mainlog.o var.o sortstr.o db.o cookie.o \ pass.o eff.o - MODULES += $(FACE) +-MODULES = $(FACE) $(MODULES1) ++MODULES += $(FACE) -all: - -rm -f nt @@ -90,7 +115,7 @@ - $(MAKE) uninstall -C po - -Makefile.dep: -- $(CXX) $(CXXFLAGS) -MM *.cc > Makefile.dep +- $(CXX) -I./ -Iface $(CXXFLAGS) -MM *.cc > Makefile.dep + $(BSD_INSTALL_PROGRAM) nt $(DEST)/bin + [ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install diff -ruN downloader.orig/files/patch-ab downloader/files/patch-ab --- downloader.orig/files/patch-ab Thu Jan 1 03:00:00 1970 +++ downloader/files/patch-ab Sun Oct 29 03:21:47 2000 @@ -0,0 +1,17 @@ +--- speed.cc.orig Sun Oct 29 03:19:48 2000 ++++ speed.cc Sun Oct 29 03:20:05 2000 +@@ -25,8 +25,12 @@ + pthread_mutexattr_init(&ma); + #if !defined (__sparc__) && !defined(__mips__) + pthread_mutexattr_settype(&ma,MUTEX_TYPE_FAST); +-#elseif defined(__mips__) +- pthread_mutexattr_settype(&ma,MUTEX_TYPE_NORMAL); ++#else ++ ++#if defined(__mips__) ++ pthread_mutexattr_settype(&ma,MUTEX_TYPE_NORMAL); ++#endif ++ + #endif + pthread_mutex_init(&lock1,&ma); + pthread_mutexattr_destroy(&ma); diff -ruN downloader.orig/pkg-plist downloader/pkg-plist --- downloader.orig/pkg-plist Fri Aug 11 05:14:11 2000 +++ downloader/pkg-plist Sun Oct 29 03:33:28 2000 @@ -28,6 +28,7 @@ share/locale/hu/LC_MESSAGES/nt.mo share/locale/id/LC_MESSAGES/nt.mo share/locale/it/LC_MESSAGES/nt.mo +share/locale/iw/LC_MESSAGES/nt.mo share/locale/ja/LC_MESSAGES/nt.mo share/locale/nl/LC_MESSAGES/nt.mo share/locale/pl/LC_MESSAGES/nt.mo >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?200011021610.eA2GART18788>