- Trim Makefile headers

- Drop ABI versions from LIB_DEPENDS
- OptionsNG
- Pet portlint
- Switch to dynamic plist where useful
- Canonicalize patch names
- Fix DOS line endings in patch files

2 files changed, 10 insertions, 161 deletions

diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index 6ce8af989226..7e8195aa985b 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	irrlamb
-# Date created:		15 Jan 2010
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	irrlamb
 PORTVERSION=	0.1.0
@@ -15,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D physics-based puzzle game
 
-LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
 BUILD_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
 RUN_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
 
@@ -29,9 +25,14 @@ LIBPATH=	${LOCALBASE}/lib ${LUA_LIBDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	readme.txt changelog.txt
+PORTDATA=	*
+
+PLIST_FILES=	bin/${PORTNAME}
 
 DATA_DIRS=	art campaigns collision fonts levels meshes scenes scripts textures
 
+.include <bsd.port.options.mk>
+
 post-patch:
 .for dir in ${DATA_DIRS}
 	@${REINPLACE_CMD} -e 's|"\(${dir}/\)|"${DATADIR}/\1|' \
@@ -43,9 +44,11 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/irrlamb ${PREFIX}/bin
+.if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATA_DIRS}" ${DATADIR}
-.if !defined(NOPORTDOCS)
+.endif
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
diff --git a/games/irrlamb/pkg-plist b/games/irrlamb/pkg-plist
deleted file mode 100644
index 296cd68696df..000000000000
--- a/games/irrlamb/pkg-plist
+++ /dev/null
@@ -1,154 +0,0 @@
-bin/irrlamb
-%%DATADIR%%/art/button_100.png
-%%DATADIR%%/art/button_128.png
-%%DATADIR%%/art/button_80.png
-%%DATADIR%%/art/button_dec.png
-%%DATADIR%%/art/button_ff.png
-%%DATADIR%%/art/button_fr.png
-%%DATADIR%%/art/button_inc.png
-%%DATADIR%%/art/button_pause.png
-%%DATADIR%%/art/button_rewind.png
-%%DATADIR%%/art/cursor.png
-%%DATADIR%%/art/fade.png
-%%DATADIR%%/art/logo.jpg
-%%DATADIR%%/art/sheet_textbox0.png
-%%DATADIR%%/art/sheet_textbox1.png
-%%DATADIR%%/art/sheet_textbox2.png
-%%DATADIR%%/campaigns/irrlamb.xml
-%%DATADIR%%/collision/a_skate0.col
-%%DATADIR%%/collision/a_skate1.col
-%%DATADIR%%/collision/tut_cylinder0.col
-%%DATADIR%%/collision/tut_cylinder1.col
-%%DATADIR%%/collision/tut_hill0.col
-%%DATADIR%%/collision/tut_jump0.col
-%%DATADIR%%/collision/tut_jump1.col
-%%DATADIR%%/collision/tut_jump2.col
-%%DATADIR%%/collision/tut_jump3.col
-%%DATADIR%%/collision/tut_jump4.col
-%%DATADIR%%/collision/tut_move0.col
-%%DATADIR%%/collision/tut_move1.col
-%%DATADIR%%/collision/tut_move2.col
-%%DATADIR%%/collision/tut_sphere0.col
-%%DATADIR%%/fonts/font_large.png
-%%DATADIR%%/fonts/font_large.xml
-%%DATADIR%%/fonts/font_medium.png
-%%DATADIR%%/fonts/font_medium.xml
-%%DATADIR%%/fonts/font_small.png
-%%DATADIR%%/fonts/font_small.xml
-%%DATADIR%%/levels/a_skate0.xml
-%%DATADIR%%/levels/a_skate1.xml
-%%DATADIR%%/levels/icons/a_skate0.jpg
-%%DATADIR%%/levels/icons/a_skate1.jpg
-%%DATADIR%%/levels/icons/locked.png
-%%DATADIR%%/levels/icons/tut_cylinder0.jpg
-%%DATADIR%%/levels/icons/tut_cylinder1.jpg
-%%DATADIR%%/levels/icons/tut_hill0.jpg
-%%DATADIR%%/levels/icons/tut_jump0.jpg
-%%DATADIR%%/levels/icons/tut_jump1.jpg
-%%DATADIR%%/levels/icons/tut_jump2.jpg
-%%DATADIR%%/levels/icons/tut_jump3.jpg
-%%DATADIR%%/levels/icons/tut_jump4.jpg
-%%DATADIR%%/levels/icons/tut_move0.jpg
-%%DATADIR%%/levels/icons/tut_move1.jpg
-%%DATADIR%%/levels/icons/tut_move2.jpg
-%%DATADIR%%/levels/icons/tut_sphere0.jpg
-%%DATADIR%%/levels/test.xml
-%%DATADIR%%/levels/tut_cylinder0.xml
-%%DATADIR%%/levels/tut_cylinder1.xml
-%%DATADIR%%/levels/tut_hill0.xml
-%%DATADIR%%/levels/tut_jump0.xml
-%%DATADIR%%/levels/tut_jump1.xml
-%%DATADIR%%/levels/tut_jump2.xml
-%%DATADIR%%/levels/tut_jump3.xml
-%%DATADIR%%/levels/tut_jump4.xml
-%%DATADIR%%/levels/tut_move0.xml
-%%DATADIR%%/levels/tut_move1.xml
-%%DATADIR%%/levels/tut_move2.xml
-%%DATADIR%%/levels/tut_sphere0.xml
-%%DATADIR%%/meshes/a_skate0.irrmesh
-%%DATADIR%%/meshes/a_skate1.irrmesh
-%%DATADIR%%/meshes/cube.irrmesh
-%%DATADIR%%/meshes/cylinder.irrmesh
-%%DATADIR%%/meshes/skate_corner0.irrmesh
-%%DATADIR%%/meshes/skate_corner1.irrmesh
-%%DATADIR%%/meshes/skate_quarterpipe0.irrmesh
-%%DATADIR%%/meshes/skate_rail0.irrmesh
-%%DATADIR%%/meshes/skate_rail1.irrmesh
-%%DATADIR%%/meshes/skate_ramp0.irrmesh
-%%DATADIR%%/meshes/sphere.irrmesh
-%%DATADIR%%/meshes/tut_cylinder0.irrmesh
-%%DATADIR%%/meshes/tut_cylinder1.irrmesh
-%%DATADIR%%/meshes/tut_hill0.irrmesh
-%%DATADIR%%/meshes/tut_jump0.irrmesh
-%%DATADIR%%/meshes/tut_jump1.irrmesh
-%%DATADIR%%/meshes/tut_jump2.irrmesh
-%%DATADIR%%/meshes/tut_jump3.irrmesh
-%%DATADIR%%/meshes/tut_jump4.irrmesh
-%%DATADIR%%/meshes/tut_move0.irrmesh
-%%DATADIR%%/meshes/tut_move1.irrmesh
-%%DATADIR%%/meshes/tut_move2.irrmesh
-%%DATADIR%%/meshes/tut_sphere0.irrmesh
-%%DATADIR%%/scenes/a_skate0.irr
-%%DATADIR%%/scenes/a_skate1.irr
-%%DATADIR%%/scenes/tut_cylinder0.irr
-%%DATADIR%%/scenes/tut_cylinder0_lm.png
-%%DATADIR%%/scenes/tut_cylinder1.irr
-%%DATADIR%%/scenes/tut_cylinder1_lm.png
-%%DATADIR%%/scenes/tut_hill0.irr
-%%DATADIR%%/scenes/tut_jump0.irr
-%%DATADIR%%/scenes/tut_jump0_lm.png
-%%DATADIR%%/scenes/tut_jump1.irr
-%%DATADIR%%/scenes/tut_jump1_lm.png
-%%DATADIR%%/scenes/tut_jump2.irr
-%%DATADIR%%/scenes/tut_jump2_lm.png
-%%DATADIR%%/scenes/tut_jump3.irr
-%%DATADIR%%/scenes/tut_jump3_lm.png
-%%DATADIR%%/scenes/tut_jump4.irr
-%%DATADIR%%/scenes/tut_jump4_lm.png
-%%DATADIR%%/scenes/tut_move0.irr
-%%DATADIR%%/scenes/tut_move0_lm.png
-%%DATADIR%%/scenes/tut_move1.irr
-%%DATADIR%%/scenes/tut_move1_lm.png
-%%DATADIR%%/scenes/tut_move2.irr
-%%DATADIR%%/scenes/tut_sphere0.irr
-%%DATADIR%%/scenes/tut_sphere0_lm.png
-%%DATADIR%%/scripts/a_skate0.lua
-%%DATADIR%%/scripts/a_skate1.lua
-%%DATADIR%%/scripts/default.lua
-%%DATADIR%%/scripts/tut_cylinder0.lua
-%%DATADIR%%/scripts/tut_cylinder1.lua
-%%DATADIR%%/scripts/tut_hill0.lua
-%%DATADIR%%/scripts/tut_jump0.lua
-%%DATADIR%%/scripts/tut_jump1.lua
-%%DATADIR%%/scripts/tut_jump2.lua
-%%DATADIR%%/scripts/tut_jump3.lua
-%%DATADIR%%/scripts/tut_jump4.lua
-%%DATADIR%%/scripts/tut_move0.lua
-%%DATADIR%%/scripts/tut_move1.lua
-%%DATADIR%%/scripts/tut_move2.lua
-%%DATADIR%%/scripts/tut_sphere0.lua
-%%DATADIR%%/textures/blue.jpg
-%%DATADIR%%/textures/brick0.jpg
-%%DATADIR%%/textures/checker0.png
-%%DATADIR%%/textures/concrete0.jpg
-%%DATADIR%%/textures/crate0.jpg
-%%DATADIR%%/textures/dark0.jpg
-%%DATADIR%%/textures/grass0.jpg
-%%DATADIR%%/textures/orb_glow0.png
-%%DATADIR%%/textures/orb_outer0.png
-%%DATADIR%%/textures/player_glow0.png
-%%DATADIR%%/textures/player_outer0.png
-%%DATADIR%%/textures/player_trail0.png
-%%DATADIR%%/textures/tiles0.jpg
-%%DATADIR%%/textures/woodfloor0.jpg
-@dirrm %%DATADIR%%/textures
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/scenes
-@dirrm %%DATADIR%%/meshes
-@dirrm %%DATADIR%%/levels/icons
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/collision
-@dirrm %%DATADIR%%/campaigns
-@dirrm %%DATADIR%%/art
-@dirrm %%DATADIR%%