Regen patches.

PR:		208708
Submitted by:	tkato432 yahoo com
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2016-04-12 15:05:21 +00:00
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

View file

@ -3,29 +3,29 @@
PORTNAME= xdeblock
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
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
MAINTAINER= ports@FreeBSD.org
COMMENT= Block action game
BROKEN= unfetchable
WRKSRC= ${WRKDIR}/xdeblo_v1.0
USES= imake:noman
USE_XORG= xpm
CFLAGS+= -Wno-return-type
DESKTOP_ENTRIES="XDeBlock" "" "" "xdeblo" "" ""
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
do-install:
(cd ${WRKSRC} && ${INSTALL_PROGRAM} xdeblo ${STAGEDIR}${PREFIX}/bin)
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
${CHMOD} 777 ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
(cd ${WRKSRC}/mapf && ${INSTALL_DATA} *.txt \
${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf)

View file

@ -1,57 +1,33 @@
*** Imakefile.orig 1996-11-16 13:06:36.000000000 +0900
--- Imakefile 2011-04-15 01:51:45.000000000 +0900
***************
*** 10,16 ****
XCOMM Set xdeblock working directory.
XCOMM =====================================================================
! XDEBLO_DIR = .
XCOMM =====================================================================
XCOMM Set xpm.
--- 10,16 ----
XCOMM Set xdeblock working directory.
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)
--- Imakefile.orig 1996-11-16 04:06:36 UTC
+++ Imakefile
@@ -10,7 +10,7 @@ XCOMM ==================================
XCOMM Set xdeblock working directory.
XCOMM =====================================================================
- XDEBLO_DIR = .
+ XDEBLO_DIR = $(LIBDIR)/xdeblock
XCOMM =====================================================================
XCOMM Set xpm.
@@ -20,8 +20,8 @@ XCOMM ex.
XCOMM abc% find /usr -name xpm.h -print
XCOMM =====================================================================
- 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)

View file

@ -1,36 +1,20 @@
*** dialog.c.orig Sat Nov 16 14:37:15 1996
--- dialog.c Fri Jan 15 00:00:00 2000
***************
*** 8,14 ****
#include <sys/types.h>
#include <sys/stat.h>
! #include <sys/dir.h>
#include "gameheader.h"
--- 8,14 ----
#include <sys/types.h>
#include <sys/stat.h>
! #include <dirent.h>
#include "gameheader.h"
***************
*** 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;
--- dialog.c.orig 1996-11-16 05:37:15 UTC
+++ dialog.c
@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/dir.h>
+#include <dirent.h>
#include "gameheader.h"
@@ -430,7 +430,7 @@ void checkdir(dirname,fname,fflag)
char *fflag;
{
DIR *dp;
- struct direct *dir;
+ struct dirent *dir;
struct stat sbuf;
char newname[256];
register i = 0;

View file

@ -1,6 +1,6 @@
--- gamemain.c.orig Sat Nov 16 14:37:16 1996
+++ gamemain.c Mon Nov 3 15:30:25 2003
@@ -793,14 +793,13 @@
--- gamemain.c.orig 1996-11-16 05:37:16 UTC
+++ gamemain.c
@@ -793,14 +793,13 @@ void stageScoreCheck(void)
void openingString(void)
{
XRectangle tempRect;
@ -18,7 +18,7 @@
{
/** not yet clear map **/
drawShadowText(display,mWin,120,300,
@@ -812,15 +811,15 @@
@@ -812,15 +811,15 @@ void openingString(void)
x = 120;
drawShadowText(display,mWin,x,300,

View file

@ -1,19 +1,11 @@
*** main.c.orig Sat Nov 16 14:37:16 1996
--- main.c Thu Jan 15 00:00:00 2000
***************
*** 66,72 ****
/*** set s_map ***/
gameMainFlg.s_map = False;
nowDataRec.nowMap.gameSpeed = 90;
! nowDataRec.nowMap.dirname[0] == 0x00;
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++)
{
--- main.c.orig 1996-11-16 05:37:16 UTC
+++ main.c
@@ -66,7 +66,7 @@ int checkOption(argc,argv)
/*** set s_map ***/
gameMainFlg.s_map = False;
nowDataRec.nowMap.gameSpeed = 90;
- nowDataRec.nowMap.dirname[0] == 0x00;
+ strcpy(nowDataRec.nowMap.dirname, "/usr/local/lib/X11/xdeblock/mapf");
for(i =1; i < argc; i++)
{

View file

@ -4,3 +4,4 @@ lib/X11/xdeblock/mapf/hard.mapf.txt
lib/X11/xdeblock/mapf/middle.mapf.txt
lib/X11/xdeblock/mapf/odo.mapf.txt
lib/X11/xdeblock/mapf/standard.mapf.txt
@dir(,,777) lib/X11/xdeblock/mapf