diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2000-11-02 21:38:53 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2000-11-02 21:38:53 +0000 |
| commit | e620a803b6023b586ae6bc1ec6d2999090d9f5a2 (patch) | |
| tree | 67cb9ee05c7c44b8b6f149e587f5d78c7279491a /ftp/downloader/files/patch-aa | |
| parent | Add pkg_* programs and manpages. Bump version number. (diff) | |
Update port to version 1.20pre
PR: ports/22544
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=34679
Diffstat (limited to 'ftp/downloader/files/patch-aa')
| -rw-r--r-- | ftp/downloader/files/patch-aa | 55 |
1 files changed, 40 insertions, 15 deletions
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa index f87009420937..0ac4f045d27a 100644 --- a/ftp/downloader/files/patch-aa +++ b/ftp/downloader/files/patch-aa @@ -1,9 +1,19 @@ ---- 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 --# -ggdb +--- 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 +-CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS) +-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 @@ -25,32 +35,47 @@ - -#next strings were added for BSD support -ifeq ($(OSTYPE),BSD) --PTHREAD=-pthread + PTHREAD=-pthread -GTKCONFIG=gtk12-config -MAKE=gmake -endif -- ++MSGFMT=${MSGFMT_CMD} + -ifeq ($(OSTYPE),FreeBSD) - PTHREAD=-pthread +-PTHREAD=-pthread -GTKCONFIG=gtk12-config -MAKE=gmake -endif -+MSGFMT=${MSGFMT_CMD} - +- -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) + +-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 \ -@@ -47,40 +27,18 @@ + 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) +-MODULES = $(FACE) $(MODULES1) ++MODULES += $(FACE) -all: - -rm -f nt @@ -90,7 +115,7 @@ - $(MAKE) uninstall -C po - -Makefile.dep: -- $(CXX) $(CXXFLAGS) -MM *.cc > Makefile.dep +- $(CXX) -I./ -Iface $(CXXFLAGS) -MM *.cc > Makefile.dep + $(BSD_INSTALL_PROGRAM) nt $(DEST)/bin + [ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install |