mirror of
https://git.freebsd.org/ports.git
synced 2025-05-25 15:36:35 -04:00
Unbreak.
Regen patches. PR: 208708 Submitted by: tkato432 yahoo com Sponsored by: Absolight
This commit is contained in:
parent
532c6e6b9f
commit
a9683a1dde
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=413125
6 changed files with 73 additions and 120 deletions
|
@ -3,29 +3,29 @@
|
||||||
|
|
||||||
PORTNAME= xdeblock
|
PORTNAME= xdeblock
|
||||||
PORTVERSION= 1.0
|
PORTVERSION= 1.0
|
||||||
PORTREVISION= 2
|
PORTREVISION= 3
|
||||||
CATEGORIES= games
|
CATEGORIES= games
|
||||||
MASTER_SITES= http://ftp.vector.co.jp/pack/unix/game/action/block/
|
MASTER_SITES= http://ftp.vector.co.jp/03/94/1328/
|
||||||
DISTFILES= ${PORTNAME}.tgz
|
DISTFILES= ${PORTNAME}.tgz
|
||||||
|
|
||||||
MAINTAINER= ports@FreeBSD.org
|
MAINTAINER= ports@FreeBSD.org
|
||||||
COMMENT= Block action game
|
COMMENT= Block action game
|
||||||
|
|
||||||
BROKEN= unfetchable
|
|
||||||
|
|
||||||
WRKSRC= ${WRKDIR}/xdeblo_v1.0
|
WRKSRC= ${WRKDIR}/xdeblo_v1.0
|
||||||
|
|
||||||
USES= imake:noman
|
USES= imake:noman
|
||||||
USE_XORG= xpm
|
USE_XORG= xpm
|
||||||
|
|
||||||
CFLAGS+= -Wno-return-type
|
CFLAGS+= -Wno-return-type
|
||||||
|
|
||||||
|
DESKTOP_ENTRIES="XDeBlock" "" "" "xdeblo" "" ""
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
|
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
|
||||||
|
|
||||||
do-install:
|
do-install:
|
||||||
(cd ${WRKSRC} && ${INSTALL_PROGRAM} xdeblo ${STAGEDIR}${PREFIX}/bin)
|
(cd ${WRKSRC} && ${INSTALL_PROGRAM} xdeblo ${STAGEDIR}${PREFIX}/bin)
|
||||||
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
|
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
|
||||||
${CHMOD} 777 ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
|
|
||||||
(cd ${WRKSRC}/mapf && ${INSTALL_DATA} *.txt \
|
(cd ${WRKSRC}/mapf && ${INSTALL_DATA} *.txt \
|
||||||
${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf)
|
${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf)
|
||||||
|
|
||||||
|
|
|
@ -1,57 +1,33 @@
|
||||||
*** Imakefile.orig 1996-11-16 13:06:36.000000000 +0900
|
--- Imakefile.orig 1996-11-16 04:06:36 UTC
|
||||||
--- Imakefile 2011-04-15 01:51:45.000000000 +0900
|
+++ Imakefile
|
||||||
***************
|
@@ -10,7 +10,7 @@ XCOMM ==================================
|
||||||
*** 10,16 ****
|
XCOMM Set xdeblock working directory.
|
||||||
XCOMM Set xdeblock working directory.
|
XCOMM =====================================================================
|
||||||
XCOMM =====================================================================
|
|
||||||
|
- XDEBLO_DIR = .
|
||||||
! XDEBLO_DIR = .
|
+ XDEBLO_DIR = $(LIBDIR)/xdeblock
|
||||||
|
|
||||||
XCOMM =====================================================================
|
XCOMM =====================================================================
|
||||||
XCOMM Set xpm.
|
XCOMM Set xpm.
|
||||||
--- 10,16 ----
|
@@ -20,8 +20,8 @@ XCOMM ex.
|
||||||
XCOMM Set xdeblock working directory.
|
XCOMM abc% find /usr -name xpm.h -print
|
||||||
XCOMM =====================================================================
|
XCOMM =====================================================================
|
||||||
|
|
||||||
! XDEBLO_DIR = $(LIBDIR)/xdeblock
|
|
||||||
|
|
||||||
XCOMM =====================================================================
|
|
||||||
XCOMM Set xpm.
|
|
||||||
***************
|
|
||||||
*** 20,27 ****
|
|
||||||
XCOMM abc% find /usr -name xpm.h -print
|
|
||||||
XCOMM =====================================================================
|
|
||||||
|
|
||||||
! XPM_INC = -I/usr/include/X11
|
|
||||||
! XPMLIB_DIR = -L/usr/lib
|
|
||||||
|
|
||||||
XCOMM =====================================================================
|
|
||||||
|
|
||||||
--- 20,27 ----
|
|
||||||
XCOMM abc% find /usr -name xpm.h -print
|
|
||||||
XCOMM =====================================================================
|
|
||||||
|
|
||||||
! XPM_INC = -I$(INCDIR)/X11
|
|
||||||
! XPMLIB_DIR = -L$(USRLIBDIR)
|
|
||||||
|
|
||||||
XCOMM =====================================================================
|
|
||||||
|
|
||||||
***************
|
|
||||||
*** 46,53 ****
|
|
||||||
|
|
||||||
PROGRAMS = xdeblo
|
|
||||||
|
|
||||||
! CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
|
|
||||||
! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
|
|
||||||
|
|
||||||
all:: $(PROGRAMS)
|
|
||||||
|
|
||||||
--- 46,53 ----
|
|
||||||
|
|
||||||
PROGRAMS = xdeblo
|
|
||||||
|
|
||||||
! CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
|
|
||||||
! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
|
|
||||||
|
|
||||||
all:: $(PROGRAMS)
|
|
||||||
|
|
||||||
|
- XPM_INC = -I/usr/include/X11
|
||||||
|
- XPMLIB_DIR = -L/usr/lib
|
||||||
|
+ XPM_INC = -I$(INCDIR)/X11
|
||||||
|
+ XPMLIB_DIR = -L$(USRLIBDIR)
|
||||||
|
|
||||||
|
XCOMM =====================================================================
|
||||||
|
|
||||||
|
@@ -46,8 +46,8 @@ OBJS = main.o misc.o file.o dialog.o \
|
||||||
|
|
||||||
|
PROGRAMS = xdeblo
|
||||||
|
|
||||||
|
-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
|
||||||
|
- $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
|
||||||
|
+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\
|
||||||
|
+ $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES)
|
||||||
|
|
||||||
|
all:: $(PROGRAMS)
|
||||||
|
|
||||||
|
|
|
@ -1,36 +1,20 @@
|
||||||
*** dialog.c.orig Sat Nov 16 14:37:15 1996
|
--- dialog.c.orig 1996-11-16 05:37:15 UTC
|
||||||
--- dialog.c Fri Jan 15 00:00:00 2000
|
+++ dialog.c
|
||||||
***************
|
@@ -8,7 +8,7 @@
|
||||||
*** 8,14 ****
|
|
||||||
|
#include <sys/types.h>
|
||||||
#include <sys/types.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/stat.h>
|
-#include <sys/dir.h>
|
||||||
! #include <sys/dir.h>
|
+#include <dirent.h>
|
||||||
|
|
||||||
#include "gameheader.h"
|
#include "gameheader.h"
|
||||||
|
|
||||||
--- 8,14 ----
|
@@ -430,7 +430,7 @@ void checkdir(dirname,fname,fflag)
|
||||||
|
char *fflag;
|
||||||
#include <sys/types.h>
|
{
|
||||||
#include <sys/stat.h>
|
DIR *dp;
|
||||||
! #include <dirent.h>
|
- struct direct *dir;
|
||||||
|
+ struct dirent *dir;
|
||||||
#include "gameheader.h"
|
struct stat sbuf;
|
||||||
|
char newname[256];
|
||||||
***************
|
register i = 0;
|
||||||
*** 430,436 ****
|
|
||||||
char *fflag;
|
|
||||||
{
|
|
||||||
DIR *dp;
|
|
||||||
! struct direct *dir;
|
|
||||||
struct stat sbuf;
|
|
||||||
char newname[256];
|
|
||||||
register i = 0;
|
|
||||||
--- 430,436 ----
|
|
||||||
char *fflag;
|
|
||||||
{
|
|
||||||
DIR *dp;
|
|
||||||
! struct dirent *dir;
|
|
||||||
struct stat sbuf;
|
|
||||||
char newname[256];
|
|
||||||
register i = 0;
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- gamemain.c.orig Sat Nov 16 14:37:16 1996
|
--- gamemain.c.orig 1996-11-16 05:37:16 UTC
|
||||||
+++ gamemain.c Mon Nov 3 15:30:25 2003
|
+++ gamemain.c
|
||||||
@@ -793,14 +793,13 @@
|
@@ -793,14 +793,13 @@ void stageScoreCheck(void)
|
||||||
void openingString(void)
|
void openingString(void)
|
||||||
{
|
{
|
||||||
XRectangle tempRect;
|
XRectangle tempRect;
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
{
|
{
|
||||||
/** not yet clear map **/
|
/** not yet clear map **/
|
||||||
drawShadowText(display,mWin,120,300,
|
drawShadowText(display,mWin,120,300,
|
||||||
@@ -812,15 +811,15 @@
|
@@ -812,15 +811,15 @@ void openingString(void)
|
||||||
|
|
||||||
x = 120;
|
x = 120;
|
||||||
drawShadowText(display,mWin,x,300,
|
drawShadowText(display,mWin,x,300,
|
||||||
|
|
|
@ -1,19 +1,11 @@
|
||||||
*** main.c.orig Sat Nov 16 14:37:16 1996
|
--- main.c.orig 1996-11-16 05:37:16 UTC
|
||||||
--- main.c Thu Jan 15 00:00:00 2000
|
+++ main.c
|
||||||
***************
|
@@ -66,7 +66,7 @@ int checkOption(argc,argv)
|
||||||
*** 66,72 ****
|
/*** set s_map ***/
|
||||||
/*** set s_map ***/
|
gameMainFlg.s_map = False;
|
||||||
gameMainFlg.s_map = False;
|
nowDataRec.nowMap.gameSpeed = 90;
|
||||||
nowDataRec.nowMap.gameSpeed = 90;
|
- nowDataRec.nowMap.dirname[0] == 0x00;
|
||||||
! nowDataRec.nowMap.dirname[0] == 0x00;
|
+ strcpy(nowDataRec.nowMap.dirname, "/usr/local/lib/X11/xdeblock/mapf");
|
||||||
|
|
||||||
for(i =1; i < argc; i++)
|
for(i =1; i < argc; i++)
|
||||||
{
|
{
|
||||||
--- 66,72 ----
|
|
||||||
/*** set s_map ***/
|
|
||||||
gameMainFlg.s_map = False;
|
|
||||||
nowDataRec.nowMap.gameSpeed = 90;
|
|
||||||
! strcpy(nowDataRec.nowMap.dirname, "%%PREFIX%%/lib/X11/xdeblock/mapf");
|
|
||||||
|
|
||||||
for(i =1; i < argc; i++)
|
|
||||||
{
|
|
||||||
|
|
|
@ -4,3 +4,4 @@ lib/X11/xdeblock/mapf/hard.mapf.txt
|
||||||
lib/X11/xdeblock/mapf/middle.mapf.txt
|
lib/X11/xdeblock/mapf/middle.mapf.txt
|
||||||
lib/X11/xdeblock/mapf/odo.mapf.txt
|
lib/X11/xdeblock/mapf/odo.mapf.txt
|
||||||
lib/X11/xdeblock/mapf/standard.mapf.txt
|
lib/X11/xdeblock/mapf/standard.mapf.txt
|
||||||
|
@dir(,,777) lib/X11/xdeblock/mapf
|
||||||
|
|
Loading…
Add table
Reference in a new issue