Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Feb 2014 13:19:02 +0900 (JST)
From:      Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        turutani@scphys.kyoto-u.ac.jp
Subject:   ports/186320: stagify games/xshisen
Message-ID:  <201402010419.s114J2Ya025300@h120.65.226.10.32118.vlan.kuins.net>
Resent-Message-ID: <201402010420.s114K0OD003626@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         186320
>Category:       ports
>Synopsis:       stagify games/xshisen
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 01 04:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tsurutani Naoki
>Release:        FreeBSD 8.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 8.4-PRERELEASE FreeBSD 8.4-PRERELEASE #26 r249149: Fri Apr 5 22:13:25 JST 2013 turutani@h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386


	
>Description:
	stagify.
	
>How-To-Repeat:
	
>Fix:

diff -urN xshisen.orig/Makefile xshisen/Makefile
--- xshisen.orig/Makefile	2014-01-23 02:00:46.000000000 +0900
+++ xshisen/Makefile	2014-02-01 12:37:28.000000000 +0900
@@ -16,37 +16,25 @@
 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 -urN xshisen.orig/files/patch-Makefile.in xshisen/files/patch-Makefile.in
--- xshisen.orig/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ xshisen/files/patch-Makefile.in	2014-02-01 12:31:23.000000000 +0900
@@ -0,0 +1,40 @@
+--- Makefile.in.orig	2002-07-10 12:16:48.000000000 +0900
++++ Makefile.in	2014-02-01 12:30:46.000000000 +0900
+@@ -53,24 +53,24 @@
+ 
+ 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)
++#	@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 -urN xshisen.orig/pkg-plist xshisen/pkg-plist
--- xshisen.orig/pkg-plist	2014-01-23 00:16:56.000000000 +0900
+++ xshisen/pkg-plist	2014-02-01 12:33:17.000000000 +0900
@@ -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 @@
 %%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%%
	


>Release-Note:
>Audit-Trail:
>Unformatted:



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