diff options
Diffstat (limited to 'ftp/xrmftp')
| -rw-r--r-- | ftp/xrmftp/Makefile | 2 | ||||
| -rw-r--r-- | ftp/xrmftp/files/patch-aa | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile index 7fbcb5ac9eb8..cec61d188afa 100644 --- a/ftp/xrmftp/Makefile +++ b/ftp/xrmftp/Makefile @@ -14,7 +14,7 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= matt@LUCIDA.CA -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/xrmftp-1.2.4.src diff --git a/ftp/xrmftp/files/patch-aa b/ftp/xrmftp/files/patch-aa index 817b793bd0c1..95c208e83f76 100644 --- a/ftp/xrmftp/files/patch-aa +++ b/ftp/xrmftp/files/patch-aa @@ -1,18 +1,23 @@ --- Makefile.orig Tue Nov 17 19:25:43 1998 -+++ Makefile Sun Mar 11 05:59:19 2001 -@@ -1,17 +1,20 @@ ++++ Makefile Mon Jul 1 01:56:44 2002 +@@ -1,17 +1,24 @@ -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> ++.if exists (${X11BASE}/include/X11/forms.h) ++XFORMSINCPATH=${X11BASE}/include/X11 ++.else ++XFORMSINCPATH=${X11BASE}/include ++.endif +XLIBSPATH=${X11BASE}/lib # path to standard X libraries +XINCPATH=${X11BASE}/include # path to standard X header files - LIBS= -lm -lX11 -lforms # libraries ++LIBS= -lm -lX11 -lforms -lXpm # libraries #EXTRALIBS=-lnsl -lsocket # additional libraries needed by some unices SRC=xftp.c fd_xftp.c OBJ=$(SRC:.c=.o) |