Attachment #23284 for bug #40082

View | Details | Raw Unified | Return to bug 40082
Collapse All | Expand All




#

PORTNAME=	actx
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


MAN1=		actx.1
MANLANG=	"" ja

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
ACTXDIR=	${PREFIX}/share/examples/actx

post-extract:

Line 1 Link Here

(-)actx/distinfo (-1 / +1 lines)
1	MD5 (actx-1.21p1.tar.gz) = e2e5bd2ff884c06e2fe74214326f1dcb	1	MD5 (actx-1.23.tar.gz) = f0ad925132948b2cd344c5057a9a1273




--- Imakefile.orig	Mon Jul  1 10:14:46 2002
+++ Imakefile	Mon Jul  1 10:18:21 2002
@@ -6,13 +6,16 @@
 
 #undef USE_VOODOO
 
-BINDIR = /usr/local/bin
+BINDIR = ${PREFIX}/bin
+XCOMM BINDIR = /usr/local/bin
 
-#define MASCOTDIR /usr/local/lib/ActX
+XCOMM #define MASCOTDIR /usr/local/lib/ActX
 
-MASCOTDIR = /usr/local/lib/ActX
+MASCOTDIR = ${PREFIX}/share/examples/actx
+XCOMM MASCOTDIR = /usr/local/lib/ActX
 
-DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
+#define MASCOTDIR ${PREFIX}/share/examples/actx
+XCOMM #define MASCOTDIR ${PREFIX}/lib/X11/actx
 
-DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\"
+DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/share/examples/actx\"
+XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
 
 
 #define INSTALL_DEFAULTMENU
 
@@ -34,7 +37,7 @@
 EXTRA_LIBRARIES += -lXpm
 
 AllTarget(actx)

+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
 




*** 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 $B!A51$/5(@a$X!A(B
  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 $B!A51$/5(@a$X!A(B
  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
  


Return to bug 40082

Lines 6-15 Link Here

(-)actx/Makefile (-3 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= actx	8	PORTNAME= actx
9	PORTVERSION= 1.21.1	9	PORTVERSION= 1.23
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://kurumi.sakura.ne.jp/~chimari/ActX/	11	MASTER_SITES= http://kurumi.sakura.ne.jp/~chimari/ActX/
12	DISTNAME= ${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E}
13		12
14	MAINTAINER= esu@yk.rim.or.jp	13	MAINTAINER= esu@yk.rim.or.jp
15		14
Lines 20-26 Link Here
20	MAN1= actx.1	19	MAN1= actx.1
21	MANLANG= "" ja	20	MANLANG= "" ja
22		21
23	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
24	ACTXDIR= ${PREFIX}/share/examples/actx	22	ACTXDIR= ${PREFIX}/share/examples/actx
25		23
26	post-extract:	24	post-extract:

Lines 1-29 Link Here

(-)actx/files/patch-aa (-18 / +31 lines)
1	--- Imakefile.orig Mon Jan 29 09:27:25 2001	1	--- Imakefile.orig Mon Jul 1 10:14:46 2002
2	+++ Imakefile Mon Jan 29 09:29:06 2001	2	+++ Imakefile Mon Jul 1 10:18:21 2002
3	@@ -42,7 +42,7 @@	3	@@ -6,13 +6,16 @@
4		4
5	XCOMM -------------- ActX $BK\BN(B Install$B@h(B Directory ---------------	5	#undef USE_VOODOO
6		6
7	-PREFIX = /usr/local	7	-BINDIR = /usr/local/bin
8	+XCOMM PREFIX = /usr/local	8	+BINDIR = ${PREFIX}/bin
9	XCOMM PREFIX = ${HOME}	9	+XCOMM BINDIR = /usr/local/bin
10		10
11	BINDIR = ${PREFIX}/bin	11	-#define MASCOTDIR /usr/local/lib/ActX
12	@@ -50,9 +50,11 @@	12	+XCOMM #define MASCOTDIR /usr/local/lib/ActX
13		13
14	XCOMM -------- ActX $B%^%9%3%C%H%G!<%?(B Install$B@h(B Directory ----------	14	-MASCOTDIR = /usr/local/lib/ActX
		15	+MASCOTDIR = ${PREFIX}/share/examples/actx
		16	+XCOMM MASCOTDIR = /usr/local/lib/ActX
15		17
16	-#define MASCOTDIR ${PREFIX}/lib/X11/actx	18	-DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
17	+#define MASCOTDIR ${PREFIX}/share/examples/actx
18	+XCOMM #define MASCOTDIR ${PREFIX}/lib/X11/actx
19
20	-DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\"
21	+DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/share/examples/actx\"	19	+DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/share/examples/actx\"
22	+XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\"	20	+XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
23
24		21
		22	#define INSTALL_DEFAULTMENU
25		23
26	@@ -72,7 +74,7 @@	24	@@ -34,7 +37,7 @@
27	EXTRA_LIBRARIES += -lXpm	25	EXTRA_LIBRARIES += -lXpm
28		26
29	AllTarget(actx)	27	AllTarget(actx)
Lines 31-33 Link Here
31	+NormalProgramTarget(actx,$(OBJS),$(LOCAL_LIBRARIES),XawClientLibs,$(XPMLIB))	29	+NormalProgramTarget(actx,$(OBJS),$(LOCAL_LIBRARIES),XawClientLibs,$(XPMLIB))
32		30
33	InstallManPage(actx,$(MANDIR))	31	InstallManPage(actx,$(MANDIR))
		32
		33	@@ -69,11 +72,11 @@
		34
		35	DEFINES = $(DEFINES_I18N) $(DEFINES_VOODOO) $(DEFINES_XAW5) $(DEFINES_AW) $(DEFINES_MASCOTDIR)
		36
		37	-InstallNamedNonExec(biff.xpm,biff.xpm,MASCOTDIR)
		38	+InstallNamedNonExec(biff.xpm,biff.xpm,$(MASCOTDIR))
		39
		40	#ifdef INSTALL_DEFAULTMENU
		41	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc
		42	- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp
		43	+XCOMM $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp
		44	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc-one $(MASCOTDIR)/sample.actxrc-one
		45	#endif
		46

Lines 1-20 Link Here

(-)actx/files/patch-ad (-20 / +36 lines)
1	--- samples/sample.actxrc.orig Tue Sep 25 22:46:27 2001	1	*** samples/sample.actxrc.orig Sat Apr 13 01:36:55 2002
2	+++ samples/sample.actxrc Sat Oct 6 14:02:56 2001	2	--- samples/sample.actxrc Sat May 18 02:36:40 2002
3	@@ -10,7 +10,7 @@	3	***************
4	Actx*titleOfMenuE: ONE - for Bright Season -	4	* 5,11 **
5		5	Actx*numsOfMenu: 16
6		6	Actx*titleOfMenuJ: ONE $B!A51$/5(@a$X!A(B
7	-Actx*xpmDir: /usr/local/lib/actx	7	Actx*titleOfMenuE: ONE - for Bright Season -
8	+Actx*xpmDir: %%ACTXDIR%%	8	! Actx*xpmDir: /usr/local/lib/ActX
9		9
10	!Actxballoon.font: -alias-fixed-bold----12-------*	10	!!!!!!!! Home Position
11		11	Actx*homeX: -1
12	@@ -24,7 +24,7 @@	12	--- 5,11 ----
13		13	Actx*numsOfMenu: 16
14	Actx*balloon.style: wmaker	14	Actx*titleOfMenuJ: ONE $B!A51$/5(@a$X!A(B
15		15	Actx*titleOfMenuE: ONE - for Bright Season -
16	-!Actx*sndDir: /usr/local/lib/actx/wav	16	! Actx*xpmDir: %%ACTXDIR%%
17	+!Actx*sndDir: %%ACTXDIR%%/wav	17
18		18	!!!!!!!! Home Position
19	!Actx*sndCom: /usr/local/bin/wavplay -q %s	19	Actx*homeX: -1
20		20	***************
		21	* 28,34 **
		22	Actx*balloon.style: wmaker
		23
		24	!!!!!!!! Sound Configuration
		25	! !Actx*sndDir: /usr/local/lib/actx/wav
		26	!Actx*sndCom: /usr/local/bin/wavplay -q %s
		27
		28
		29	--- 28,34 ----
		30	Actx*balloon.style: wmaker
		31
		32	!!!!!!!! Sound Configuration
		33	! !Actx*sndDir: %%ACTXDIR%%/wav
		34	!Actx*sndCom: /usr/local/bin/wavplay -q %s
		35
		36