From owner-freebsd-ports Tue Jun 24 22:20:05 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id WAA01680 for ports-outgoing; Tue, 24 Jun 1997 22:20:05 -0700 (PDT) Received: (from gnats@localhost) by hub.freebsd.org (8.8.5/8.8.5) id WAA01643; Tue, 24 Jun 1997 22:20:02 -0700 (PDT) Date: Tue, 24 Jun 1997 22:20:02 -0700 (PDT) Message-Id: <199706250520.WAA01643@hub.freebsd.org> To: freebsd-ports Cc: From: Yukihiro Nakai Subject: ports/2905: Fixed port: xshisen-1.36 Reply-To: Yukihiro Nakai Sender: owner-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk The following reply was made to PR ports/2905; it has been noted by GNATS. From: Yukihiro Nakai To: freebsd-gnats-submit@freebsd.org, max@freebsd.org Cc: nakai@elelab.nsc.co.jp Subject: ports/2905: Fixed port: xshisen-1.36 Date: Wed, 25 Jun 1997 14:13:49 +0900 Here is the diff -ruN result, thanx. --------CUT HERE --- CUT HERE ----------------- diff -ruN xshisen.orig/Makefile xshisen/Makefile --- xshisen.orig/Makefile Mon Jun 23 12:13:27 1997 +++ xshisen/Makefile Mon Jun 23 12:14:00 1997 @@ -1,33 +1,25 @@ # New ports collection makefile for: xshisen -# Version required: 1.35 +# Version required: 1.36 # Date created: 9 Oct 1996 # Whom: Yukihiro Nakai # # $Id: Makefile,v 1.6 1997/03/06 04:54:41 asami Exp $ # -DISTNAME= xshisen-1.35 +DISTNAME= xshisen-1.36 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= games +MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1996/feb/ MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm -# runs fine on ssh connection -#IS_INTERACTIVE= YES # Has to create an app-defaults file USE_X11= YES -GNU_CONFIGURE= YES -#CONFIGURE_ARGS=--enable-japanese=euc #Japanese char set euc, jis sjis +HAS_CONFIGURE= YES MAN6= xshisen.6 post-install: - @ strip ${PREFIX}/bin/xshisen - @ /bin/chmod 755 ${PREFIX}/bin/xshisen - @ /usr/sbin/chown ${BINOWN}.${BINGRP} ${PREFIX}/bin/xshisen -.if !defined(NOMANCOMPRESS) - gzip -9nf ${PREFIX}/man/ja_JP.JIS7/man6/xshisen.6 -.endif + ${MKDIR} ${PREFIX}/man/man6 + (cd ${WRKSRC}; make install.man) .include diff -ruN xshisen.orig/files/md5 xshisen/files/md5 --- xshisen.orig/files/md5 Mon Jun 23 12:13:27 1997 +++ xshisen/files/md5 Tue Mar 4 23:46:40 1997 @@ -1 +1 @@ -MD5 (xshisen-1.35.tar.gz) = 36c979ccb5b958b6ae1f3807a26ffabd +MD5 (xshisen-1.36.tar.gz) = 3c3904ff99075012201a2f6a8d6a5beb diff -ruN xshisen.orig/patches/patch-aa xshisen/patches/patch-aa --- xshisen.orig/patches/patch-aa Mon Jun 23 12:13:27 1997 +++ xshisen/patches/patch-aa Sat Feb 22 14:12:41 1997 @@ -1,51 +1,69 @@ -*** Makefile.in.orig Tue Jan 23 08:35:21 1996 ---- Makefile.in Fri Oct 11 08:19:53 1996 +*** configure.orig Tue Feb 27 21:29:29 1996 +--- configure Sat Feb 22 23:12:20 1997 *************** -*** 39,52 **** - SCF = xshisen-scores +*** 9,17 **** - LIBS = @LIBS@ -! CODECONV = ./$(exec_name) -KCONV jis + # Defaults: + ac_help= +! ac_default_prefix=/usr/local + # Any additions from configure.in: +! ac_default_prefix=/usr/local + ac_help="$ac_help + --with-x use the X Window System" + ac_help="$ac_help +--- 9,17 ---- + + # Defaults: + ac_help= +! ac_default_prefix=/usr/X11R6 + # Any additions from configure.in: +! ac_default_prefix=/usr/X11R6 + ac_help="$ac_help + --with-x use the X Window System" + ac_help="$ac_help +*************** +*** 53,59 **** + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +! datadir='${prefix}/share' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +--- 53,59 ---- + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +! datadir='${prefix}/lib/X11' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +*************** +*** 1577,1589 **** - all: $(PROGS) - $(exec_name): $(OBJS) - $(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(exec_name) + # Check whether --enable-japanese or --disable-japanese was given. +! if test "${enable_japanese+set}" = set; then +! enableval="$enable_japanese" +! cat >> confdefs.h <> confdefs.h <<\EOF +--- 1577,1589 ---- - $(exec_name): $(OBJS) - $(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(exec_name) -! install: $(PROGS) $(AD) $(ADJ) install.man - @echo "XShisen executable directory is " $(bindir) - @$(MKDIR) $(bindir) - @chmod 755 $(bindir) -*************** -*** 63,73 **** ---- 63,77 ---- - for file in pixmaps/*.xpm; do \ - $(INSTALLD) $$file $(XSHISENLIB)/`basename $$file`; \ - done -+ @$(MKDIR) $(XAD_DIR)/$(class_name) -+ @$(MKDIR) $(JXAD_DIR)/$(class_name) - $(INSTALLD) $(AD) $(XAD_DIR)/$(class_name) - $(INSTALLD) $(ADJ) $(JXAD_DIR)/$(class_name) - - install.man: $(exec_name).jman $(exec_name).man -+ mkdir -p $(MANDIR)/man6 - $(INSTALLD) $(exec_name).man $(MANDIR)/man6/$(exec_name).6 -+ mkdir -p $(MANDIR)/$(JAPANESE)/man6 - $(INSTALLD) $(exec_name).jman $(MANDIR)/$(JAPANESE)/man6/$(exec_name).6 + # Check whether --enable-japanese or --disable-japanese was given. +! #if test "${enable_japanese+set}" = set; then +! # enableval="$enable_japanese" +! # cat >> confdefs.h <> confdefs.h <<\EOF diff -ruN xshisen.orig/patches/patch-ab xshisen/patches/patch-ab --- xshisen.orig/patches/patch-ab Thu Jan 1 00:00:00 1970 +++ xshisen/patches/patch-ab Sat Feb 22 15:00:28 1997 @@ -0,0 +1,88 @@ +*** Makefile.in.orig Sat Feb 22 23:58:47 1997 +--- Makefile.in Sun Feb 23 00:00:03 1997 +*************** +*** 35,52 **** + common.o gamesize.o kconv.o nonstandard.o + PROGS = $(exec_name) + AD = XShisen.ad +! ADJ = XShisen-j.ad + SCF = xshisen-scores + + LIBS = @LIBS@ +! CODECONV = ./$(exec_name) -KCONV jis + + all: $(PROGS) + + $(exec_name): $(OBJS) + $(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(exec_name) + +! install: $(PROGS) $(AD) $(ADJ) + @echo "XShisen executable directory is " $(bindir) + @$(MKDIR) $(bindir) + @chmod 755 $(bindir) +--- 35,53 ---- + common.o gamesize.o kconv.o nonstandard.o + PROGS = $(exec_name) + AD = XShisen.ad +! #ADJ = XShisen-j.ad + SCF = xshisen-scores + + LIBS = @LIBS@ +! #CODECONV = ./$(exec_name) -KCONV jis +! CODECONV = cat + + all: $(PROGS) + + $(exec_name): $(OBJS) + $(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(exec_name) + +! install: $(PROGS) $(AD) # $(ADJ) + @echo "XShisen executable directory is " $(bindir) + @$(MKDIR) $(bindir) + @chmod 755 $(bindir) +*************** +*** 64,84 **** + $(INSTALLD) $$file $(XSHISENLIB)/`basename $$file`; \ + done + $(INSTALLD) $(AD) $(XAD_DIR)/$(class_name) +! $(INSTALLD) $(ADJ) $(JXAD_DIR)/$(class_name) + +! install.man: $(exec_name).jman $(exec_name).man + $(INSTALLD) $(exec_name).man $(MANDIR)/man6/$(exec_name).6 +! $(INSTALLD) $(exec_name).jman $(MANDIR)/$(JAPANESE)/man6/$(exec_name).6 + + clean: + rm -f *.o $(PROGS) $(AD) $(ADJ) $(exec_name).jman + distclean: clean + rm -f config.log config.cache config.status config.h Makefile + +! $(exec_name).jman: $(exec_name) xshisen.jman-jis + $(CODECONV) < xshisen.jman-jis > $(exec_name).jman + +! $(ADJ): $(exec_name) XShisen-j.ad.ad + $(CODECONV) < XShisen-j.ad.ad > XShisen-j.ad + + $(AD): $(exec_name) XShisen.ad.ad +--- 65,86 ---- + $(INSTALLD) $$file $(XSHISENLIB)/`basename $$file`; \ + done + $(INSTALLD) $(AD) $(XAD_DIR)/$(class_name) +! # $(INSTALLD) $(ADJ) $(JXAD_DIR)/$(class_name) + +! #install.man: $(exec_name).jman $(exec_name).man +! install.man: $(exec_name).man + $(INSTALLD) $(exec_name).man $(MANDIR)/man6/$(exec_name).6 +! # $(INSTALLD) $(exec_name).jman $(MANDIR)/$(JAPANESE)/man6/$(exec_name).6 + + clean: + rm -f *.o $(PROGS) $(AD) $(ADJ) $(exec_name).jman + distclean: clean + rm -f config.log config.cache config.status config.h Makefile + +! #$(exec_name).jman: $(exec_name) xshisen.jman-jis + $(CODECONV) < xshisen.jman-jis > $(exec_name).jman + +! #$(ADJ): $(exec_name) XShisen-j.ad.ad + $(CODECONV) < XShisen-j.ad.ad > XShisen-j.ad + + $(AD): $(exec_name) XShisen.ad.ad diff -ruN xshisen.orig/pkg/PLIST xshisen/pkg/PLIST --- xshisen.orig/pkg/PLIST Mon Jun 23 12:13:27 1997 +++ xshisen/pkg/PLIST Tue Mar 4 23:57:55 1997 @@ -1,43 +1,39 @@ bin/xshisen -share/xshisen/xshisen-scores -share/xshisen/chun.xpm -share/xshisen/haku.xpm -share/xshisen/hana.xpm -share/xshisen/hatsu.xpm -share/xshisen/hishi.xpm -share/xshisen/m1.xpm -share/xshisen/m2.xpm -share/xshisen/m3.xpm -share/xshisen/m4.xpm -share/xshisen/m5.xpm -share/xshisen/m6.xpm -share/xshisen/m7.xpm -share/xshisen/m8.xpm -share/xshisen/m9.xpm -share/xshisen/nan.xpm -share/xshisen/p1.xpm -share/xshisen/p2.xpm -share/xshisen/p3.xpm -share/xshisen/p4.xpm -share/xshisen/p5.xpm -share/xshisen/p6.xpm -share/xshisen/p7.xpm -share/xshisen/p8.xpm -share/xshisen/p9.xpm -share/xshisen/pei.xpm -share/xshisen/s1.xpm -share/xshisen/s2.xpm -share/xshisen/s3.xpm -share/xshisen/s4.xpm -share/xshisen/s5.xpm -share/xshisen/s6.xpm -share/xshisen/s7.xpm -share/xshisen/s8.xpm -share/xshisen/s9.xpm -share/xshisen/sha.xpm -share/xshisen/ton.xpm -lib/X11/app-defaults/XShisen/XShisen.ad -lib/X11/ja_JP.JIS7/app-defaults/XShisen/XShisen-j.ad +lib/X11/xshisen/xshisen-scores +lib/X11/xshisen/chun.xpm +lib/X11/xshisen/haku.xpm +lib/X11/xshisen/hana.xpm +lib/X11/xshisen/hatsu.xpm +lib/X11/xshisen/hishi.xpm +lib/X11/xshisen/m1.xpm +lib/X11/xshisen/m2.xpm +lib/X11/xshisen/m3.xpm +lib/X11/xshisen/m4.xpm +lib/X11/xshisen/m5.xpm +lib/X11/xshisen/m6.xpm +lib/X11/xshisen/m7.xpm +lib/X11/xshisen/m8.xpm +lib/X11/xshisen/m9.xpm +lib/X11/xshisen/nan.xpm +lib/X11/xshisen/p1.xpm +lib/X11/xshisen/p2.xpm +lib/X11/xshisen/p3.xpm +lib/X11/xshisen/p4.xpm +lib/X11/xshisen/p5.xpm +lib/X11/xshisen/p6.xpm +lib/X11/xshisen/p7.xpm +lib/X11/xshisen/p8.xpm +lib/X11/xshisen/p9.xpm +lib/X11/xshisen/pei.xpm +lib/X11/xshisen/s1.xpm +lib/X11/xshisen/s2.xpm +lib/X11/xshisen/s3.xpm +lib/X11/xshisen/s4.xpm +lib/X11/xshisen/s5.xpm +lib/X11/xshisen/s6.xpm +lib/X11/xshisen/s7.xpm +lib/X11/xshisen/s8.xpm +lib/X11/xshisen/s9.xpm +lib/X11/xshisen/sha.xpm +lib/X11/xshisen/ton.xpm man/man6/xshisen.6.gz -man/ja_JP.JIS7/man6/xshisen.6.gz -@dirrm share/xshisen diff -ruN xshisen.orig/scripts/configure xshisen/scripts/configure --- xshisen.orig/scripts/configure Thu Jan 1 00:00:00 1970 +++ xshisen/scripts/configure Wed Mar 5 00:07:34 1997 @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/bin/perl -pi -e 's|/usr/X11R6|'$X11BASE'|g' $WRKSRC/configure