3 files changed, 63 insertions, 46 deletions

diff --git a/french/pluxml-devel/Makefile b/french/pluxml-devel/Makefile
index 9dfecdd01caa..42a056e08f67 100644
--- a/french/pluxml-devel/Makefile
+++ b/french/pluxml-devel/Makefile
@@ -1,20 +1,24 @@
 # New ports collection makefile for:   pluxml
-# Date created:                7 August 2007
+# Date created:                14 December 2007
 # Whom:                        Philippe Audeoud <jadawin@tuxaco.net>
 # $FreeBSD$
 
 PORTNAME=	pluxml
-PORTVERSION=	0.3.1
+PORTVERSION=	3
 CATEGORIES=	french www
 MASTER_SITES=	http://pluxml.org/download/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-blog-beta${PORTVERSION}
 
 MAINTAINER=	jadawin@tuxaco.net
 COMMENT=	Small weblog in php and xml
 
+USE_ZIP=	yes
 USE_PHP=	xml pcre
 WANT_PHP_WEB=	yes
 
+WRKSRC=	${WRKDIR}/${PORTNAME}
+
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -27,7 +31,7 @@ PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 do-install:
 	${MKDIR} ${WWWDIR}
-.for  data in images pluxml version
+.for  data in core images version
 	${CP} -R ${WRKSRC}/${data} ${WWWDIR}
 .endfor
 	${CP} ${WRKSRC}/*.php ${WWWDIR}
diff --git a/french/pluxml-devel/distinfo b/french/pluxml-devel/distinfo
index 38f00c7eb016..d8f1dfb5751a 100644
--- a/french/pluxml-devel/distinfo
+++ b/french/pluxml-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pluxml0.3.1.tar.gz) = 2c8194441d1de4944c3713daa11e0613
-SHA256 (pluxml0.3.1.tar.gz) = 4eae6ccde259d4df41cb1430ac76e7dcc327bb90a9e20db0a79c368f496dea6d
-SIZE (pluxml0.3.1.tar.gz) = 27903
+MD5 (pluxml-blog-beta3.zip) = ee741ae310addea902df0aec0aa81fbd
+SHA256 (pluxml-blog-beta3.zip) = 3912db2b56937be5e9419e498f619b5ebb6614e231a70d3b10920f8f84e97b68
+SIZE (pluxml-blog-beta3.zip) = 37415
diff --git a/french/pluxml-devel/pkg-plist b/french/pluxml-devel/pkg-plist
index 114b4d993547..5c25a7404fd3 100644
--- a/french/pluxml-devel/pkg-plist
+++ b/french/pluxml-devel/pkg-plist
@@ -1,43 +1,56 @@
-%%WWWDIR%%/version
+%%WWWDIR%%/core/admin/admin.css
+%%WWWDIR%%/core/admin/articles.php
+%%WWWDIR%%/core/admin/auth.php
+%%WWWDIR%%/core/admin/categories.php
+%%WWWDIR%%/core/admin/commentaires.php
+%%WWWDIR%%/core/admin/foot.php
+%%WWWDIR%%/core/admin/images.php
+%%WWWDIR%%/core/admin/img/article-new.png
+%%WWWDIR%%/core/admin/img/article.png
+%%WWWDIR%%/core/admin/img/categorie.png
+%%WWWDIR%%/core/admin/img/go.png
+%%WWWDIR%%/core/admin/img/images.png
+%%WWWDIR%%/core/admin/img/pluxml.png
+%%WWWDIR%%/core/admin/img/puce.png
+%%WWWDIR%%/core/admin/img/reglage.png
+%%WWWDIR%%/core/admin/index.php
+%%WWWDIR%%/core/admin/parametres.php
+%%WWWDIR%%/core/admin/prepend.php
+%%WWWDIR%%/core/admin/top.php
+%%WWWDIR%%/core/atom.php
+%%WWWDIR%%/core/conf/.htaccess
+%%WWWDIR%%/core/conf/index.htm
+%%WWWDIR%%/core/lib/class.admin.php
+%%WWWDIR%%/core/lib/class.capcha.php
+%%WWWDIR%%/core/lib/class.glob.php
+%%WWWDIR%%/core/lib/class.pluxml.php
+%%WWWDIR%%/core/lib/class.recordset.php
+%%WWWDIR%%/core/lib/functions.js
+%%WWWDIR%%/core/lib/functions.php
+%%WWWDIR%%/core/lib/lib.util.php
+%%WWWDIR%%/core/rss.php
+%%WWWDIR%%/core/templates/defaut/img/feed-icon-14x14-2.gif
+%%WWWDIR%%/core/templates/defaut/img/feed-icon-14x14.gif
+%%WWWDIR%%/core/templates/defaut/style.css
+%%WWWDIR%%/core/templates/defaut/template.php
+%%WWWDIR%%/core/xml/.htaccess
+%%WWWDIR%%/core/xml/index.htm
+%%WWWDIR%%/core/xmlcom/.htaccess
+%%WWWDIR%%/core/xmlcom/index.htm
+%%WWWDIR%%/images/index.htm
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install.php
-%%WWWDIR%%/maj.php
-%%WWWDIR%%/images/index.htm
-%%WWWDIR%%/pluxml/atom.php
-%%WWWDIR%%/pluxml/rss.php
-%%WWWDIR%%/pluxml/admin/admin.css
-%%WWWDIR%%/pluxml/admin/articles.php
-%%WWWDIR%%/pluxml/admin/auth.php
-%%WWWDIR%%/pluxml/admin/categories.php
-%%WWWDIR%%/pluxml/admin/foot.php
-%%WWWDIR%%/pluxml/admin/images.php
-%%WWWDIR%%/pluxml/admin/include.php
-%%WWWDIR%%/pluxml/admin/index.php
-%%WWWDIR%%/pluxml/admin/informations.php
-%%WWWDIR%%/pluxml/admin/parametres.php
-%%WWWDIR%%/pluxml/admin/top.php
-%%WWWDIR%%/pluxml/admin/img/icon.png
-%%WWWDIR%%/pluxml/admin/img/puce.png
-%%WWWDIR%%/pluxml/lib/class.admin.php
-%%WWWDIR%%/pluxml/lib/class.pluxml.php
-%%WWWDIR%%/pluxml/lib/functions.js
-%%WWWDIR%%/pluxml/lib/functions.php
-%%WWWDIR%%/pluxml/lib/lib.util.php
-%%WWWDIR%%/pluxml/templates/default/style.css
-%%WWWDIR%%/pluxml/templates/default/template.php
-%%WWWDIR%%/pluxml/templates/default/img/fond.jpg
-%%WWWDIR%%/pluxml/templates/default/img/header.jpg
-%%WWWDIR%%/pluxml/xml/.htaccess
-%%WWWDIR%%/pluxml/conf/.htaccess
-@dirrm %%WWWDIR%%/pluxml/templates/default/img
-@dirrm %%WWWDIR%%/pluxml/templates/default
-@dirrm %%WWWDIR%%/pluxml/templates
+%%WWWDIR%%/version
 @dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/pluxml/lib
-@dirrm %%WWWDIR%%/pluxml/admin/img
-@dirrm %%WWWDIR%%/pluxml/admin
-@dirrmtry %%WWWDIR%%/pluxml/xml
-@dirrmtry %%WWWDIR%%/pluxml/conf
-@dirrmtry %%WWWDIR%%/pluxml
-@dirrmtry %%WWWDIR%%
+@dirrm %%WWWDIR%%/core/xmlcom
+@dirrm %%WWWDIR%%/core/xml
+@dirrm %%WWWDIR%%/core/templates/defaut/img
+@dirrm %%WWWDIR%%/core/templates/defaut
+@dirrm %%WWWDIR%%/core/templates
+@dirrm %%WWWDIR%%/core/lib
+@dirrm %%WWWDIR%%/core/conf
+@dirrm %%WWWDIR%%/core/admin/img
+@dirrm %%WWWDIR%%/core/admin
+@dirrm %%WWWDIR%%/core
+@dirrm %%WWWDIR%%
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%WWWDIR%%