[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / net / xrmftp / patches
File: [cvs.NetBSD.org] / pkgsrc / net / xrmftp / patches / patch-aa (download)

Revision 1.2, Sat Jul 4 16:18:39 2015 UTC (8 years, 2 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, HEAD
Changes since 1.1: +3 -3 lines 

Remove USE_X11BASE and X11PREFIX.

$NetBSD: patch-aa,v 1.2 2015/07/04 16:18:39 joerg Exp $

--- Makefile.orig	Wed Nov 18 08:25:43 1998
+++ Makefile
@@ -1,20 +1,19 @@
-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 
+XFORMSLIBPATH=${PREFIX}/lib          # path to xforms library
+XFORMSINCPATH=${PREFIX}/include/X11  # 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 -lforms -ljpeg -lXpm    # libraries 
 #EXTRALIBS=-lnsl -lsocket         # additional libraries needed by some unices
 SRC=xftp.c fd_xftp.c
 OBJ=$(SRC:.c=.o)
 EXE=xrmftp
-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}
 
 #------------------------------------------------------------------------------
 
-${EXE}: ${OBJ}
-	${CC}  ${LDFLAGS} -o ${EXE} ${OBJ}
+all: ${OBJ}
+	${CC} ${OBJ} ${LDFLAGS} -o ${EXE}
 
 ${OBJ}: ${SRC}