Date: Mon, 17 Apr 2000 19:42:17 +0400 (MSD) From: "Andrew L. Neporada" <andrew@chg.ru> To: KATO Tsuguru <tkato@prontomail.ne.jp> Cc: freebsd-ports@FreeBSD.ORG, lioux@uol.com.br Subject: Re: ports/18041: Update ftp/downloader to version 1.14 (supersedes ports/17229) Message-ID: <Pine.BSF.4.21.0004171915260.9630-100000@sign.chg.ru> In-Reply-To: <200004171100.EAA90432@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 17 Apr 2000, KATO Tsuguru wrote: > The following reply was made to PR ports/18041; it has been noted by GNATS. > > From: "KATO Tsuguru" <tkato@prontomail.ne.jp> > To: FreeBSD-gnats-submit@freebsd.org > Cc: lioux@uol.com.br > Subject: Re: ports/18041: Update ftp/downloader to version 1.14 (supersedes ports/17229) > Date: Mon, 17 Apr 2000 19:59:03 +0900 > > > Didn't do anything new about the patches. Just updated them to the new > > version. > > I suppose there is many point needed to touch up in current d4x port. > I agree. > Following patch has fixed them besides upgrading to the latest > version. > Yes, but there is one problem -- according to author license we can't modify source files. -----begin LICENSE------ You can't modify sources without agreement with autor but can distribute unmodified sources. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -----end LICENSE-------- But it turns out, that d4x could run (at least at 3-STABLE) without any modification of sources (I suppose that Makefile is not source ;-)). Could you please test my port on 4.x (it also supports NLS properly)? -----begin patch-------- diff -ruN downloader.orig/Makefile downloader/Makefile --- downloader.orig/Makefile Wed Apr 12 09:31:03 2000 +++ downloader/Makefile Mon Apr 17 18:54:04 2000 @@ -6,19 +6,39 @@ # PORTNAME= downloader -PORTVERSION= 1.11 +PORTVERSION= 1.14 CATEGORIES= ftp MASTER_SITES= ftp://ftp.server51.freshmeat.net/pub/d4x/ \ - ftp://ftp.lonyay.edu.hu/pub/software/nt/ \ - http://people.FreeBSD.org/~imura/distfiles/ + ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/ DISTNAME= nt-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ + intl.1:${PORTSDIR}/devel/gettext + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +MSG_FMT= ${LOCALBASE}/bin/msgfmt WRKSRC= ${WRKDIR}/${DISTNAME}/main -CFLAGS= -pedantic +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ + MSG_FMT="${MSG_FMT}" +post-install: +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/downloader + ${INSTALL_MAN} \ + ${WRKSRC}/../ChangeLog \ + ${WRKSRC}/../FAQ* \ + ${WRKSRC}/../INSTALL* \ + ${WRKSRC}/../LICENSE \ + ${WRKSRC}/../NAMES \ + ${WRKSRC}/../PLANS \ + ${WRKSRC}/../README* \ + ${WRKSRC}/../THANKS \ + ${WRKSRC}/../TODO \ + ${WRKSRC}/../TROUBLES \ + ${PREFIX}/share/doc/downloader +.endif .include <bsd.port.mk> diff -ruN downloader.orig/files/md5 downloader/files/md5 --- downloader.orig/files/md5 Sun Feb 20 19:08:13 2000 +++ downloader/files/md5 Mon Apr 17 14:21:46 2000 @@ -1 +1 @@ -MD5 (nt-1.11.tar.gz) = 6d76906c39e156704ec85670411ad715 +MD5 (nt-1.14.tar.gz) = 0e7d9f4bc82c47b8a8f400c62c7f1e28 diff -ruN downloader.orig/patches/patch-aa downloader/patches/patch-aa --- downloader.orig/patches/patch-aa Sun Feb 20 19:08:14 2000 +++ downloader/patches/patch-aa Mon Apr 17 16:58:31 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 Thu Mar 30 12:41:31 2000 ++++ Makefile Mon Apr 17 16:58:18 2000 +@@ -1,32 +1,17 @@ -CXX = c++ ++CXX ?= c++ NLS=-DENABLE_NLS # Remove or comment this line to disable gettext -ifeq ($(DEST),) -DEST=/usr/local -endif -+DEST?=$(PREFIX) ++DEST=$(PREFIX) LOCALEDIR=$(DEST)/share/locale - PTHREAD=-lpthread +-PTHREAD=-lpthread -GTKCONFIG=gtk-config - GLIBCONFIG=glib-config +-GLIBCONFIG=glib-config +-MAKE=make - #next strings were added for BSD support +-#next strings were added for BSD support -ifeq ($(OSTYPE),BSD) PTHREAD=-pthread - GTKCONFIG=gtk12-config +-GTKCONFIG=gtk12-config +-MAKE=gmake -endif ++GTKCONFIG=$(GTK_CONFIG) ++MSGFMT=$(MSG_FMT) +-ifeq ($(OSTYPE),FreeBSD) +-PTHREAD=-pthread +-GTKCONFIG=gtk12-config +-MAKE=gmake +-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) +-GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags` +-LIBS=$(PTHREAD) $(GTKLIBS) ++GTKFLAGS=`$(GTKCONFIG) --cflags` ++LIBS=$(PTHREAD) $(GTKLIBS) -lintl + + EXECC=$(CXX) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" + +@@ -42,7 +27,7 @@ + rm -f nt || test -z "" + $(MAKE) nt + if [ "$(NLS)" != "" ] ; then \ +- cd po && make ; \ ++ cd po && MSGFMT="$(MSGFMT)" $(MAKE) all ; \ + fi + $(MAKE) strip + +@@ -55,9 +40,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 -ruN downloader.orig/patches/patch-ab downloader/patches/patch-ab --- downloader.orig/patches/patch-ab Thu Jan 1 03:00:00 1970 +++ downloader/patches/patch-ab Mon Apr 17 16:07:06 2000 @@ -0,0 +1,18 @@ +--- po/Makefile.orig Tue Jan 11 05:28:32 2000 ++++ po/Makefile Mon Apr 17 14:02:06 2000 +@@ -1,12 +1,12 @@ + all: + for i in `ls *.po` ; do \ +- msgfmt $$i -o `echo $$i | sed -e s/.po//`.gmo ; \ ++ $(MSGFMT) $$i -o `echo $$i | sed -e s/.po//`.gmo ; \ + done + + 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 -ruN downloader.orig/patches/patch-ae downloader/patches/patch-ae --- downloader.orig/patches/patch-ae Sun Feb 20 19:08:15 2000 +++ downloader/patches/patch-ae Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- main.cc.orig Thu Jan 27 05:29:34 2000 -+++ main.cc Sun Feb 13 14:12:44 2000 -@@ -12,6 +12,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ipc.h> -+#include <sys/param.h> - - #if (defined(BSD) && (BSD >= 199306)) - #include <sys/msgbuf.h> diff -ruN downloader.orig/pkg/PLIST downloader/pkg/PLIST --- downloader.orig/pkg/PLIST Sun Feb 20 19:08:19 2000 +++ downloader/pkg/PLIST Mon Apr 17 19:04:44 2000 @@ -2,8 +2,10 @@ 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/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,6 +13,22 @@ share/locale/pt_BR/LC_MESSAGES/nt.mo share/locale/ru/LC_MESSAGES/nt.mo share/locale/zh_CN.GBK/LC_MESSAGES/nt.mo +share/doc/downloader/ChangeLog +share/doc/downloader/FAQ +share/doc/downloader/FAQ.es +share/doc/downloader/FAQ.fr +share/doc/downloader/FAQ.gr +share/doc/downloader/INSTALL +share/doc/downloader/INSTALL.gr +share/doc/downloader/LICENSE +share/doc/downloader/NAMES +share/doc/downloader/PLANS +share/doc/downloader/README +share/doc/downloader/README.gr +share/doc/downloader/README.ru +share/doc/downloader/THANKS +share/doc/downloader/TODO +share/doc/downloader/TROUBLES @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 @@ -25,10 +43,14 @@ @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 @unexec rmdir %D/share/locale/es 2>/dev/null || true +@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/el_GR 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 @@ -36,3 +58,4 @@ @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 +@unexec rmdir %D/share/doc/downloader 2>/dev/null || true ----end patch------ -- Andrew. How many Usenet users does it take to change a light bulb? Read the FAQ. 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?Pine.BSF.4.21.0004171915260.9630-100000>