Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jun 2016 09:03:55 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416708 - in head/games/columns: . files
Message-ID:  <201606110903.u5B93tgS054702@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Jun 11 09:03:55 2016
New Revision: 416708
URL: https://svnweb.freebsd.org/changeset/ports/416708

Log:
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/games/columns/Makefile
  head/games/columns/files/patch-columns.cc
  head/games/columns/files/patch-configure

Modified: head/games/columns/Makefile
==============================================================================
--- head/games/columns/Makefile	Sat Jun 11 08:58:45 2016	(r416707)
+++ head/games/columns/Makefile	Sat Jun 11 09:03:55 2016	(r416708)
@@ -28,9 +28,11 @@ post-configure:
 	@${REINPLACE_CMD} -e '/chmod 0666/d' ${WRKSRC}/Makefile
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}/var/games
 	${MV} ${STAGEDIR}${DATADIR}/columns.hsc ${STAGEDIR}/var/games/columns.hsc.sample
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>

Modified: head/games/columns/files/patch-columns.cc
==============================================================================
--- head/games/columns/files/patch-columns.cc	Sat Jun 11 08:58:45 2016	(r416707)
+++ head/games/columns/files/patch-columns.cc	Sat Jun 11 09:03:55 2016	(r416708)
@@ -1,5 +1,5 @@
---- columns.cc.orig	2000-03-17 03:52:55.000000000 +0300
-+++ columns.cc	2014-12-02 05:13:18.850698698 +0300
+--- columns.cc.orig	2000-03-17 00:52:55 UTC
++++ columns.cc
 @@ -22,10 +22,9 @@
  #include <stdarg.h>
  #include <stdio.h>
@@ -12,7 +12,7 @@
  
  #define HIGHSCORE_X 10
  #define HIGHSCORE_Y 30
-@@ -269,6 +268,7 @@
+@@ -269,6 +268,7 @@ Font *load_font(const char *fname)
      for (int i=0; i<256; i++) {
  	data[i] = NULL;
  	fnt->w[i] = fnt->h[i]= fnt->x[i] = 0;
@@ -20,7 +20,7 @@
      }
    
      // read character chunks one by one
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ highscore_entry highscore[HIGHSCORE_ENTR
  
  void highscore_save()
  {
@@ -29,7 +29,7 @@
      FILE *fp = fopen(fname,"wb");
      if (fp != NULL) {
  	for (int i=0; i<HIGHSCORE_ENTRIES; i++)
-@@ -369,7 +369,7 @@
+@@ -369,7 +369,7 @@ void highscore_save()
  void highscore_load()
  {
      char line[30];
@@ -38,7 +38,7 @@
      FILE *fp = fopen(fname,"rb");
      if (fp != NULL) {
  	for (int i=0; i<HIGHSCORE_ENTRIES; i++) {
-@@ -1365,6 +1365,7 @@
+@@ -1365,6 +1365,7 @@ void eval_args(int argc, char **argv)
      }
  }
  

Modified: head/games/columns/files/patch-configure
==============================================================================
--- head/games/columns/files/patch-configure	Sat Jun 11 08:58:45 2016	(r416707)
+++ head/games/columns/files/patch-configure	Sat Jun 11 09:03:55 2016	(r416708)
@@ -1,6 +1,6 @@
---- configure.orig	Fri Mar 17 08:33:59 2000
-+++ configure	Sat Oct 28 03:23:44 2000
-@@ -1292,6 +1292,7 @@
+--- configure.orig	2000-03-16 23:33:59 UTC
++++ configure
+@@ -1292,6 +1292,7 @@ rm -f conftest*
    rm -f conf.sdltest
  
  CFLAGS="$CFLAGS $SDL_CFLAGS"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606110903.u5B93tgS054702>