Date: Thu, 24 Feb 2000 13:14:31 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/16967: Update port: ftp/downloader to 1.12 (fix ports/16964) Message-ID: <200002242114.NAA30253@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 16967 >Category: ports >Synopsis: Update port: ftp/downloader to 1.12 (fix ports/16964) >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 Feb 24 13:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE >Organization: >Environment: >Description: - Update to version 1.12 New file: patches/patch-ap patches/patch-aq This PR supersedes ports/16964. >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 Feb 25 05:11:55 2000 @@ -1,13 +1,13 @@ # New ports collection makefile for: downloader -# Version required: 1.11 +# Version required: 1.12 # 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.12 +PKGNAME= downloader-1.12 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 Feb 25 05:03:25 2000 @@ -1 +1 @@ -MD5 (nt-1.11.tar.gz) = 6d76906c39e156704ec85670411ad715 +MD5 (nt-1.12.tar.gz) = f3ae3cfffde5f5ba43e2a6ed8545d609 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 Feb 25 05:50:01 2000 @@ -1,26 +1,56 @@ ---- Makefile.orig Sat Jan 29 05:02:17 2000 -+++ Makefile Sun Feb 13 13:18:26 2000 -@@ -1,21 +1,15 @@ +--- Makefile.orig Sat Jan 29 13:02:17 2000 ++++ Makefile Fri Feb 25 05:49:49 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,7 +28,7 @@ + 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 "" +@@ -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 Feb 25 05:26:21 2000 @@ -0,0 +1,11 @@ +--- srvclt.cc.orig Sat Feb 12 13:17:47 2000 ++++ srvclt.cc Fri Feb 25 05:26:07 2000 +@@ -23,7 +23,7 @@ + #include <signal.h> + #include <string.h> + +-#if defined(sun) ++#if defined(sun) || defined(__FreeBSD__) + typedef int socklen_t; + #endif + 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 Fri Feb 25 05:56:19 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 @@ -25,6 +26,8 @@ @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/hu/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/hu 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 @@ -35,4 +38,3 @@ @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?200002242114.NAA30253>