mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

fix build error caused by xforms change.

Browse Source 
PR:		25697
Submitted by:	maintainer
This commit is contained in:
FUJISHIMA Satsuki 2001-03-12 18:10:32 +00:00
parent 6b186f8afb
commit 2dcd6ae221
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=39675
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ftp/xrmftp/Makefile
View File

@ -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$
#

9
ftp/xrmftp/files/patch-aa
View File

@ -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}
#------------------------------------------------------------------------------
+