aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-04-29 17:30:33 +0800
committervs <vs@FreeBSD.org>2005-04-29 17:30:33 +0800
commita408c583839d7e0c886d3077d0b304e8849717ed (patch)
treed56dc9f86dcb6c8e38a21e1744f6a31938e6a091
parentab01754ae814671ecd2c5313a22166248dcf50cd (diff)
downloadfreebsd-ports-gnome-a408c583839d7e0c886d3077d0b304e8849717ed.tar.gz
freebsd-ports-gnome-a408c583839d7e0c886d3077d0b304e8849717ed.tar.zst
freebsd-ports-gnome-a408c583839d7e0c886d3077d0b304e8849717ed.zip
Use MAKE_ARGS, MAKEFILE
-rw-r--r--games/oonsoo/Makefile7
-rw-r--r--games/oonsoo/files/patch-aa23
2 files changed, 4 insertions, 26 deletions
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index 2835bc5b572a..66c277704943 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -16,9 +16,10 @@ COMMENT= A solitaire card game for X
PLIST_FILES= bin/oonsoo
USE_XLIB= yes
-
-pre-patch:
- @${CP} ${WRKSRC}/Makefile.Linux ${WRKSRC}/Makefile
+MAKEFILE= Makefile.Linux
+MAKE_ARGS= CC="${CXX}" CPPFLAGS="${CXXFLAGS} -ansi" \
+ SYS_INCLUDE="-I${X11BASE}/include" \
+ SYS_LIBS="-L${X11BASE}/lib -lX11"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/oonsoo ${PREFIX}/bin
diff --git a/games/oonsoo/files/patch-aa b/games/oonsoo/files/patch-aa
deleted file mode 100644
index f337d33ce630..000000000000
--- a/games/oonsoo/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig Thu Feb 24 03:29:29 2000
-+++ Makefile Thu Feb 24 03:42:58 2000
-@@ -6,16 +6,16 @@
- ###############################################################################
-
- ## C++ compiler to use
--CC=g++
-+CC = ${CXX}
-
- ## C++ compiler flags
--CPPFLAGS=-O -ansi
-+CPPFLAGS = ${CXXFLAGS} -ansi
-
- ## System Includes
--SYS_INCLUDES =
-+SYS_INCLUDE = -I${X11BASE}/include
-
- ## System Libraries
--SYS_LIBS = -L/usr/X11R6/lib -lX11
-+SYS_LIBS = -L${X11BASE}/lib -lX11
-
- ## Archiver
- AR=ar