4 files changed, 60 insertions, 22 deletions

diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index c656b0c97740..d0b605321fc1 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -16,37 +16,25 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sharedstatedir="${DATADIR}"
 INSTALL_TARGET=	install-prog
 
-MANLANG=	"" ja
-MAN6=		xshisen.6
-
 .if !defined(WITHOUT_MOTIF)
 USES=		motif
 CONFIGURE_ARGS+=	--with-motif
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|XSHISEN_VERSION|${PORTVERSION}|g' ${WRKSRC}/lang/XShisen.ad*
 
 post-install:
-	@${CHOWN} root:games ${PREFIX}/bin/xshisen
-	@${CHMOD} 2555 ${PREFIX}/bin/xshisen
-	@${CHOWN} root:games ${DATADIR}/xshisen.scores
-	@${CHMOD} 0660 ${DATADIR}/xshisen.scores
 	${INSTALL_MAN} ${WRKSRC}/man/xshisen.6 \
-		${MAN6PREFIX}/man/man6/xshisen.6
+		${STAGEDIR}${MAN6PREFIX}/man/man6/xshisen.6
 	${INSTALL_MAN} ${WRKSRC}/man/xshisen.6.ja_JP.eucJP \
-		${MAN6PREFIX}/man/ja/man6/xshisen.6
-	@${MKDIR} ${PREFIX}/lib/X11/app-defaults
+		${STAGEDIR}${MAN6PREFIX}/man/ja/man6/xshisen.6
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
 	${INSTALL_DATA} ${WRKSRC}/lang/XShisen.ad \
-		${PREFIX}/lib/X11/app-defaults/XShisen
-	@${MKDIR} ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults
+		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XShisen
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults
 	${INSTALL_DATA} ${WRKSRC}/lang/XShisen.ad.ja_JP.eucJP \
-		${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/XShisen
-	-${TEST} -d ${PREFIX}/lib/X11/ja_JP.EUC/ -a \
-	      -d ${PREFIX}/lib/X11/ja_JP.EUC/app-defaults && \
-		${LN} -s ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/XShisen \
-			${PREFIX}/lib/X11/ja_JP.EUC/app-defaults || ${TRUE}
+		${STAGEDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/XShisen
 
 .include <bsd.port.mk>
diff --git a/games/xshisen/files/patch-Makefile.in b/games/xshisen/files/patch-Makefile.in
new file mode 100644
index 000000000000..37694a3520f0
--- /dev/null
+++ b/games/xshisen/files/patch-Makefile.in
@@ -0,0 +1,41 @@
+--- 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 @@
+ 
+ install-prog: $(PROGS)
+ 	@echo "XShisen executable directory is " $(bindir)
+-	@$(MKDIR) $(bindir)
+-	@chmod 755 $(bindir)
+-	$(INSTALLP) $(PROGS) $(bindir)/$(PROGS)
++#	@$(MKDIR) $(bindir)
++#	@chmod 755 $(bindir)
++	$(INSTALLP) $(PROGS) $(DESTDIR)$(bindir)/$(PROGS)
+ 	@echo "XShisen data directory is " $(XSHISENLIB)
+-	@$(MKDIR) $(XSHISENDAT)
+-	@chmod 755 $(XSHISENDAT)
+-	@if [ -f $(XSHISENDAT)/$(SCF) ]; then \
+-	echo "Old high-score file exists."; \
+-	else\
+-	$(INSTALL) -m 0666 $(SCF) $(XSHISENDAT)/$(SCF); \
+-	fi
+-	@$(MKDIR) $(XSHISENLIB)
++	@$(MKDIR) $(DESTDIR)$(XSHISENDAT)
++	@chmod 755 $(DESTDIR)$(XSHISENDAT)
++	$(INSTALL) -m 0666 $(SCF) $(DESTDIR)$(XSHISENDAT)/$(SCF)
++#	@if [ -f $(XSHISENDAT)/$(SCF) ]; then \
++#	echo "Old high-score file exists."; \
++#	else\
++#	$(INSTALL) -m 0666 $(SCF) $(DESTDIR)$(XSHISENDAT)/$(SCF); \
++#	fi
++	@$(MKDIR) $(DESTDIR)$(XSHISENLIB)
+ 	@set -x; \
+ 	for dir in pixmaps/s?; do \
+ 		dn=`basename $$dir`; \
+-		$(MKDIR) $(XSHISENLIB)/$$dn; \
++		$(MKDIR) $(DESTDIR)$(XSHISENLIB)/$$dn; \
+ 		for file in $$dir/*.xpm; do \
+-			fn=$(XSHISENLIB)/$$dn/`basename $$file`; \
++			fn=$(DESTDIR)$(XSHISENLIB)/$$dn/`basename $$file`; \
+ 			$(INSTALLD) $$file $$fn; \
+ 		done; \
+ 	done
diff --git a/games/xshisen/pkg-descr b/games/xshisen/pkg-descr
index ade7f587dc06..dd06b4f660ab 100644
--- a/games/xshisen/pkg-descr
+++ b/games/xshisen/pkg-descr
@@ -1,6 +1,5 @@
 xshisen - Shisen-sho puzzle game for X11
 
-
-       xshisen  is  a puzzle game for X11.  Similar to the famous
-       "Shang-hai", your objective is to remove all the pieces on
-       the board.
+xshisen is a puzzle game for X11.Similar to the famous
+"Shang-hai", your objective is to remove all the pieces on
+the board.
diff --git a/games/xshisen/pkg-plist b/games/xshisen/pkg-plist
index df3786b4af00..cdc73db4a72d 100644
--- a/games/xshisen/pkg-plist
+++ b/games/xshisen/pkg-plist
@@ -1,4 +1,8 @@
+@group games
+@mode 2555
 bin/xshisen
+@group
+@mode
 lib/X11/app-defaults/XShisen
 lib/X11/ja_JP.eucJP/app-defaults/XShisen
 %%DATADIR%%/s1/chun.xpm
@@ -73,7 +77,13 @@ lib/X11/ja_JP.eucJP/app-defaults/XShisen
 %%DATADIR%%/s2/s9.xpm
 %%DATADIR%%/s2/sha.xpm
 %%DATADIR%%/s2/ton.xpm
+@group games
+@mode 0660
 %%DATADIR%%/xshisen.scores
+@group
+@mode
+man/man6/xshisen.6.gz
+man/ja/man6/xshisen.6.gz
 @dirrm %%DATADIR%%/s2
 @dirrm %%DATADIR%%/s1
 @dirrm %%DATADIR%%