mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

1) update the port to version 1.25:

Browse Source 
2) removed files/patch-main::dlist.cc which
   is no longer necessary since appropriate code has been
   added to the distribution.
3) updated files/patch-aa to use the recently added
   Mk/bsd.port.mk PTHREAD_{LIBS,CFLAGS}. Updated the
   port's Makefile accordingly
4) "un"echo"ed" post-install

Submitted by:	lioux
This commit is contained in:
Ying-Chieh Liao 2001-03-30 17:18:13 +00:00
parent b5d5572a93
commit c42d0b9333
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=40597
4 changed files with 15 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ftp/downloader/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= downloader
PORTVERSION= 1.24.1
PORTVERSION= 1.25
CATEGORIES= ftp
MASTER_SITES= http://www.krasu.ru/soft/chuchelo/files/ \
ftp://ftp.server51.freshmeat.net/pub/d4x/ \
@ -20,7 +20,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/main
USE_GTK= yes
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" DEST="${PREFIX}" \
OSTYPE="${OPSYS}" MAKE_CMD="${GMAKE}"
OSTYPE="${OPSYS}" MAKE_CMD="${GMAKE}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
MAN1= nt.1
PORTDOCS= ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE \
@ -28,11 +29,11 @@ PORTDOCS= ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE \
README.pl README.pt_BR README.ru THANKS TODO TROUBLES
post-install:
${INSTALL_MAN} ${WRKSRC}/../nt.1 ${PREFIX}/man/man1
@${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
@${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/downloader
.endfor
.endif

2
ftp/downloader/distinfo
View File

@ -1 +1 @@
MD5 (nt-1.24.1.tar.gz) = 885aa758d2ce6fa6d3dbc912b9d6665b
MD5 (nt-1.25.tar.gz) = 5b4afed4e6c3ba40a6db706e4488e03b

14
ftp/downloader/files/patch-aa
View File

@ -1,17 +1,21 @@
--- Makefile.orig Mon Mar 19 21:41:01 2001
+++ Makefile Mon Mar 19 21:42:05 2001
@@ -34,8 +34,9 @@
--- Makefile.orig Sat Mar 24 02:54:02 2001
+++ Makefile Fri Mar 30 11:30:16 2001
@@ -33,10 +33,11 @@
endif
ifeq ($(OSTYPE),FreeBSD)
PTHREAD=-pthread
-PTHREAD=-pthread
-GTKCONFIG=gtk12-config
-MAKE=gmake
-CXXFLAGS+=-D_THREAD_SAFE
+PTHREAD=$(PTHREAD_LIBS)
+GTKCONFIG=${GTK_CONFIG}
+GLIBCONFIG=${GLIB_CONFIG}
+MAKE=${MAKE_CMD}
CXXFLAGS+=-D_THREAD_SAFE
+CXXFLAGS+=$(PTHREAD_CFLAGS)
endif
GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
@@ -82,7 +83,7 @@

43
ftp/downloader/files/patch-main::dlist.cc
View File

@ -1,43 +0,0 @@
--- 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);