head	1.20;
access;
symbols
	RELEASE_4_3_0:1.19
	RELEASE_4_2_0:1.12
	RELEASE_4_1_1:1.10
	RELEASE_4_1_0:1.8
	RELEASE_3_5_0:1.8
	RELEASE_4_0_0:1.6
	RELEASE_3_4_0:1.3
	RELEASE_3_3_0:1.2
	v_0_98:1.1.1.1
	IJLIAO:1.1.1;
locks; strict;
comment	@# @;


1.20
date	2001.04.21.07.33.14;	author ijliao;	state dead;
branches;
next	1.19;

1.19
date	2001.03.30.17.18.13;	author ijliao;	state Exp;
branches;
next	1.18;

1.18
date	2001.03.20.13.33.25;	author ijliao;	state Exp;
branches;
next	1.17;

1.17
date	2001.02.28.02.29.16;	author ijliao;	state Exp;
branches;
next	1.16;

1.16
date	2001.01.28.03.44.30;	author ijliao;	state Exp;
branches;
next	1.15;

1.15
date	2001.01.12.18.23.52;	author alex;	state Exp;
branches;
next	1.14;

1.14
date	2001.01.10.15.57.38;	author kevlo;	state Exp;
branches;
next	1.13;

1.13
date	2001.01.06.05.39.04;	author obrien;	state Exp;
branches;
next	1.12;

1.12
date	2000.11.02.21.38.53;	author lioux;	state Exp;
branches;
next	1.11;

1.11
date	2000.10.05.06.36.12;	author reg;	state Exp;
branches;
next	1.10;

1.10
date	2000.08.29.15.42.10;	author kevlo;	state Exp;
branches;
next	1.9;

1.9
date	2000.08.11.01.14.11;	author will;	state Exp;
branches;
next	1.8;

1.8
date	2000.05.19.08.26.07;	author cpiazza;	state Exp;
branches;
next	1.7;

1.7
date	2000.04.22.02.15.49;	author will;	state Exp;
branches;
next	1.6;

1.6
date	2000.02.20.16.08.14;	author imura;	state Exp;
branches;
next	1.5;

1.5
date	2000.02.13.01.49.16;	author reg;	state Exp;
branches;
next	1.4;

1.4
date	99.12.31.20.16.35;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	99.10.02.16.52.49;	author cpiazza;	state Exp;
branches;
next	1.2;

1.2
date	99.08.26.23.08.22;	author cpiazza;	state Exp;
branches;
next	1.1;

1.1
date	99.06.23.00.43.48;	author cpiazza;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.06.23.00.43.48;	author cpiazza;	state Exp;
branches;
next	;


desc
@@


1.20
log
@upgrade to 1.26
@
text
@--- 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
-GTKCONFIG=gtk12-config
-MAKE=gmake
-CXXFLAGS+=-D_THREAD_SAFE
+PTHREAD=$(PTHREAD_LIBS)
+GTKCONFIG=${GTK_CONFIG}
+GLIBCONFIG=${GLIB_CONFIG}
+MAKE=${MAKE_CMD}
+CXXFLAGS+=$(PTHREAD_CFLAGS)
 endif
 
 GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
@@@@ -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: 
@


1.19
log
@1) update the port to version 1.25:
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
@
text
@@


1.18
log
@upgrade to 1.24.1

PR:		25930
Submitted by:	KATO Tsuguru <tkato@@prontomail.ne.jp>, lioux
@
text
@d1 4
a4 3
--- Makefile.orig	Mon Mar 19 21:41:01 2001
+++ Makefile	Mon Mar 19 21:42:05 2001
@@@@ -34,8 +34,9 @@@@
d7 1
a7 1
 PTHREAD=-pthread
d10 2
d15 1
a15 1
 CXXFLAGS+=-D_THREAD_SAFE
d18 1
@


1.17
log
@upgrade to 1.23

PR:		25427
Submitted by:	Ports Fury
@
text
@d1 2
a2 11
--- 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
 
d12 1
d15 1
a15 2
 GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
@@@@ -80,7 +81,7 @@@@
@


1.16
log
@update to 1.21
change maintainer to myself

PR:		24671
Submitted by:	tkato@@prontomail.ne.jp
@
text
@d9 1
a9 1
 # -DDEBUG_ALL
@


1.15
log
@Make this port actually COMPILE! *sigh*
@
text
@d1 2
a2 2
--- Makefile.orig	Sat Dec 16 16:44:10 2000
+++ Makefile	Fri Jan 12 19:12:32 2001
d7 3
a9 2
-CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS) -DDEBUG_ALL
+CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_THREAD_SAFE
d12 1
a12 13
 export CXXFLAGS LOCALEDIR
@@@@ -21,10 +21,10 @@@@
 endif
 
 LOCALEDIR=$(DEST)/share/locale
-PTHREAD=-lpthread
-GTKCONFIG=gtk-config
-GLIBCONFIG=glib-config
-MAKE=make
+PTHREAD?=-lpthread
+GTKCONFIG?=gtk-config
+GLIBCONFIG?=glib-config
+MAKE?=make
d14 7
a20 4
 #next strings were added for BSD support
 ifeq ($(OSTYPE),BSD)
@@@@ -39,8 +39,8 @@@@
 MAKE=gmake
d23 2
a24 8
-GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
-GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
+GTKLIBS=$(shell $(GTKCONFIG) --libs) #$(shell $(GLIBCONFIG) --libs)
+GTKFLAGS=$(shell $(GTKCONFIG) --cflags) #$(shell $(GLIBCONFIG) --cflags)
 
 ifeq ($(OSTYPE),Irix)
 CTKFLIBS += lintl
@@@@ -81,7 +81,7 @@@@
@


1.14
log
@- Support CXX/CXXFLAGS/PREFIX/GTK_CONFIG properly
- Fix pkg-plist

PR: 24200
Submitted by: MAINTAINER
@
text
@d1 2
a2 2
--- Makefile.orig	Sun Dec 17 00:44:10 2000
+++ Makefile	Wed Jan 10 03:45:22 2001
d12 15
@


1.13
log
@Remove maintainer -- email to him bounces with "no such user".
Update to non-prerelease version.
USE_GMAKE rather than make *huge* non-maintainable patches to the Makefiles.
@
text
@d1 4
a4 8
--- Makefile.orig	Sat Dec 16 07:44:10 2000
+++ Makefile	Fri Jan  5 21:24:27 2001
@@@@ -5,10 +5,10 @@@@
 SOLARIS_TYPECASTED_X11_HEADERS=-I/var/tmp/src
 endif
 ifndef CXXFLAGS
-CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS)
+#CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS)
d12 1
a12 1
@@@@ -33,11 +33,13 @@@@
d16 8
a23 13
-ifeq ($(OSTYPE),FreeBSD)
+#	fsck'ing gmake won't recongize us as FreeBSD...
+#ifeq ($(OSTYPE),FreeBSD)
 PTHREAD=-pthread
 GTKCONFIG=gtk12-config
+GLIBCONFIG=glib12-config
 MAKE=gmake
-endif
+#endif
 
 GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
 GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
@@@@ -81,8 +83,8 @@@@
d28 2
a29 3
-	[ -z "$(NLS)" ] || $(MAKE) install -C po
+	$(BSD_INSTALL_PROGRAM) nt $(DEST)/bin
+	[ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install
a31 1
 	-rm -f *.o nt TAGS *~
@


1.12
log
@Update port to version 1.20pre

PR:		ports/22544
Submitted by:	maintainer
@
text
@d1 6
a6 10
--- Makefile.orig	Sun Oct 29 02:34:33 2000
+++ Makefile	Sun Oct 29 02:36:32 2000
@@@@ -1,103 +1,44 @@@@
-# Solaris Openwin 2.6 headers are not properly casted to for
-# compilation with C++/g++. Three files Xlib.h, Xresource.h, Xutil.h
-# need to be fixed to compile this. Or add a path to the X11R6 headers
-ifeq ($(OSTYPE),Solaris)
-SOLARIS_TYPECASTED_X11_HEADERS=-I/var/tmp/src
-endif
-ifndef CXXFLAGS
d8 11
a18 17
-endif
-
-CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS)
-# -DDEBUG_ALL
-# -ggdb
+CXXFLAGS += -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 
-export CXXFLAGS LOCALEDIR
-
-#CXX = c++
+CXX ?= c++
 
 NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
-ifeq ($(DEST),)
-DEST=/usr/local
-endif
+DEST=${PREFIX}
d20 3
a22 8
 LOCALEDIR=$(DEST)/share/locale
-PTHREAD=-lpthread
-GTKCONFIG=gtk-config
-GLIBCONFIG=glib-config
-MAKE=make
-
-#next strings were added for BSD support
-ifeq ($(OSTYPE),BSD)
d24 9
a32 4
-GTKCONFIG=gtk12-config
-MAKE=gmake
-endif
+MSGFMT=${MSGFMT_CMD}
a33 56
-ifeq ($(OSTYPE),FreeBSD)
-PTHREAD=-pthread
-GTKCONFIG=gtk12-config
-MAKE=gmake
-endif
-
-GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
-GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
-
-ifeq ($(OSTYPE),Irix)
-CTKFLIBS += lintl
-MAKE=gmake
-CXXFLAGS += -fpermissive
-endif
+GTKLIBS=`${GTK_CONFIG} --libs`
+GTKFLAGS=`${GTK_CONFIG} --cflags`
+LDFLAGS=$(PTHREAD) $(GTKLIBS)
 
-LDFLAGS=$(PTHREAD) $(GTKLIBS)
-CXXFLAGS += $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
+EXECC=$(CXX) $(CXXFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
 
 FACE=face/lmenu.o face/list.o face/addd.o face/graph.o face/log.o \
 	face/prefs.o face/buttons.o 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 face/passface.o \
 	face/mywidget.o
-MODULES1=base64.o addr.o queue.o liststr.o dlist.o mdlist.o locstr.o \
+MODULES=base64.o addr.o queue.o liststr.o dlist.o mdlist.o locstr.o \
 	log.o  sort.o meter.o socket.o history.o  speed.o srvclt.o html.o \
 	client.o ftp.o http.o download.o ftpd.o httpd.o hproxy.o signal.o \
 	main.o config.o savelog.o mainlog.o var.o sortstr.o db.o cookie.o \
 	pass.o eff.o
-MODULES = $(FACE) $(MODULES1)
+MODULES += $(FACE)
 
-all:
-	-rm -f nt
-	$(MAKE) nt
-	[ -z "$(NLS)" ] || $(MAKE) -C po
-	$(MAKE) strip
+all: nt
+	[ -z "$(NLS)" ] || cd po && MSGFMT=$(MSGFMT) $(MAKE)
 
 $(FACE):
-	$(MAKE) -C face
+	cd face && EXECC="$(EXECC)" $(MAKE)
 
 nt: $(MODULES)
-	$(MAKE) -C face
-	$(CXX) -lstdc++ $(MODULES) nt.cc -o nt $(CXXFLAGS) $(GTKLIBS) $(PTHREAD)
-
-strip: nt
-	strip nt
-
+	$(EXECC) $(MODULES) nt.cc -o nt $(LDFLAGS)
a37 15
-
-clean: 
-	-rm -f *.o nt TAGS *~
-	$(MAKE) clean -C face
-	$(MAKE) clean -C po
-
-tags:
-	etags *.{cc,h} face/*.{cc,h}
-
-uninstall:
-	-rm -f $(DEST)/bin/nt
-	$(MAKE) uninstall -C po
-
-Makefile.dep:
-	$(CXX) -I./ -Iface $(CXXFLAGS) -MM *.cc > Makefile.dep
d41 2
a42 3
--include Makefile.dep
+.cc.o:
+	$(EXECC) -c $<
@


1.11
log
@Implement USE_GTK, part 1.
@
text
@d1 15
a15 4
--- Makefile.orig	Sat Aug 26 10:16:05 2000
+++ Makefile	Mon Aug 28 20:07:43 2000
@@@@ -1,39 +1,19 @@@@
-CXXFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
a16 1
-# -DDEBUG_ALL
d38 1
a38 1
-PTHREAD=-pthread
d42 2
a43 1
-
d45 1
a45 1
 PTHREAD=-pthread
d49 1
a49 2
+MSGFMT=${MSGFMT_CMD}
 
d52 6
d60 3
a62 1
 LDFLAGS=$(PTHREAD) $(GTKLIBS)
a63 1
+
d68 8
a75 1
@@@@ -47,40 +27,18 @@@@
d77 2
a78 1
 MODULES += $(FACE)
d118 1
a118 1
-	$(CXX) $(CXXFLAGS) -MM *.cc > Makefile.dep
@


1.10
log
@Update to version 1.19

PR: 20922
Submitted by: MAINTAINER
@
text
@d7 1
a7 1
+CXXFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
@


1.9
log
@Update to 1.18.  I added something to make this link with -lintl.

PR:		20510
Submitted by:	andrew@@chg.ru
@
text
@d1 3
a3 3
--- Makefile.orig	Thu May 11 05:49:46 2000
+++ Makefile	Tue May 16 17:36:48 2000
@@@@ -1,40 +1,19 @@@@
d6 1
a6 1
-#-lefence
a8 1
-
d28 1
a28 1
 PTHREAD=-pthread
d32 1
a32 2
+MSGFMT=${MSGFMT_CMD}
 
d34 1
a34 1
-PTHREAD=-pthread
d38 2
a39 1
-
d42 1
a42 1
+GTKLIBS=`${GTK_CONFIG} --libs` -lintl
d51 7
a57 4
@@@@ -51,23 +30,20 @@@@
 all:
 	-rm -f nt
 	$(MAKE) nt
d60 1
d79 12
a90 12
+	${BSD_INSTALL_PROGRAM} nt $(DEST)/bin
+	[ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install
+
+.cc.o:
+	$(EXECC) -c $<
 
 clean: 
 	-rm -f *.o nt TAGS *~
@@@@ -80,8 +56,3 @@@@
 uninstall:
 	-rm -f $(DEST)/bin/nt
 	$(MAKE) uninstall -C po
d94 3
a96 1
-
d98 2
@


1.8
log
@Update to 1.16

PR:		18604
Submitted by:	Andrew L. Neporada <andrew@@chg.ru> (took maintainership)
@
text
@d43 1
a43 1
+GTKLIBS=`${GTK_CONFIG} --libs`
@


1.7
log
@Update to 1.15.

PR:		18146
Submitted by:	KATO Tsuguru <tkato@@prontomail.ne.jp>
@
text
@d1 2
a2 2
--- Makefile.orig	Thu Apr 20 11:24:29 2000
+++ Makefile	Sat Apr 22 06:00:00 2000
d52 1
a52 1
@@@@ -50,23 +29,20 @@@@
d84 1
a84 1
@@@@ -79,8 +55,3 @@@@
@


1.6
log
@Update to version 1.11.

Maintainer is now ports@@FreeBSD.org, because email to him has been
bouncing since last Decenber..

PR:		16701
Submitted by:	Alexander Langer <alex@@cichlids.com>
@
text
@d1 13
a13 4
--- Makefile.orig	Sat Jan 29 05:02:17 2000
+++ Makefile	Sun Feb 13 13:18:26 2000
@@@@ -1,21 +1,15 @@@@
-CXX = c++
d19 2
a20 1
+DEST?=$(PREFIX)
d22 1
a22 1
 PTHREAD=-lpthread
d24 4
a27 3
 GLIBCONFIG=glib-config
 
 #next strings were added for BSD support
d30 9
a38 1
 GTKCONFIG=gtk12-config
d40 41
d82 11
a92 5
-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+CFLAGS+=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 GTKLIBS=`$(GTKCONFIG) --libs` 
 GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags`
 LIBS=$(PTHREAD) $(GTKLIBS)
@


1.5
log
@Fix for -current.

Email to maintainer bouncing.
@
text
@d1 4
a4 8
diff -ru ./Makefile ../../nt-1.07.1/main/Makefile
--- ./Makefile	Wed Nov  3 05:20:49 1999
+++ ../../nt-1.07.1/main/Makefile	Thu Nov 25 22:18:21 1999
@@@@ -1,13 +1,13 @@@@
-CC = gcc
-CCPLUS = c++
+CC = $(CC)
+CCPLUS = $(CXX)
d7 1
d9 2
a10 1
+DEST=$(PREFIX)
d12 3
a14 8
-LIBS=-lpthread
-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-GTKLIBS=`gtk-config --libs`
-GTKFLAGS=`gtk-config --cflags`
+GTKLIBS=`gtk12-config --libs`
+GTKFLAGS=`gtk12-config --cflags`
+LIBS=-pthread
+CFLAGS+=-Wall -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
d16 5
a20 1
 EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
d22 5
@


1.4
log
@Update to version 1.07.1.

PR:		15094
Submitted by:	Mario Ferreira <lioux@@linf.unb.br>
@
text
@d15 1
a15 2
+LIBS=-pthread
 CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
d20 2
@


1.3
log
@Update to version 1.0b5

PR:		14017
Submitted by:	maintainer
@
text
@d1 3
a3 2
--- Makefile.orig	Tue Sep 28 22:40:25 1999
+++ Makefile	Tue Sep 28 22:41:24 1999
d7 2
a8 2
+CC ?= gcc
+CCPLUS = ${CXX}
d11 2
a12 1
 DEST=/usr/local
d15 2
a16 1
-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
a18 2
+LIBS=-pthread
+CFLAGS+=-Wall -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
@


1.2
log
@Update to version 1.0b2

PR:		13367
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- Makefile.orig	Fri Aug 20 22:50:56 1999
+++ Makefile	Thu Aug 26 14:46:36 1999
@@@@ -1,10 +1,10 @@@@
d7 1
a7 1
+CCPLUS = ${CXX} 
d9 3
d13 1
a13 1
-CFLAGS=-Wall -O2
d17 1
a17 1
+CFLAGS+=-Wall
d21 1
a21 1
 EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS)
@


1.1
log
@Initial revision
@
text
@d1 2
a2 2
--- Makefile.orig	Fri Jun 18 18:41:54 1999
+++ Makefile	Tue Jun 22 17:32:18 1999
d14 1
a14 1
+CFLAGS?=-Wall -O2
d18 1
a18 1
 EXECC=$(CCPLUS) $(CFLAGS)
@


1.1.1.1
log
@Import of ``downloader''.

A GTK+ based app that allows you to download from ftp or http based
servers much in the same way as "ReGet" for Windows.

PR:	12345
Submitted by:	Ying-Chieh Liao <ijliao@@csie.nctu.edu.tw>
@
text
@@
