svn commit: r349620 - in head/games/xvier: . files

Rusmir Dusko nemysis at FreeBSD.org
Sun Mar 30 13:59:09 UTC 2014 

Author: nemysis
Date: Sun Mar 30 13:59:07 2014
New Revision: 349620
URL: http://svnweb.freebsd.org/changeset/ports/349620
QAT: https://qat.redports.org/buildarchive/r349620/

Log:
  - Bump PORTREVISION
  - Change master sites, add icon
  - Take maintainership
  - Remove DEPRECATED, EXPIRATION_DATE
  - Add USE_CSTD=gnu89
  - Support STAGEDIR
  - Use PLIST_FILES instead of pkg-plist
  - Add Desktop entry file
  - Fix install with stage, use do-install
  - Recreate patch with make makepatch, remove obsolete changes
  - Add patches, fix bad C code
  - Change pkg-descr

Added:
  head/games/xvier/files/patch-Imakefile   (contents, props changed)
  head/games/xvier/files/patch-vier.c   (contents, props changed)
  head/games/xvier/files/patch-vier.h   (contents, props changed)
  head/games/xvier/files/patch-vierinit.c   (contents, props changed)
  head/games/xvier/files/patch-xvier.c   (contents, props changed)
Deleted:
  head/games/xvier/files/patch-aa
  head/games/xvier/pkg-plist
Modified:
  head/games/xvier/Makefile
  head/games/xvier/distinfo
  head/games/xvier/pkg-descr

Modified: head/games/xvier/Makefile
==============================================================================
--- head/games/xvier/Makefile	Sun Mar 30 13:47:39 2014	(r349619)
+++ head/games/xvier/Makefile	Sun Mar 30 13:59:07 2014	(r349620)
@@ -3,33 +3,45 @@
 
 PORTNAME=	xvier
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	games/strategy
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	SUNSITE/games/strategy \
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
+DISTFILES=	${PORTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
 EXTRACT_SUFX=	.tar.Z
+EXTRACT_ONLY=	${PORTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	Throw stones into free columns
 
-DEPRECATED=	Unmaintained since 2000
-EXPIRATION_DATE=	2014-04-11
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		imake
 USE_XORG=	x11 xext
-MAN6=		xvier.6
-
-NO_STAGE=	yes
+USE_CSTD=	gnu89
 
+PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+PLIST_FILES=	bin/${PORTNAME} \
+		libexec/${PORTNAME}_prog \
+		man/man6/xvier.6.gz \
+		share/pixmaps/xvier.png
+
+DESKTOP_ENTRIES="Xvier" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ""
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}_prog \
+		${STAGEDIR}${PREFIX}/libexec/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \
+		${STAGEDIR}${MAN6PREFIX}/man/man6/${PORTNAME}.6
+
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/xvier/distinfo
==============================================================================
--- head/games/xvier/distinfo	Sun Mar 30 13:47:39 2014	(r349619)
+++ head/games/xvier/distinfo	Sun Mar 30 13:59:07 2014	(r349620)
@@ -1,2 +1,4 @@
 SHA256 (xvier.tar.Z) = 196c2cd7b76075de29504794d1a5d0c583fe8a5d9ce5be06b38fe7b377f5ca76
 SIZE (xvier.tar.Z) = 61765
+SHA256 (xvier.png) = 06482a7853e82d157ff08d66c0ead123fc5fe17cae9f8e6eafdf53f87066ba80
+SIZE (xvier.png) = 3929

Added: head/games/xvier/files/patch-Imakefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xvier/files/patch-Imakefile	Sun Mar 30 13:59:07 2014	(r349620)
@@ -0,0 +1,11 @@
+--- ./Imakefile.orig	1992-07-29 02:07:09.000000000 +0200
++++ ./Imakefile	2014-03-30 13:17:18.829823790 +0200
+@@ -13,7 +13,7 @@
+ #NO_GETDTABSIZE = -DNO_GETDTABSIZE
+ 
+ #PROGNAME	= $(LIBDIR)$(PATHSEP)xvier_prog
+-PROGNAME	= /usr/games/lib/xvier_prog
++PROGNAME	= $(PREFIX)/libexec/xvier_prog
+ DEFINES		= $(XVIER_ASPECT) $(NO_FD_SET) $(NO_SELECT) \
+ 			$(NO_GETDTABSIZE) -DPROGNAME=\"$(PROGNAME)\"
+ 

Added: head/games/xvier/files/patch-vier.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xvier/files/patch-vier.c	Sun Mar 30 13:59:07 2014	(r349620)
@@ -0,0 +1,11 @@
+--- ./vier.c.orig	1992-07-29 02:04:22.000000000 +0200
++++ ./vier.c	2014-03-30 13:14:36.788587125 +0200
+@@ -1,6 +1,8 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <unistd.h>
++#include <string.h>
+ 
+ time_t time();
+ 

Added: head/games/xvier/files/patch-vier.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xvier/files/patch-vier.h	Sun Mar 30 13:59:07 2014	(r349620)
@@ -0,0 +1,8 @@
+--- ./vier.h.orig	1992-07-29 02:04:23.000000000 +0200
++++ ./vier.h	2014-03-30 13:14:36.798575126 +0200
+@@ -1,4 +1,4 @@
+-char *malloc();
++#include <stdlib.h>     /* malloc, free, rand */
+ 
+ extern int rows, columns, vnum;
+ extern int row_col, row_1_col, row_2_col;

Added: head/games/xvier/files/patch-vierinit.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xvier/files/patch-vierinit.c	Sun Mar 30 13:59:07 2014	(r349620)
@@ -0,0 +1,11 @@
+--- ./vierinit.c.orig	1992-07-29 02:04:24.000000000 +0200
++++ ./vierinit.c	2014-03-30 13:14:36.798575126 +0200
+@@ -78,7 +78,7 @@
+       pui++;
+     }
+   _p_h_ = (int *)malloc((row_col + 4 * vnum) * sizeof(int));
+-  pp = (int **)malloc(row_col * sizeof(int));
++  pp = (int **)malloc(row_col * sizeof(int *));
+   for (pui = i = 0; i < row_col; i++) {
+     pp[i] = _p_h_ + pui;
+     for (j = 0; j < vnum; j++)

Added: head/games/xvier/files/patch-xvier.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xvier/files/patch-xvier.c	Sun Mar 30 13:59:07 2014	(r349620)
@@ -0,0 +1,15 @@
+--- ./xvier.c.orig	1992-07-29 02:04:33.000000000 +0200
++++ ./xvier.c	2014-03-30 13:14:36.798575126 +0200
+@@ -5,10 +5,11 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <string.h>
+ 
+ #include "xvier.h"
+ 
+-char *malloc();
++#include <stdlib.h>     /* malloc, free, rand */
+ 
+ char *displayname = NULL, *geostring = NULL, *fontpattern = NULL;
+ int iconic = 0, level = 0;

Modified: head/games/xvier/pkg-descr
==============================================================================
--- head/games/xvier/pkg-descr	Sun Mar 30 13:47:39 2014	(r349619)
+++ head/games/xvier/pkg-descr	Sun Mar 30 13:59:07 2014	(r349620)
@@ -1,4 +1,4 @@
-   Xvier is a board game where you and the computer alternately throw
-stones  into free columns. The stones pile up in the columns, and the
-goal is to get  four  stones in a row, in a column or diagonally. You
-can choose various board sizes and levels of difficulty.
+Xvier is a board game where you and the computer alternately throw
+stones into free columns. The stones pile up in the columns, and the
+goal is to get four stones in a row, in a column or diagonally.
+You can choose various board sizes and levels of difficulty.

More information about the svn-ports-head mailing list