- Don't create "Makefile" with a patch, copy it from "files" directory.

- Use "${BSD_INSTALL_...}" instead "/usr/bin/install" with hard coded
  arguments.

3 files changed, 53 insertions, 55 deletions

diff --git a/games/craft/Makefile b/games/craft/Makefile
index 3d0f27f9e38..b564622cc13 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/08/11 22:01:46 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/08/11 22:20:56 tron Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -9,12 +9,13 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://borneo.gmd.de/~hua/
 
-WRKSRC=		${WRKDIR}
 USE_GMAKE=	yes
 USE_X11BASE=	yes
+WRKSRC=		${WRKDIR}
 
 post-extract:
 	@find ${WRKSRC} -type f -name '*~' | xargs ${RM} -f
+	@${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
 
 post-patch:
 	${RM} -f ${WRKSRC}/hcc/hcc
diff --git a/games/craft/files/Makefile b/games/craft/files/Makefile
new file mode 100644
index 00000000000..c62d9898f9e
--- /dev/null
+++ b/games/craft/files/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1 1999/08/11 22:20:57 tron Exp $
+#
+#---------------------------------------------------------------------
+#
+# The following assigns must be changed according to your system
+#
+
+GCC=gcc
+GPP=g++
+
+XLIB=${X11BASE}/lib
+CPPFLAGS=-I${X11BASE}/include -DCRAFT_DIR=\"${PREFIX}/share/craft/\"
+
+#
+#--------------------------------------------------------------------
+
+OBJ=	xtimer.o option_menu.o setupedit.o robot.o land.o ship.o building.o \
+	dir.o object_handler.o pic.o player.o field.o ilfield.o xbm.o cmap_edit.o \
+	cmap.o ppm.o compress.o table.o xmath.o io.o cry.o win.o dial.o multi_dial.o \
+	menu.o xsystem.o xfile.o ppm_handler.o errorhandling.o paramreader.o pattern_match.o \
+	objects.o xstring.o id_handler.o color_trans.o masks.o buttons.o lru.o scroller.o \
+	selector.o cmap_selector.o getline.o file_selector.o history.o craft.o
+
+CFLAGS=-O2 -fexpensive-optimizations -finline-functions
+HCC=hcc/hcc
+CMP=${HCC} -compiler ${GCC} ${CPPFLAGS} ${CFLAGS} -c
+
+LFLAGS=-Wl,-R${XLIB} -L${XLIB} -lX11 -lm -lcompat
+
+all: craft
+
+craft: ${OBJ}
+	${GPP} ${OBJ} ${CPPFLAGS} -o craft ${LFLAGS}
+
+%.o: %.cc
+	${CMP} $*
+
+%.o: %.hc
+	${CMP} $*
+
+${OBJ}: hcc/hcc
+
+install: craft
+	${BSD_INSTALL_PROGRAM} craft ${PREFIX}/bin
+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/craft
+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/craft
+	cp -R hcraft ${PREFIX}/share/craft
+	cp -R buttons ${PREFIX}/share/craft
+	cp -R html/* ${PREFIX}/share/doc/craft
+	${BSD_INSTALL_DATA} .windefaults.params ${PREFIX}/share/craft
diff --git a/games/craft/patches/patch-aa b/games/craft/patches/patch-aa
deleted file mode 100644
index 660dba5bfad..00000000000
--- a/games/craft/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/10/13 00:37:33 garbled Exp $
---- /dev/null	Thu Sep 24 10:12:39 1998
-+++ Makefile	Thu Sep 24 10:34:08 1998
-@@ -0,0 +1,49 @@
-+#---------------------------------------------------------------------
-+#
-+# The following assigns must be changed according to your system
-+#
-+
-+GCC=gcc
-+GPP=g++
-+
-+XLIB=$(X11BASE)/lib
-+CPPFLAGS=-I$(X11BASE)/include -DCRAFT_DIR=\"$(PREFIX)/share/craft/\"
-+
-+#
-+#--------------------------------------------------------------------
-+
-+OBJ=	xtimer.o option_menu.o setupedit.o robot.o land.o ship.o building.o \
-+	dir.o object_handler.o pic.o player.o field.o ilfield.o xbm.o cmap_edit.o \
-+	cmap.o ppm.o compress.o table.o xmath.o io.o cry.o win.o dial.o multi_dial.o \
-+	menu.o xsystem.o xfile.o ppm_handler.o errorhandling.o paramreader.o pattern_match.o \
-+	objects.o xstring.o id_handler.o color_trans.o masks.o buttons.o lru.o scroller.o \
-+	selector.o cmap_selector.o getline.o file_selector.o history.o craft.o
-+
-+CFLAGS=-O2 -fexpensive-optimizations -finline-functions
-+HCC=hcc/hcc
-+CMP=$(HCC) -compiler $(GCC) $(CPPFLAGS) $(CFLAGS) -c
-+
-+LFLAGS=-Wl,-R$(XLIB) -L$(XLIB) -lX11 -lm -lcompat
-+
-+all: craft
-+
-+craft: $(OBJ)
-+	$(GPP) $(OBJ) $(CPPFLAGS) -o craft $(LFLAGS)
-+
-+%.o: %.cc
-+	$(CMP) $*
-+
-+%.o: %.hc
-+	$(CMP) $*
-+
-+$(OBJ): hcc/hcc
-+
-+install: craft
-+	/usr/bin/install -s -c -o bin -g bin -m 0755 craft $(PREFIX)/bin
-+	/usr/bin/install -d -o bin -g bin -m 0755 $(PREFIX)/share/craft
-+	/usr/bin/install -d -o bin -g bin -m 0755 $(PREFIX)/share/doc/craft
-+	/bin/cp -R hcraft $(PREFIX)/share/craft
-+	/bin/cp -R buttons $(PREFIX)/share/craft
-+	/bin/cp -R html/* $(PREFIX)/share/doc/craft
-+	/usr/bin/install -c -o bin -g bin -m 0644 .windefaults.params $(PREFIX)/share/craft
-+