diff -urN /usr/ports/games/xshisen/Makefile games/xshisen/Makefile
--- /usr/ports/games/xshisen/Makefile	2016-06-04 03:44:59.740048000 +0900
+++ games/xshisen/Makefile	2016-07-04 00:00:00.000000000 +0900
@@ -10,19 +10,19 @@
 MAINTAINER=	TsurutaniNaoki@gmail.com
 COMMENT=	Shisen-sho puzzle game for X11
 
-BROKEN=		fails to start
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sharedstatedir="${DATADIR}"
 INSTALL_TARGET=	install-prog
 
-.if !defined(WITHOUT_MOTIF)
-USES=		motif
-CONFIGURE_ARGS+=	--with-motif
-.endif
+OPTIONS_DEFINE=		MOTIF
+OPTIONS_DEFAULT=	MOTIF
+
+MOTIF_USES=		motif
+MOTIF_CONFIGURE_WITH=	motif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff -urN /usr/ports/games/xshisen/files/patch-Makefile.in games/xshisen/files/patch-Makefile.in
--- /usr/ports/games/xshisen/files/patch-Makefile.in	2015-08-24 04:05:02.276179000 +0900
+++ games/xshisen/files/patch-Makefile.in	2016-07-04 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2002-07-10 05:16:48.000000000 +0200
-+++ Makefile.in	2014-02-02 12:37:24.889535933 +0100
-@@ -53,24 +53,25 @@
+--- Makefile.in.orig	2002-07-10 03:16:48 UTC
++++ Makefile.in
+@@ -53,24 +53,25 @@ install: install-resource install-prog
  
  install-prog: $(PROGS)
  	@echo "XShisen executable directory is " $(bindir)
diff -urN /usr/ports/games/xshisen/files/patch-body.C games/xshisen/files/patch-body.C
--- /usr/ports/games/xshisen/files/patch-body.C	1970-01-01 09:00:00.000000000 +0900
+++ games/xshisen/files/patch-body.C	2016-07-04 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- body.C.orig	2002-07-07 07:22:35 UTC
++++ body.C
+@@ -227,7 +227,7 @@ Body::refreshhint(void)
+     p = new Point[max_c][2];
+     t = new Point[xsize*ysize/PKIND];
+ 
+-    if (hintNum == 0)
++    if (hintNum != 0)
+         delete[] hintArray;
+     for(int i=0; i<PKIND; i++) {
+         piepos[i]->GetPosArray(t, num);
diff -urN /usr/ports/games/xshisen/files/patch-components.h games/xshisen/files/patch-components.h
--- /usr/ports/games/xshisen/files/patch-components.h	2015-08-24 04:05:02.239715000 +0900
+++ games/xshisen/files/patch-components.h	2016-07-04 00:00:00.000000000 +0900
@@ -1,5 +1,5 @@
---- components.h.orig	2002-07-07 16:34:23.000000000 +0900
-+++ components.h	2011-12-07 11:31:45.000000000 +0900
+--- components.h.orig	2002-07-07 07:34:23 UTC
++++ components.h
 @@ -61,6 +61,8 @@
  #define HNUM  (PKIND*2)      // Number of pairs to pick up
  #define SCORENUM  10         // Number of people to register in high-score
@@ -9,4 +9,3 @@
  
  class Timer {
  private:
-
diff -urN /usr/ports/games/xshisen/files/patch-main.c games/xshisen/files/patch-main.c
--- /usr/ports/games/xshisen/files/patch-main.c	2015-08-24 04:05:02.288375000 +0900
+++ games/xshisen/files/patch-main.c	2016-07-04 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
---- main.C.orig	2002-07-07 16:33:55.000000000 +0900
-+++ main.C	2011-12-07 11:56:13.000000000 +0900
-@@ -210,7 +210,7 @@
+--- main.C.orig	2002-07-07 07:33:55 UTC
++++ main.C
+@@ -210,7 +210,7 @@ kanjiconvert(const char *operation)
      char buffer[100], *p;
      char *(*codeconv)(const char*);
  
@@ -9,4 +9,3 @@
      if (strchr(buffer, '-') == NULL) {
          strcat(buffer, "-" KANJICODE);
      }
-
diff -urN /usr/ports/games/xshisen/files/patch-readxpm.C games/xshisen/files/patch-readxpm.C
--- /usr/ports/games/xshisen/files/patch-readxpm.C	2015-08-24 04:05:02.253721000 +0900
+++ games/xshisen/files/patch-readxpm.C	2016-07-04 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
---- readxpm.C.orig	Sun Jul  7 01:34:47 2002
-+++ readxpm.C	Thu Sep 15 13:56:38 2005
-@@ -12,7 +12,7 @@
+--- readxpm.C.orig	2002-07-06 16:34:47 UTC
++++ readxpm.C
+@@ -12,7 +12,7 @@ InitGlobalMahjong(Widget w, const char *
    char buffer[1024];
  
    for(int i=0; i<PKIND; i++) {
diff -urN /usr/ports/games/xshisen/files/patch-score.c games/xshisen/files/patch-score.c
--- /usr/ports/games/xshisen/files/patch-score.c	2015-08-24 04:05:02.245719000 +0900
+++ games/xshisen/files/patch-score.c	2016-07-04 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
---- score.C.orig	2002-06-16 00:20:30.000000000 +0900
-+++ score.C	2011-12-14 16:34:35.000000000 +0900
-@@ -73,7 +73,7 @@
+--- score.C.orig	2002-06-15 15:20:30 UTC
++++ score.C
+@@ -73,7 +73,7 @@ ScoreRecord::ReadField(FILE *fp, int kan
      date[8] = '\0';
      strncpy(time, &buffer[53], 8);
      time[8] = '\0';
@@ -9,7 +9,7 @@
          for(int i=1; i<8; i++) {
              date[i-1] = date[i];
          }
-@@ -372,12 +372,12 @@
+@@ -372,12 +372,12 @@ Score::Register(void)
      time_t t;
      struct tm *tp;
      struct passwd *pw;
@@ -24,4 +24,3 @@
      if ((po = strchr(gecos, ',')) != NULL)
          *po = 0;
      sprintf(namebuf, "%-8.8s (%s)", pw->pw_name, gecos);
-