3 files changed, 107 insertions, 109 deletions

diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile
index b99539a01af2..8b4d8ba79b42 100644
--- a/games/penguin-command/Makefile
+++ b/games/penguin-command/Makefile
@@ -6,28 +6,26 @@
 #
 
 PORTNAME=	penguin-command
-PORTVERSION=	1.6.6
-PORTREVISION=	2
+PORTVERSION=	1.6.10
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	amdmi3@mail.ru
 COMMENT=	A clone of the classic game Missile Command
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_SDL=	mixer sdl
+USE_SDL=	mixer image sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-CONFIGURE_TARGET=
+CONFIGURE_ARGS=	--program-prefix=""
+
 MAN6=		penguin-command.6 penguin-command.ja.6
 
 post-patch:
-	${REINPLACE_CMD} 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g' \
-		${WRKSRC}/configure ${WRKSRC}/src/*.[ch]
-	${REINPLACE_CMD} 's/ -lz -lSDL -lm/ -lz -lm/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's| -lSDL | |g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's|LIBS="-lSDL_image|LIBS="-lSDL_image $$SDL_LIBS|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/games/penguin-command/distinfo b/games/penguin-command/distinfo
index 48d2cd98ba48..36c909dee3ee 100644
--- a/games/penguin-command/distinfo
+++ b/games/penguin-command/distinfo
@@ -1,3 +1,3 @@
-MD5 (penguin-command-1.6.6.tar.gz) = 8f32e88894464a195488e6dccb6a334f
-SHA256 (penguin-command-1.6.6.tar.gz) = 7b676af1a4001b71a2afa6c1316c760cd566f8dbe3d298afac167dad55d4102b
-SIZE (penguin-command-1.6.6.tar.gz) = 1157215
+MD5 (penguin-command-1.6.10.tar.gz) = 84ac5c85ea7d832b94e2ac1d5b363a43
+SHA256 (penguin-command-1.6.10.tar.gz) = e6ebc9b67a9809c5832bdc92a2dcf3835f169f86989d89501cb91e7e9dbae815
+SIZE (penguin-command-1.6.10.tar.gz) = 1184709
diff --git a/games/penguin-command/pkg-plist b/games/penguin-command/pkg-plist
index 85d8ebf2a2be..fa2994c5f09e 100644
--- a/games/penguin-command/pkg-plist
+++ b/games/penguin-command/pkg-plist
@@ -1,97 +1,97 @@
 bin/penguin-command
-share/penguin-command/gfx/abc.png
-share/penguin-command/gfx/bomb2.png
-share/penguin-command/gfx/bomb7.png
-share/penguin-command/gfx/cannon11.png
-share/penguin-command/gfx/cannon6.png
-share/penguin-command/gfx/city.png
-share/penguin-command/gfx/bomb3.png
-share/penguin-command/gfx/bomb8.png
-share/penguin-command/gfx/cannon2.png
-share/penguin-command/gfx/cannon7.png
-share/penguin-command/gfx/cityhit.png
-share/penguin-command/gfx/back.jpg
-share/penguin-command/gfx/bomb4.png
-share/penguin-command/gfx/bomb9.png
-share/penguin-command/gfx/cannon3.png
-share/penguin-command/gfx/cannon8.png
-share/penguin-command/gfx/shot.png
-share/penguin-command/gfx/bomb1.png
-share/penguin-command/gfx/bomb5.png
-share/penguin-command/gfx/cannon1.png
-share/penguin-command/gfx/cannon4.png
-share/penguin-command/gfx/cannon9.png
-share/penguin-command/gfx/title.jpg
-share/penguin-command/gfx/bomb10.png
-share/penguin-command/gfx/bomb6.png
-share/penguin-command/gfx/cannon10.png
-share/penguin-command/gfx/cannon5.png
-share/penguin-command/gfx/cannonhit.png
-share/penguin-command/gfx/cannon12.png
-share/penguin-command/gfx/cannon15.png
-share/penguin-command/gfx/cannon18.png
-share/penguin-command/gfx/cannon20.png
-share/penguin-command/gfx/cannon13.png
-share/penguin-command/gfx/cannon16.png
-share/penguin-command/gfx/cannon19.png
-share/penguin-command/gfx/cannon21.png
-share/penguin-command/gfx/cannon14.png
-share/penguin-command/gfx/cannon17.png
-share/penguin-command/gfx/10explo.png
-share/penguin-command/gfx/14explo.png
-share/penguin-command/gfx/18explo.png
-share/penguin-command/gfx/2explo.png
-share/penguin-command/gfx/6explo.png
-share/penguin-command/gfx/11explo.png
-share/penguin-command/gfx/15explo.png
-share/penguin-command/gfx/19explo.png
-share/penguin-command/gfx/3explo.png
-share/penguin-command/gfx/7explo.png
-share/penguin-command/gfx/12explo.png
-share/penguin-command/gfx/16explo.png
-share/penguin-command/gfx/1explo.png
-share/penguin-command/gfx/4explo.png
-share/penguin-command/gfx/8explo.png
-share/penguin-command/gfx/13explo.png
-share/penguin-command/gfx/17explo.png
-share/penguin-command/gfx/20explo.png
-share/penguin-command/gfx/5explo.png
-share/penguin-command/gfx/9explo.png
-share/penguin-command/gfx/1cursor.png
-share/penguin-command/gfx/4cursor.png
-share/penguin-command/gfx/9cursor.png
-share/penguin-command/gfx/5cursor.png
-share/penguin-command/gfx/6cursor.png
-share/penguin-command/gfx/2cursor.png
-share/penguin-command/gfx/7cursor.png
-share/penguin-command/gfx/3cursor.png
-share/penguin-command/gfx/8cursor.png
-share/penguin-command/gfx/10flyer.png
-share/penguin-command/gfx/13flyer.png
-share/penguin-command/gfx/16flyer.png
-share/penguin-command/gfx/3flyer.png
-share/penguin-command/gfx/6flyer.png
-share/penguin-command/gfx/9flyer.png
-share/penguin-command/gfx/11flyer.png
-share/penguin-command/gfx/14flyer.png
-share/penguin-command/gfx/1flyer.png
-share/penguin-command/gfx/4flyer.png
-share/penguin-command/gfx/7flyer.png
-share/penguin-command/gfx/12flyer.png
-share/penguin-command/gfx/15flyer.png
-share/penguin-command/gfx/2flyer.png
-share/penguin-command/gfx/5flyer.png
-share/penguin-command/gfx/8flyer.png
-share/penguin-command/gfx/icon.png
-share/penguin-command/sound/icefront.s3m
-share/penguin-command/sound/ramagard.s3m
-share/penguin-command/sound/pennight.mod
-share/penguin-command/sound/datajack.s3m
-share/penguin-command/sound/missex.wav
-share/penguin-command/sound/bombex.wav
-share/penguin-command/sound/Machine.wav
-share/penguin-command/sound/Wooeep.wav
-share/penguin-command/sound/click.wav
-@dirrm share/penguin-command/gfx
-@dirrm share/penguin-command/sound
-@dirrm share/penguin-command
+%%DATADIR%%/gfx/10explo.png
+%%DATADIR%%/gfx/10flyer.png
+%%DATADIR%%/gfx/11explo.png
+%%DATADIR%%/gfx/11flyer.png
+%%DATADIR%%/gfx/12explo.png
+%%DATADIR%%/gfx/12flyer.png
+%%DATADIR%%/gfx/13explo.png
+%%DATADIR%%/gfx/13flyer.png
+%%DATADIR%%/gfx/14explo.png
+%%DATADIR%%/gfx/14flyer.png
+%%DATADIR%%/gfx/15explo.png
+%%DATADIR%%/gfx/15flyer.png
+%%DATADIR%%/gfx/16explo.png
+%%DATADIR%%/gfx/16flyer.png
+%%DATADIR%%/gfx/17explo.png
+%%DATADIR%%/gfx/18explo.png
+%%DATADIR%%/gfx/19explo.png
+%%DATADIR%%/gfx/1cursor.png
+%%DATADIR%%/gfx/1explo.png
+%%DATADIR%%/gfx/1flyer.png
+%%DATADIR%%/gfx/20explo.png
+%%DATADIR%%/gfx/2cursor.png
+%%DATADIR%%/gfx/2explo.png
+%%DATADIR%%/gfx/2flyer.png
+%%DATADIR%%/gfx/3cursor.png
+%%DATADIR%%/gfx/3explo.png
+%%DATADIR%%/gfx/3flyer.png
+%%DATADIR%%/gfx/4cursor.png
+%%DATADIR%%/gfx/4explo.png
+%%DATADIR%%/gfx/4flyer.png
+%%DATADIR%%/gfx/5cursor.png
+%%DATADIR%%/gfx/5explo.png
+%%DATADIR%%/gfx/5flyer.png
+%%DATADIR%%/gfx/6cursor.png
+%%DATADIR%%/gfx/6explo.png
+%%DATADIR%%/gfx/6flyer.png
+%%DATADIR%%/gfx/7cursor.png
+%%DATADIR%%/gfx/7explo.png
+%%DATADIR%%/gfx/7flyer.png
+%%DATADIR%%/gfx/8cursor.png
+%%DATADIR%%/gfx/8explo.png
+%%DATADIR%%/gfx/8flyer.png
+%%DATADIR%%/gfx/9cursor.png
+%%DATADIR%%/gfx/9explo.png
+%%DATADIR%%/gfx/9flyer.png
+%%DATADIR%%/gfx/abc.png
+%%DATADIR%%/gfx/back.jpg
+%%DATADIR%%/gfx/bomb1.png
+%%DATADIR%%/gfx/bomb10.png
+%%DATADIR%%/gfx/bomb2.png
+%%DATADIR%%/gfx/bomb3.png
+%%DATADIR%%/gfx/bomb4.png
+%%DATADIR%%/gfx/bomb5.png
+%%DATADIR%%/gfx/bomb6.png
+%%DATADIR%%/gfx/bomb7.png
+%%DATADIR%%/gfx/bomb8.png
+%%DATADIR%%/gfx/bomb9.png
+%%DATADIR%%/gfx/cannon1.png
+%%DATADIR%%/gfx/cannon10.png
+%%DATADIR%%/gfx/cannon11.png
+%%DATADIR%%/gfx/cannon12.png
+%%DATADIR%%/gfx/cannon13.png
+%%DATADIR%%/gfx/cannon14.png
+%%DATADIR%%/gfx/cannon15.png
+%%DATADIR%%/gfx/cannon16.png
+%%DATADIR%%/gfx/cannon17.png
+%%DATADIR%%/gfx/cannon18.png
+%%DATADIR%%/gfx/cannon19.png
+%%DATADIR%%/gfx/cannon2.png
+%%DATADIR%%/gfx/cannon20.png
+%%DATADIR%%/gfx/cannon21.png
+%%DATADIR%%/gfx/cannon3.png
+%%DATADIR%%/gfx/cannon4.png
+%%DATADIR%%/gfx/cannon5.png
+%%DATADIR%%/gfx/cannon6.png
+%%DATADIR%%/gfx/cannon7.png
+%%DATADIR%%/gfx/cannon8.png
+%%DATADIR%%/gfx/cannon9.png
+%%DATADIR%%/gfx/cannonhit.png
+%%DATADIR%%/gfx/city.png
+%%DATADIR%%/gfx/cityhit.png
+%%DATADIR%%/gfx/icon.xpm
+%%DATADIR%%/gfx/shot.png
+%%DATADIR%%/gfx/title.jpg
+%%DATADIR%%/sound/Machine.wav
+%%DATADIR%%/sound/Wooeep.wav
+%%DATADIR%%/sound/bombex.wav
+%%DATADIR%%/sound/click.wav
+%%DATADIR%%/sound/datajack.s3m
+%%DATADIR%%/sound/icefront.s3m
+%%DATADIR%%/sound/missex.wav
+%%DATADIR%%/sound/pennight.mod
+%%DATADIR%%/sound/ramagard.s3m
+@dirrm %%DATADIR%%/sound
+@dirrm %%DATADIR%%/gfx
+@dirrm %%DATADIR%%