From owner-freebsd-ports Mon Jul 1 9:50:19 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C007237B401 for ; Mon, 1 Jul 2002 09:50:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2176C43E1A for ; Mon, 1 Jul 2002 09:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g61Go1JU070211 for ; Mon, 1 Jul 2002 09:50:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g61Go1Gu070210; Mon, 1 Jul 2002 09:50:01 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 21CBB37B400 for ; Mon, 1 Jul 2002 09:46:31 -0700 (PDT) Received: from r-rr.iij4u.or.jp (r-rr.iij4u.or.jp [210.130.0.76]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35B9543E1D for ; Mon, 1 Jul 2002 09:46:31 -0700 (PDT) (envelope-from umeno@rr.iij4u.or.jp) Received: from localhost ([210.159.90.73]) by r-rr.iij4u.or.jp (8.11.6+IIJ/8.11.6) with ESMTP id g61GkTN08639 for ; Tue, 2 Jul 2002 01:46:29 +0900 (JST) Message-Id: <20020702.014629.730594807.umeno@rr.iij4u.or.jp> Date: Tue, 02 Jul 2002 01:46:29 +0900 (JST) From: UMENO Takashi Reply-To: UMENO Takashi To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/40082: Update port: games/actx from 1.21p1 to 1.23 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40082 >Category: ports >Synopsis: Update port: games/actx from 1.21p1 to 1.23 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 01 09:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: UMENO Takashi >Release: FreeBSD 4.6-STABLE i386 >Organization: personal >Environment: System: FreeBSD belldandy.unnumbered.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Sat Jun 29 15:15:12 JST 2002 umeno@belldandy.unnumbered.net:/usr/src/sys/compile/SAKUYA11 i386 >Description: Update port: games/actx from 1.21p1 to 1.23 This patch has been reviewed by maintainer. >How-To-Repeat: N/A >Fix: diff -urN actx.orig/Makefile actx/Makefile --- actx.orig/Makefile Fri Jan 11 23:54:53 2002 +++ actx/Makefile Sat May 18 02:23:02 2002 @@ -6,10 +6,9 @@ # PORTNAME= actx -PORTVERSION= 1.21.1 +PORTVERSION= 1.23 CATEGORIES= games MASTER_SITES= http://kurumi.sakura.ne.jp/~chimari/ActX/ -DISTNAME= ${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E} MAINTAINER= esu@yk.rim.or.jp @@ -20,7 +19,6 @@ MAN1= actx.1 MANLANG= "" ja -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} ACTXDIR= ${PREFIX}/share/examples/actx post-extract: diff -urN actx.orig/distinfo actx/distinfo --- actx.orig/distinfo Fri Jan 11 23:54:53 2002 +++ actx/distinfo Sat May 18 02:22:23 2002 @@ -1 +1 @@ -MD5 (actx-1.21p1.tar.gz) = e2e5bd2ff884c06e2fe74214326f1dcb +MD5 (actx-1.23.tar.gz) = f0ad925132948b2cd344c5057a9a1273 diff -urN actx.orig/files/patch-aa actx/files/patch-aa --- actx.orig/files/patch-aa Tue Jan 30 12:36:17 2001 +++ actx/files/patch-aa Mon Jul 1 10:19:16 2002 @@ -1,29 +1,27 @@ ---- Imakefile.orig Mon Jan 29 09:27:25 2001 -+++ Imakefile Mon Jan 29 09:29:06 2001 -@@ -42,7 +42,7 @@ +--- Imakefile.orig Mon Jul 1 10:14:46 2002 ++++ Imakefile Mon Jul 1 10:18:21 2002 +@@ -6,13 +6,16 @@ - XCOMM -------------- ActX 本体 Install先 Directory --------------- + #undef USE_VOODOO --PREFIX = /usr/local -+XCOMM PREFIX = /usr/local - XCOMM PREFIX = ${HOME} +-BINDIR = /usr/local/bin ++BINDIR = ${PREFIX}/bin ++XCOMM BINDIR = /usr/local/bin - BINDIR = ${PREFIX}/bin -@@ -50,9 +50,11 @@ +-#define MASCOTDIR /usr/local/lib/ActX ++XCOMM #define MASCOTDIR /usr/local/lib/ActX - XCOMM -------- ActX マスコットデータ Install先 Directory ---------- +-MASCOTDIR = /usr/local/lib/ActX ++MASCOTDIR = ${PREFIX}/share/examples/actx ++XCOMM MASCOTDIR = /usr/local/lib/ActX --#define MASCOTDIR ${PREFIX}/lib/X11/actx -+#define MASCOTDIR ${PREFIX}/share/examples/actx -+XCOMM #define MASCOTDIR ${PREFIX}/lib/X11/actx - --DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\" +-DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\" +DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/share/examples/actx\" -+XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\" - ++XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\" + #define INSTALL_DEFAULTMENU -@@ -72,7 +74,7 @@ +@@ -34,7 +37,7 @@ EXTRA_LIBRARIES += -lXpm AllTarget(actx) @@ -31,3 +29,18 @@ +NormalProgramTarget(actx,$(OBJS),$(LOCAL_LIBRARIES),XawClientLibs,$(XPMLIB)) InstallManPage(actx,$(MANDIR)) + +@@ -69,11 +72,11 @@ + + DEFINES = $(DEFINES_I18N) $(DEFINES_VOODOO) $(DEFINES_XAW5) $(DEFINES_AW) $(DEFINES_MASCOTDIR) + +-InstallNamedNonExec(biff.xpm,biff.xpm,MASCOTDIR) ++InstallNamedNonExec(biff.xpm,biff.xpm,$(MASCOTDIR)) + + #ifdef INSTALL_DEFAULTMENU + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc +- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp ++XCOMM $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc-one $(MASCOTDIR)/sample.actxrc-one + #endif + diff -urN actx.orig/files/patch-ad actx/files/patch-ad --- actx.orig/files/patch-ad Tue Oct 23 12:36:14 2001 +++ actx/files/patch-ad Sat May 18 02:37:13 2002 @@ -1,20 +1,36 @@ ---- samples/sample.actxrc.orig Tue Sep 25 22:46:27 2001 -+++ samples/sample.actxrc Sat Oct 6 14:02:56 2001 -@@ -10,7 +10,7 @@ - Actx*titleOfMenuE: ONE - for Bright Season - - - --Actx*xpmDir: /usr/local/lib/actx -+Actx*xpmDir: %%ACTXDIR%% - - !Actx*balloon.font: -alias-fixed-bold-*-*-*-12-*-*-*-*-*-*-* - -@@ -24,7 +24,7 @@ - - Actx*balloon.style: wmaker - --!Actx*sndDir: /usr/local/lib/actx/wav -+!Actx*sndDir: %%ACTXDIR%%/wav - - !Actx*sndCom: /usr/local/bin/wavplay -q %s - +*** samples/sample.actxrc.orig Sat Apr 13 01:36:55 2002 +--- samples/sample.actxrc Sat May 18 02:36:40 2002 +*************** +*** 5,11 **** + Actx*numsOfMenu: 16 + Actx*titleOfMenuJ: ONE 〜輝く季節へ〜 + Actx*titleOfMenuE: ONE - for Bright Season - +! Actx*xpmDir: /usr/local/lib/ActX + + !!!!!!!! Home Position + Actx*homeX: -1 +--- 5,11 ---- + Actx*numsOfMenu: 16 + Actx*titleOfMenuJ: ONE 〜輝く季節へ〜 + Actx*titleOfMenuE: ONE - for Bright Season - +! Actx*xpmDir: %%ACTXDIR%% + + !!!!!!!! Home Position + Actx*homeX: -1 +*************** +*** 28,34 **** + Actx*balloon.style: wmaker + + !!!!!!!! Sound Configuration +! !Actx*sndDir: /usr/local/lib/actx/wav + !Actx*sndCom: /usr/local/bin/wavplay -q %s + + +--- 28,34 ---- + Actx*balloon.style: wmaker + + !!!!!!!! Sound Configuration +! !Actx*sndDir: %%ACTXDIR%%/wav + !Actx*sndCom: /usr/local/bin/wavplay -q %s + + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message