Hi ports --
The attached patch switches games/cgames from using gmake to build to
make. Lets us remove an old-school perl -pi -e replacement line.
Re-take MAINTAINER, since this port was originally my fault.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/cgames/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 25 Aug 2015 13:18:26 -0000 1.3
+++ Makefile 4 Nov 2017 21:42:48 -0000
@@ -5,9 +5,10 @@ PORTROACH = limit:.*[^a]$$
COMMENT = free console games suite
DISTNAME = cgames-2.2a
CATEGORIES = games
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://www.muppetlabs.com/~breadbox/software/cgames.html
+MAINTAINER = Brian Callahan <bcal...@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@@ -21,15 +22,10 @@ CONFIGURE_ARGS = --datarootdir="${LOCALB
--disable-mouse \
--with-ncurses
-USE_GMAKE = Yes
-
FAKE_FLAGS = bindir="${DESTDIR}${PREFIX}/bin" \
datadir="${DESTDIR}${PREFIX}/share/cgames" \
mandir="${DESTDIR}${PREFIX}/man"
NO_TEST = Yes
-
-pre-configure:
- perl -pi -e "s,make,${GMAKE},g" ${WRKSRC}/Makefile
.include <bsd.port.mk>
Index: patches/patch-cblocks_Makefile_in
===================================================================
RCS file: /cvs/ports/games/cgames/patches/patch-cblocks_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-cblocks_Makefile_in
--- patches/patch-cblocks_Makefile_in 1 Dec 2014 23:12:08 -0000 1.1.1.1
+++ patches/patch-cblocks_Makefile_in 4 Nov 2017 21:42:48 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-cblocks_Makefile_in,v 1.1.1.1 2014/12/01 23:12:08 bcallah Exp $
---- cblocks/Makefile.in.orig Sun Nov 30 22:38:49 2014
-+++ cblocks/Makefile.in Sun Nov 30 22:39:23 2014
-@@ -33,8 +33,8 @@ install: cblocks
+Index: cblocks/Makefile.in
+--- cblocks/Makefile.in.orig
++++ cblocks/Makefile.in
+@@ -22,6 +22,7 @@ LOADLIBES =@LOADLIBES@@MOUSELIBS@
+ OBJS = cblocks.o movelist.o parse.o fileread.o answers.o play.o dirio.o userio.o
+
+ cblocks: $(OBJS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LOADLIBES)
+
+ clean:
+ rm -f $(OBJS) cblocks
+@@ -33,8 +34,8 @@ install: cblocks
install -c ./cblocks $(bindir)/cblocks
install -d $(mandir)/man6
install -c ./cblocks.6 $(mandir)/man6/cblocks.6
Index: patches/patch-cmines_Makefile_in
===================================================================
RCS file: patches/patch-cmines_Makefile_in
diff -N patches/patch-cmines_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmines_Makefile_in 4 Nov 2017 21:42:48 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: cmines/Makefile.in
+--- cmines/Makefile.in.orig
++++ cmines/Makefile.in
+@@ -21,6 +21,7 @@ LOADLIBES =@LOADLIBES@@MOUSELIBS@
+ OBJS = cmines.o userio.o
+
+ cmines: $(OBJS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LOADLIBES)
+
+ clean:
+ rm -f $(OBJS) cmines
Index: patches/patch-csokoban_Makefile_in
===================================================================
RCS file: /cvs/ports/games/cgames/patches/patch-csokoban_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-csokoban_Makefile_in
--- patches/patch-csokoban_Makefile_in 1 Dec 2014 23:12:08 -0000 1.1.1.1
+++ patches/patch-csokoban_Makefile_in 4 Nov 2017 21:42:48 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-csokoban_Makefile_in,v 1.1.1.1 2014/12/01 23:12:08 bcallah Exp $
---- csokoban/Makefile.in.orig Sun Nov 30 22:39:33 2014
-+++ csokoban/Makefile.in Sun Nov 30 22:39:51 2014
-@@ -32,8 +32,8 @@ install: csokoban
+Index: csokoban/Makefile.in
+--- csokoban/Makefile.in.orig
++++ csokoban/Makefile.in
+@@ -21,6 +21,7 @@ LOADLIBES =@LOADLIBES@
+ OBJS = csokoban.o movelist.o fileread.o answers.o play.o dirio.o userio.o
+
+ csokoban: $(OBJS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LOADLIBES)
+
+ clean:
+ rm -f $(OBJS) csokoban
+@@ -32,8 +33,8 @@ install: csokoban
install -c ./csokoban $(bindir)/csokoban
install -d $(mandir)/man6
install -c ./csokoban.6 $(mandir)/man6/csokoban.6
