2 files changed, 23 insertions, 18 deletions

diff --git a/games/phpua-ut/Makefile b/games/phpua-ut/Makefile
index 797fbaafaeb4..0ba74164615b 100644
--- a/games/phpua-ut/Makefile
+++ b/games/phpua-ut/Makefile
@@ -7,21 +7,19 @@
 
 PORTNAME=	phpua-plugin_ut
 PORTVERSION=	1.1.0b
+PORTREVISION=	1
 CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	babak@farrokhi.net
 COMMENT=	An Unreal Tournament plugin for phpUA
 
-RUN_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
-
-BROKEN=		does not install due to dependency problem in games/phpua-engine
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-09-03
+BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 # Some variables you can change
-PHPUA?=		www/data/phpua
+PHPUA?=		www/phpua
 PHPUA_USER?=	${WWWOWN}
 PHPUA_GROUP?=	${WWWGRP}
 
@@ -44,11 +42,13 @@ pre-everything::
 	${ECHO_MSG} '-------------------------------------------------------------------------')
 .endif
 
+do-extract:
+	@ ${MKDIR} ${WRKSRC}
+	@ cd ${WRKSRC} && ${EXTRACT_CMD}  ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
+
 do-install:
-	@ ${CP} -R ${WRKDIR}/images ${PREFIX}/${PHPUA}/
-	@ ${CP} -R ${WRKDIR}/plugins ${PREFIX}/${PHPUA}/
-	@ ${CP} -R ${WRKDIR}/templates ${PREFIX}/${PHPUA}/
-	@ ${CHOWN} -R ${PHPUA_USER}:${PHPUA_GROUP} ${PREFIX}/${PHPUA}
+	@ ${CHOWN} -R ${PHPUA_USER}:${PHPUA_GROUP} ${WRKSRC}
+	@ ${CP} -R ${WRKSRC}/ ${PREFIX}/${PHPUA}/
 	@ ${ECHO_MSG} ""
 	@ ${ECHO_MSG} "* Files have been installed in"
 	@ ${ECHO_MSG} "* ${PREFIX}/${PHPUA}"
diff --git a/games/phpua-ut/pkg-plist b/games/phpua-ut/pkg-plist
index 9f173b204938..1f969970c2d6 100644
--- a/games/phpua-ut/pkg-plist
+++ b/games/phpua-ut/pkg-plist
@@ -13,21 +13,19 @@
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Anna.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Cryss.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Freylis.jpg
-%%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.gromida.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Indina.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Ivana.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Jayce.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Kyla.jpg
-%%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.maime.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Malise.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Mariana.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Nikita.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Portia.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.Tanya.jpg
+%%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.gromida.jpg
+%%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.maime.jpg
 %%PHPUA%%/images/plugin_ut/faces/FCommandoSkins.visse.jpg
 %%PHPUA%%/images/plugin_ut/faces/None.jpg
-%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.annaka.jpg
-%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.aryss.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Athena.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Azure.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Cathode.jpg
@@ -36,9 +34,7 @@
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Isis.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Lauren.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Lilith.jpg
-%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.olga.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Risa.jpg
-%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.ryanna.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Rylisa.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Sara.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Sarena.jpg
@@ -47,6 +43,10 @@
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Tasha.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Vixen.jpg
 %%PHPUA%%/images/plugin_ut/faces/SGirlSkins.Zanna.jpg
+%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.annaka.jpg
+%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.aryss.jpg
+%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.olga.jpg
+%%PHPUA%%/images/plugin_ut/faces/SGirlSkins.ryanna.jpg
 %%PHPUA%%/images/plugin_ut/faces/SoldierSkins.Arkon.jpg
 %%PHPUA%%/images/plugin_ut/faces/SoldierSkins.Brock.jpg
 %%PHPUA%%/images/plugin_ut/faces/SoldierSkins.Bruce.jpg
@@ -87,10 +87,15 @@
 %%PHPUA%%/templates/default/plugin_ut/x.js
 %%PHPUA%%/templates/javascript/plugin_ut/info.tpl
 %%PHPUA%%/templates/wap/plugin_ut/info.tpl
-@exec chown -R %%PHPUA_USER%%:%%PHPUA_GROUP%% %D/%%PHPUA%%
 @dirrm %%PHPUA%%/templates/wap/plugin_ut
+@dirrmtry %%PHPUA%%/templates/wap
 @dirrm %%PHPUA%%/templates/javascript/plugin_ut
+@dirrmtry %%PHPUA%%/templates/javascript
 @dirrm %%PHPUA%%/templates/default/plugin_ut
+@dirrmtry %%PHPUA%%/templates/default
+@dirrmtry %%PHPUA%%/templates
 @dirrm %%PHPUA%%/plugins/plugin_ut
+@dirrmtry %%PHPUA%%/plugins
 @dirrm %%PHPUA%%/images/plugin_ut/faces
 @dirrm %%PHPUA%%/images/plugin_ut
+@dirrmtry %%PHPUA%%/images