Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Mar 2000 11:54:10 -0800 (PST)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/17229: Update port: ftp/downloader to 1.13 (fix ports/16967)
Message-ID:  <200003061954.LAA18441@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         17229
>Category:       ports
>Synopsis:       Update port: ftp/downloader to 1.13 (fix ports/16967)
>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:   Mon Mar  6 12:00:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        
>Organization:
>Environment:
>Description:
- Update to version 1.13

New file:
patches/patch-ap  patches/patch-aq

This PR supersedes ports/16967.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/ftp/downloader/Makefile ftp/downloader/Makefile
--- /usr/ports/ftp/downloader/Makefile	Mon Feb 21 08:14:57 2000
+++ ftp/downloader/Makefile	Fri Mar  3 19:03:37 2000
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	downloader
-# Version required:	1.11
+# Version required:	1.13
 # Date Created:		23 June 1999
 # Whom:			Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
 #
 # $FreeBSD: ports/ftp/downloader/Makefile,v 1.10 2000/02/20 16:08:12 imura Exp $
 #
 
-DISTNAME=	nt-1.11
-PKGNAME=	downloader-1.11
+DISTNAME=	nt-1.13
+PKGNAME=	downloader-1.13
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.server51.freshmeat.net/pub/d4x/ \
 		ftp://ftp.lonyay.edu.hu/pub/software/nt/ \
@@ -17,8 +17,12 @@
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/main
 
-CFLAGS=		-pedantic
+MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
+		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 08:14:57 2000
+++ ftp/downloader/files/md5	Fri Mar  3 19:04:26 2000
@@ -1 +1 @@
-MD5 (nt-1.11.tar.gz) = 6d76906c39e156704ec85670411ad715
+MD5 (nt-1.13.tar.gz) = 577a685992bf31aeca63e82e3f778b49
diff -urN /usr/ports/ftp/downloader/patches/patch-aa ftp/downloader/patches/patch-aa
--- /usr/ports/ftp/downloader/patches/patch-aa	Mon Feb 21 08:14:57 2000
+++ ftp/downloader/patches/patch-aa	Fri Mar  3 20:08:58 2000
@@ -1,26 +1,63 @@
---- Makefile.orig	Sat Jan 29 05:02:17 2000
-+++ Makefile	Sun Feb 13 13:18:26 2000
-@@ -1,21 +1,15 @@
+--- Makefile.orig	Wed Feb 23 11:26:35 2000
++++ Makefile	Fri Mar  3 20:08:18 2000
+@@ -1,21 +1,21 @@
 -CXX = c++
++CXX ?= c++
  
  NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
 -ifeq ($(DEST),)
 -DEST=/usr/local
 -endif
-+DEST?=$(PREFIX)
++#ifeq ($(DEST),)
++DEST=${PREFIX}
++#endif
  LOCALEDIR=$(DEST)/share/locale
- PTHREAD=-lpthread
+-PTHREAD=-lpthread
 -GTKCONFIG=gtk-config
- GLIBCONFIG=glib-config
+-GLIBCONFIG=glib-config
++#PTHREAD=-lpthread
++#GTKCONFIG=gtk-config
++GLIBCONFIG=${GLIB_CONFIG}
  
  #next strings were added for BSD support
 -ifeq ($(OSTYPE),BSD)
++#ifeq ($(OSTYPE),BSD)
  PTHREAD=-pthread
- GTKCONFIG=gtk12-config
+-GTKCONFIG=gtk12-config
 -endif
++GTKCONFIG=${GTK_CONFIG}
++#endif
  
 -CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-+CFLAGS+=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
++CFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
  GTKLIBS=`$(GTKCONFIG) --libs` 
  GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags`
  LIBS=$(PTHREAD) $(GTKLIBS)
+@@ -28,13 +28,13 @@
+ face/about.o face/edit.o face/colors.o face/saveload.o face/limface.o face/misc.o face/lod.o \
+ face/columns.o face/dndtrash.o
+ 
+-MAKE=make
++MAKE?=make
+ 
+ all:
+ 	rm -f nt || test -z ""
+ 	$(MAKE) nt
+ 	if [ "$(NLS)" != "" ] ; then \
+-		cd po && make ; \
++		cd po && $(MAKE) all ; \
+ 	fi
+ 	$(MAKE) strip
+ 
+@@ -47,9 +47,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-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	Fri Mar  3 19:50:04 2000
@@ -0,0 +1,17 @@
+--- srvclt.cc.orig	Mon Feb 28 12:28:31 2000
++++ srvclt.cc	Fri Mar  3 19:43:16 2000
+@@ -22,9 +22,14 @@
+ #include <sys/un.h>
+ #include <signal.h>
+ #include <string.h>
++#include <osreldate.h>
+ 
+ #if defined(sun)
+ typedef int socklen_t;
++#endif
++
++#if defined(__FreeBSD__) && __FreeBSD_version <=340000)
++typedef u_int32_t socklen_t;
+ #endif
+ 
+ void *server_thread_run(void *what){
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	Fri Feb 25 05:51:51 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 08:14:58 2000
+++ ftp/downloader/pkg/PLIST	Tue Mar  7 04:49:32 2000
@@ -4,6 +4,7 @@
 share/locale/de/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 +12,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


>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?200003061954.LAA18441>