aboutsummaryrefslogtreecommitdiff
path: root/ftp/xrmftp
diff options
context:
space:
mode:
authorFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-12 18:10:32 +0000
committerFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-12 18:10:32 +0000
commit2dcd6ae2214c63d31cc4cf9dbd5304658ea45b07 (patch)
tree239055c721da670534909231eaf4026815ac064a /ftp/xrmftp
parent6b186f8afbd0573514720aa78085429a3af03412 (diff)
downloadports-2dcd6ae2214c63d31cc4cf9dbd5304658ea45b07.tar.gz
ports-2dcd6ae2214c63d31cc4cf9dbd5304658ea45b07.zip
Notes
Diffstat (limited to 'ftp/xrmftp')
-rw-r--r--ftp/xrmftp/Makefile2
-rw-r--r--ftp/xrmftp/files/patch-aa9
2 files changed, 5 insertions, 6 deletions
diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile
index b5b4bc59a1af..7fbcb5ac9eb8 100644
--- a/ftp/xrmftp/Makefile
+++ b/ftp/xrmftp/Makefile
@@ -1,6 +1,6 @@
# New ports collection Makefile for: xrmftp
# Date created: 28 March 2000
-# Whom: Matt Heckaman <matt@LUCIDA.QC.CA>
+# Whom: Matt Heckaman <matt@LUCIDA.CA>
#
# $FreeBSD$
#
diff --git a/ftp/xrmftp/files/patch-aa b/ftp/xrmftp/files/patch-aa
index 0c772436f688..817b793bd0c1 100644
--- a/ftp/xrmftp/files/patch-aa
+++ b/ftp/xrmftp/files/patch-aa
@@ -1,19 +1,18 @@
---- Makefile Tue Nov 17 19:25:43 1998
-+++ Makefile.new Sat Apr 1 06:43:11 2000
+--- Makefile.orig Tue Nov 17 19:25:43 1998
++++ Makefile Sun Mar 11 05:59:19 2001
@@ -1,17 +1,20 @@
-CC=gcc
-XFORMSLIBPATH=/usr/X11R6/lib # path to xforms library
-XFORMSINCPATH=/usr/X11R6/include # path to xforms header file <forms.h>
-XLIBSPATH=/usr/X11R6/lib # path to standard X libraries
-XINCPATH=/usr/X11R6/include # path to standard X header files
--LIBS= -lm -lX11 -lforms # libraries
+X11BASE?=/usr/X11R6
+CC ?=gcc
+XFORMSLIBPATH=${X11BASE}/lib # path to xforms library
+XFORMSINCPATH=${X11BASE}/include # path to xforms header file <forms.h>
+XLIBSPATH=${X11BASE}/lib # path to standard X libraries
+XINCPATH=${X11BASE}/include # path to standard X header files
-+LIBS= -lm -lX11 -lxforms # libraries
+ LIBS= -lm -lX11 -lforms # libraries
#EXTRALIBS=-lnsl -lsocket # additional libraries needed by some unices
SRC=xftp.c fd_xftp.c
OBJ=$(SRC:.c=.o)
@@ -21,7 +20,7 @@
-CFLAGS=-I/usr/include -I${XFORMSINCPATH} -I${XINCPATH}
-LDFLAGS=-L/usr/lib -L${XLIBSPATH} ${LIBS} ${EXTRALIBS} -L${XFORMSLIBPATH} -O3
+CFLAGS +=-I/usr/include -I${XFORMSINCPATH} -I${XINCPATH}
-+LDFLAGS =-L/usr/lib -L${XLIBSPATH} ${LIBS} ${EXTRALIBS} -L${XFORMSLIBPATH} -O3
++LDFLAGS =-L/usr/lib -L${XLIBSPATH} ${LIBS} ${EXTRALIBS} -L${XFORMSLIBPATH}
#------------------------------------------------------------------------------
+