From 90abca96c12806753ea703b2478118fd4c4c1631 Mon Sep 17 00:00:00 2001 From: Volker Stolz Date: Thu, 19 May 2005 09:15:39 +0000 Subject: Use MAKE_ARGS --- news/slrnface/Makefile | 3 +++ news/slrnface/files/patch-Makefile | 29 ----------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 news/slrnface/files/patch-Makefile (limited to 'news') diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile index 717c434ae7f0..180c5ce988aa 100644 --- a/news/slrnface/Makefile +++ b/news/slrnface/Makefile @@ -20,6 +20,9 @@ LIB_DEPENDS= compface:${PORTSDIR}/mail/faces WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} ALL_TARGET= slrnface +MAKE_ARGS= CC="${CC}" C_FLAGS="${CFLAGS}" \ + X_INCL=-I${X11BASE}/include \ + XF_LIB="-L${X11BASE}/lib -L${LOCALBASE}/lib -lcompface" USE_XLIB= yes diff --git a/news/slrnface/files/patch-Makefile b/news/slrnface/files/patch-Makefile deleted file mode 100644 index 4e5ce80ac229..000000000000 --- a/news/slrnface/files/patch-Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.orig Sat Aug 24 23:56:21 2002 -+++ Makefile Fri Sep 6 14:46:38 2002 -@@ -1,21 +1,19 @@ --CC = cc -- --X_INCL = # location of X include files, if needed -+X_INCL = -I${X11BASE}/include # location of X include files, if needed - - # A lot of popular terminals are brain damaged, so we cannot use X - # resources for configuration. In those cases Xt routines won't even be - # called, so you might want to use lazy loading for Xt if your OS supports it. - - X_LIBS = -lXt -lX11 # X libs --XF_LIB = -L/usr/local/lib -lcompface # compface library --C_FLAGS = -O -+XF_LIB = -L${X11BASE}/lib -L${LOCALBASE}/lib -lcompface # compface library -+C_FLAGS = #-O - - prefix = /usr/local - - # No need to configure anything below. - --CFLAGS = $(C_FLAGS) $(X_INCL) --LDFLAGS = $(XF_LIB) $(X_LIBS) -+CFLAGS += $(C_FLAGS) $(X_INCL) -+LDFLAGS += $(XF_LIB) $(X_LIBS) - - slrnface: slrnface.c - $(CC) $(CFLAGS) -o slrnface slrnface.c $(LDFLAGS) -- cgit v1.2.3