Index: head/ftp/downloader/Makefile =================================================================== --- head/ftp/downloader/Makefile (revision 40102) +++ head/ftp/downloader/Makefile (revision 40103) @@ -1,39 +1,39 @@ # New ports collection makefile for: downloader # Date Created: 23 June 1999 # Whom: Ying-Chieh Liao # # $FreeBSD$ # PORTNAME= downloader -PORTVERSION= 1.23 +PORTVERSION= 1.24.1 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} MAINTAINER= ijliao@FreeBSD.org WRKSRC= ${WRKDIR}/${DISTNAME}/main USE_GTK= yes USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" DEST="${PREFIX}" \ OSTYPE="${OPSYS}" MAKE_CMD="${GMAKE}" MAN1= nt.1 PORTDOCS= ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE \ - NAMES PLANS README README.de README.es README.gr \ + NAMES PLANS README README.de README.en README.es README.gr \ README.pl README.pt_BR README.ru THANKS TODO TROUBLES post-install: ${INSTALL_MAN} ${WRKSRC}/../nt.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/downloader .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/downloader .endfor .endif .include Property changes on: head/ftp/downloader/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property Index: head/ftp/downloader/distinfo =================================================================== --- head/ftp/downloader/distinfo (revision 40102) +++ head/ftp/downloader/distinfo (revision 40103) @@ -1 +1 @@ -MD5 (nt-1.23.tar.gz) = d88055ca8fd6f87a47fd6426ba3ccaba +MD5 (nt-1.24.1.tar.gz) = 885aa758d2ce6fa6d3dbc912b9d6665b Property changes on: head/ftp/downloader/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/ftp/downloader/files/patch-ab =================================================================== --- head/ftp/downloader/files/patch-ab (revision 40102) +++ head/ftp/downloader/files/patch-ab (nonexistent) @@ -1,8 +0,0 @@ ---- signal.cc.orig Fri Dec 22 05:58:17 2000 -+++ signal.cc Fri Jan 5 21:22:24 2001 -@@ -116 +116 @@ --#elseif defined(__mips__) -+#else if defined(__mips__) -@@ -119 +119 @@ -- pthread_mutex_init(&lock,&ma); -+ pthread_mutex_init(lock,&ma); Property changes on: head/ftp/downloader/files/patch-ab ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/downloader/files/patch-aa =================================================================== --- head/ftp/downloader/files/patch-aa (revision 40102) +++ head/ftp/downloader/files/patch-aa (revision 40103) @@ -1,32 +1,23 @@ ---- Makefile.orig Fri Jan 26 18:05:26 2001 -+++ Makefile Fri Jan 26 21:58:20 2001 -@@ -8,7 +8,7 @@ - CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS) - endif - --CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS) -+CXXFLAGS+=-D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS) - #-DDEBUG_ALL - # -ggdb - +--- Makefile.orig Mon Mar 19 21:41:01 2001 ++++ Makefile Mon Mar 19 21:42:05 2001 @@ -34,8 +34,9 @@ ifeq ($(OSTYPE),FreeBSD) PTHREAD=-pthread -GTKCONFIG=gtk12-config -MAKE=gmake +GTKCONFIG=${GTK_CONFIG} +GLIBCONFIG=${GLIB_CONFIG} +MAKE=${MAKE_CMD} + CXXFLAGS+=-D_THREAD_SAFE endif - GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs) -@@ -80,7 +81,7 @@ +@@ -82,7 +83,7 @@ install: all - install -c -m755 nt $(DEST)/bin + ${BSD_INSTALL_PROGRAM} nt $(DEST)/bin [ -z "$(NLS)" ] || $(MAKE) install -C po clean: Property changes on: head/ftp/downloader/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/ftp/downloader/files/patch-aq =================================================================== --- head/ftp/downloader/files/patch-aq (revision 40102) +++ head/ftp/downloader/files/patch-aq (revision 40103) @@ -1,11 +1,11 @@ ---- po/Makefile.orig Thu Nov 30 22:46:52 2000 -+++ po/Makefile Fri Jan 5 21:24:09 2001 -@@ -6,7 +6,7 @@ +--- po/Makefile.orig Mon Mar 19 21:44:54 2001 ++++ po/Makefile Mon Mar 19 21:45:14 2001 +@@ -28,7 +28,7 @@ install: for i in `ls *.gmo` ; do \ mkdir -p $(LOCALEDIR)/`echo $$i|sed -e s/.gmo//`/LC_MESSAGES;\ -- install -c -m644 $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/nt.mo ; \ -+ ${BSD_INSTALL_DATA} $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/nt.mo ; \ +- install -c -m644 $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/$(PACKAGE).mo ; \ ++ ${BSD_INSTALL_DATA} $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/$(PACKAGE).mo ; \ done uninstall: Property changes on: head/ftp/downloader/files/patch-aq ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/ftp/downloader/files/patch-main::dlist.cc =================================================================== --- head/ftp/downloader/files/patch-main::dlist.cc (nonexistent) +++ head/ftp/downloader/files/patch-main::dlist.cc (revision 40103) @@ -0,0 +1,43 @@ +--- dlist.cc.orig Wed Mar 14 10:52:01 2001 ++++ dlist.cc Wed Mar 14 16:47:21 2001 +@@ -62,7 +62,7 @@ + a.l_type=F_WRLCK; + a.l_whence=SEEK_SET; + a.l_start=0; +- a.l_len=1; ++ a.l_len=0; + if (fcntl(fd,F_SETLK,&a)==-1) + return(-1); + return(0); +@@ -73,7 +73,7 @@ + a.l_type=F_UNLCK; + a.l_whence=SEEK_SET; + a.l_start=0; +- a.l_len=1; ++ a.l_len=0; + fcntl(fd,F_SETLK,&a); + }; + +@@ -360,11 +360,17 @@ + im_first=0; + if (segments==NULL){ + /*trying to lock*/ +- if (d4x_f_lock(fdesc)){ +- WL->log(LOG_ERROR,_("File is already opened by another download!")); +- close(fdesc); +- return(-1); +- }; ++ if(d4x_f_lock(fdesc)) ++ switch(errno) { ++ case EINVAL: ++ WL->log(LOG_WARNING,_("Filesystem seems not to support advisory record locking!")); ++ WL->log(LOG_WARNING,_("Will proceed without it but beware that you might have problems.")); ++ break; ++ default: ++ WL->log(LOG_ERROR,_("File is already opened by another download!")); ++ close(fdesc); ++ return(-1); ++ }; + /*end of trying */ + segments=new tSegmentator; + char *segname=sum_strings(name,".segments",NULL); Property changes on: head/ftp/downloader/files/patch-main::dlist.cc ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/downloader/pkg-plist =================================================================== --- head/ftp/downloader/pkg-plist (revision 40102) +++ head/ftp/downloader/pkg-plist (revision 40103) @@ -1,40 +1,42 @@ bin/nt %%PORTDOCS%%share/doc/downloader/ChangeLog %%PORTDOCS%%share/doc/downloader/FAQ %%PORTDOCS%%share/doc/downloader/FAQ.de %%PORTDOCS%%share/doc/downloader/FAQ.es %%PORTDOCS%%share/doc/downloader/FAQ.fr %%PORTDOCS%%share/doc/downloader/FAQ.gr %%PORTDOCS%%share/doc/downloader/LICENSE %%PORTDOCS%%share/doc/downloader/NAMES %%PORTDOCS%%share/doc/downloader/PLANS %%PORTDOCS%%share/doc/downloader/README %%PORTDOCS%%share/doc/downloader/README.de +%%PORTDOCS%%share/doc/downloader/README.en %%PORTDOCS%%share/doc/downloader/README.es %%PORTDOCS%%share/doc/downloader/README.gr %%PORTDOCS%%share/doc/downloader/README.pl %%PORTDOCS%%share/doc/downloader/README.pt_BR %%PORTDOCS%%share/doc/downloader/README.ru %%PORTDOCS%%share/doc/downloader/THANKS %%PORTDOCS%%share/doc/downloader/TODO %%PORTDOCS%%share/doc/downloader/TROUBLES 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/fi/LC_MESSAGES/nt.mo share/locale/fr/LC_MESSAGES/nt.mo +share/locale/he/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/iw/LC_MESSAGES/nt.mo share/locale/ja/LC_MESSAGES/nt.mo share/locale/ko/LC_MESSAGES/nt.mo share/locale/nl/LC_MESSAGES/nt.mo share/locale/pl/LC_MESSAGES/nt.mo share/locale/pt_BR/LC_MESSAGES/nt.mo share/locale/ru/LC_MESSAGES/nt.mo share/locale/sk/LC_MESSAGES/nt.mo share/locale/zh_CN.GBK/LC_MESSAGES/nt.mo %%PORTDOCS%%@dirrm share/doc/downloader Property changes on: head/ftp/downloader/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property