ports/118762: [MAINTAINER] games/zatacka: update to 0.1.8
Dmitry Marakasov
amdmi3 at amdmi3.ru
Mon Dec 17 05:30:06 UTC 2007
>Number: 118762
>Category: ports
>Synopsis: [MAINTAINER] games/zatacka: update to 0.1.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 17 05:30:05 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 7.0-BETA4 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-BETA4 FreeBSD 7.0-BETA4 #1: Sat Dec 15 21:44:40 MSK 2007 root at hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
* Update to 0.1.8
>How-To-Repeat:
>Fix:
--- zatacka.patch begins here ---
diff -ruN zatacka.orig/Makefile zatacka/Makefile
--- zatacka.orig/Makefile 2007-12-17 04:10:52.000000000 +0300
+++ zatacka/Makefile 2007-12-17 04:31:00.000000000 +0300
@@ -6,7 +6,7 @@
#
PORTNAME= zatacka
-PORTVERSION= 0.1.7
+PORTVERSION= 0.1.8
CATEGORIES= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
@@ -17,34 +17,12 @@
USE_SDL= sdl ttf image
USE_GMAKE= yes
-WRKSRC= ${WRKDIR}/zatacka
-MAKE_ARGS= CXX=${CXX}
-
-PORTDOCS= README
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include"
post-patch:
- @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
- @${REINPLACE_CMD} -e 's|font.ttf|${DATADIR}/font.ttf|' ${WRKSRC}/fx.h
- @${REINPLACE_CMD} -e 's|barrier.jpg|${DATADIR}/barrier.jpg|' \
- ${WRKSRC}/fx.cpp
- @${REINPLACE_CMD} -e 's|main_screen.jpg|${DATADIR}/main_screen.jpg|' \
- ${WRKSRC}/fx.cpp
- @${REINPLACE_CMD} -e 's|maps/|${DATADIR}/maps/|' ${WRKSRC}/fx.cpp
- @${REINPLACE_CMD} -e '/opendir/ s|maps|${DATADIR}/maps|' ${WRKSRC}/fx.cpp
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/main_screen.jpg ${WRKSRC}/barrier.jpg \
- ${WRKSRC}/font.ttf ${DATADIR}
- ${MKDIR} ${DATADIR}/maps
- ${INSTALL_DATA} ${WRKSRC}/maps/*.jpg ${DATADIR}/maps
-
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+ @${REINPLACE_CMD} -e 's|DATADIR|"${DATADIR}"|' ${WRKSRC}/src/main.cpp
.include <bsd.port.mk>
diff -ruN zatacka.orig/distinfo zatacka/distinfo
--- zatacka.orig/distinfo 2007-12-17 04:10:52.000000000 +0300
+++ zatacka/distinfo 2007-12-17 04:11:27.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (zatacka-0.1.7_src.tar.gz) = c625408883bbaa88e57acfd54cfdb7fd
-SHA256 (zatacka-0.1.7_src.tar.gz) = a4aaec1c2207e2a925cf3f3742fdaf683ab5342bef95780178b376afa59e1491
-SIZE (zatacka-0.1.7_src.tar.gz) = 226064
+MD5 (zatacka-0.1.8_src.tar.gz) = d7a4019b7dbd25da9c513d0c9d4b8ae8
+SHA256 (zatacka-0.1.8_src.tar.gz) = 9eb8263dbec805cf0a6564b15269347f30dd2db094f47ed9e0d2710d1fbc3848
+SIZE (zatacka-0.1.8_src.tar.gz) = 397999
diff -ruN zatacka.orig/files/patch-Makefile zatacka/files/patch-Makefile
--- zatacka.orig/files/patch-Makefile 2007-12-17 04:10:52.000000000 +0300
+++ zatacka/files/patch-Makefile 1970-01-01 03:00:00.000000000 +0300
@@ -1,35 +0,0 @@
---- Makefile.orig Wed Mar 29 00:08:50 2006
-+++ Makefile Sun Jun 11 15:42:44 2006
-@@ -2,7 +2,7 @@
- #Copyright by Mage 2006
- rm=/bin/rm -f
- ln=/bin/ln -s
--CC= g++
-+CXX?= g++
- DEFS=
- PROGNAME= zatacka
- INCLUDES= -I.
-@@ -13,7 +13,7 @@
-
-
- DEFINES= $(INCLUDES) $(DEFS) -DSYS_UNIX=1
--CFLAGS= -g $(DEFINES) `sdl-config --cflags`
-+CXXFLAGS+= $(DEFINES) `sdl-config --cflags`
-
- SRCS = main.cpp fx.cpp SDL_prim.c
-
-@@ -21,12 +21,12 @@
-
- .c.o:
- $(rm) $@
-- $(CC) $(CFLAGS) -c $*.c
-+ $(CXX) $(CXXFLAGS) -c $*.c
-
- all: $(PROGNAME)
-
- $(PROGNAME) : $(OBJS)
-- $(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
-+ $(CXX) $(CXXFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
-
- clean:
- $(rm) $(OBJS) $(PROGNAME) core *~
diff -ruN zatacka.orig/files/patch-fx.cpp zatacka/files/patch-fx.cpp
--- zatacka.orig/files/patch-fx.cpp 2007-12-17 04:10:52.000000000 +0300
+++ zatacka/files/patch-fx.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- fx.cpp.orig Mon Mar 27 00:43:47 2006
-+++ fx.cpp Mon Mar 27 00:47:47 2006
-@@ -46,8 +46,6 @@
- int i;
- char* wd;
-
-- wd=GetAppPath(); //get path to aplication directory
-- chdir(wd); //change working directory to aplication directory
-
- if((SDL_Init(SDL_INIT_VIDEO ))==-1){ //initialize SDL library
- disperr("Error initializing SDL");
diff -ruN zatacka.orig/files/patch-src-main.cpp zatacka/files/patch-src-main.cpp
--- zatacka.orig/files/patch-src-main.cpp 1970-01-01 03:00:00.000000000 +0300
+++ zatacka/files/patch-src-main.cpp 2007-12-17 04:27:44.000000000 +0300
@@ -0,0 +1,13 @@
+--- src/main.cpp.orig 2007-11-19 10:49:28.000000000 +0300
++++ src/main.cpp 2007-12-17 04:27:29.000000000 +0300
+@@ -30,9 +30,7 @@
+ StoreHinstance(hInstance);
+ #else
+ int main(int argc, char* argv[] ){
+- char path[30];
+- sprintf(path, "%s/%s", DEFAULT_LIBDIR, PACKAGE);
+- chdir(path);
++ chdir(DATADIR);
+ #endif
+ SDL_Surface *screen;
+ screen= Initialize();
diff -ruN zatacka.orig/pkg-plist zatacka/pkg-plist
--- zatacka.orig/pkg-plist 2007-12-17 04:10:52.000000000 +0300
+++ zatacka/pkg-plist 2007-12-17 04:31:07.000000000 +0300
@@ -1,7 +1,7 @@
bin/zatacka
+%%DATADIR%%/README
%%DATADIR%%/barrier.jpg
%%DATADIR%%/font.ttf
%%DATADIR%%/main_screen.jpg
-%%DATADIR%%/maps/map1.jpg
- at dirrm %%DATADIR%%/maps
+%%DATADIR%%/map1.jpg
@dirrm %%DATADIR%%
--- zatacka.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list