- Update to 4

- Assign to ports@

4 files changed, 99 insertions, 63 deletions

diff --git a/french/pluxml-devel/Makefile b/french/pluxml-devel/Makefile
index 833d32ec1c61..9ec433e407c4 100644
--- a/french/pluxml-devel/Makefile
+++ b/french/pluxml-devel/Makefile
@@ -4,13 +4,13 @@
 # $FreeBSD$
 
 PORTNAME=	pluxml
-PORTVERSION=	3
+PORTVERSION=	4
 CATEGORIES=	french www
 MASTER_SITES=	http://pluxml.org/download/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-blog-beta${PORTVERSION}
 
-MAINTAINER=	jadawin@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small weblog in php and xml
 
 USE_ZIP=	yes
@@ -31,10 +31,7 @@ PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 do-install:
 	${MKDIR} ${WWWDIR}
-.for  data in core images version
-	${CP} -R ${WRKSRC}/${data} ${WWWDIR}
-.endfor
-	${CP} ${WRKSRC}/*.php ${WWWDIR}
+	${CP} -R ${WRKSRC} ${WWWDIR}
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 
 post-install:
diff --git a/french/pluxml-devel/distinfo b/french/pluxml-devel/distinfo
index d8f1dfb5751a..44cfee83358d 100644
--- a/french/pluxml-devel/distinfo
+++ b/french/pluxml-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pluxml-blog-beta3.zip) = ee741ae310addea902df0aec0aa81fbd
-SHA256 (pluxml-blog-beta3.zip) = 3912db2b56937be5e9419e498f619b5ebb6614e231a70d3b10920f8f84e97b68
-SIZE (pluxml-blog-beta3.zip) = 37415
+MD5 (pluxml-blog-beta4.zip) = 66ed65b1432ed4e784038da801cd84d1
+SHA256 (pluxml-blog-beta4.zip) = b7c3ca7d8e7337d89793103e3434fc7e2ec6ea90a038fd18c394693b177c5438
+SIZE (pluxml-blog-beta4.zip) = 82834
diff --git a/french/pluxml-devel/files/pkg-message.in b/french/pluxml-devel/files/pkg-message.in
index 3620ae43ea9e..3f43f96172eb 100644
--- a/french/pluxml-devel/files/pkg-message.in
+++ b/french/pluxml-devel/files/pkg-message.in
@@ -1,3 +1,10 @@
+*******
+WARNING
+*******
+
+Use http://download.pluxml.org/plugins/migration-blog-beta3x-beta4.zip
+if you migrate to version 4 from 3
+
 ---------------------------------------------------------------------------
 
 Browse http://your.host.tld/%%PORTNAME%%/install.php to configure your blog
diff --git a/french/pluxml-devel/pkg-plist b/french/pluxml-devel/pkg-plist
index 5c25a7404fd3..e477411c31d6 100644
--- a/french/pluxml-devel/pkg-plist
+++ b/french/pluxml-devel/pkg-plist
@@ -1,56 +1,88 @@
-%%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%%/version
-@dirrm %%WWWDIR%%/images
-@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
+%%WWWDIR%%/pluxml/config.php
+%%WWWDIR%%/pluxml/core/admin/admin.css
+%%WWWDIR%%/pluxml/core/admin/article.php
+%%WWWDIR%%/pluxml/core/admin/auth.php
+%%WWWDIR%%/pluxml/core/admin/categories.php
+%%WWWDIR%%/pluxml/core/admin/commentaire.php
+%%WWWDIR%%/pluxml/core/admin/commentaires.php
+%%WWWDIR%%/pluxml/core/admin/documents.php
+%%WWWDIR%%/pluxml/core/admin/foot.php
+%%WWWDIR%%/pluxml/core/admin/images.php
+%%WWWDIR%%/pluxml/core/admin/img/article-new.png
+%%WWWDIR%%/pluxml/core/admin/img/article.png
+%%WWWDIR%%/pluxml/core/admin/img/categorie.png
+%%WWWDIR%%/pluxml/core/admin/img/comments.png
+%%WWWDIR%%/pluxml/core/admin/img/delete.png
+%%WWWDIR%%/pluxml/core/admin/img/document.png
+%%WWWDIR%%/pluxml/core/admin/img/eye.png
+%%WWWDIR%%/pluxml/core/admin/img/go.png
+%%WWWDIR%%/pluxml/core/admin/img/images.png
+%%WWWDIR%%/pluxml/core/admin/img/layout-chapo-mini.png
+%%WWWDIR%%/pluxml/core/admin/img/layout-chapo.png
+%%WWWDIR%%/pluxml/core/admin/img/layout-content-mini.png
+%%WWWDIR%%/pluxml/core/admin/img/layout-content.png
+%%WWWDIR%%/pluxml/core/admin/img/page.png
+%%WWWDIR%%/pluxml/core/admin/img/pluxml.png
+%%WWWDIR%%/pluxml/core/admin/img/puce.png
+%%WWWDIR%%/pluxml/core/admin/img/reglage.png
+%%WWWDIR%%/pluxml/core/admin/index.php
+%%WWWDIR%%/pluxml/core/admin/parametres_affichage.php
+%%WWWDIR%%/pluxml/core/admin/parametres_avances.php
+%%WWWDIR%%/pluxml/core/admin/parametres_base.php
+%%WWWDIR%%/pluxml/core/admin/parametres_compte.php
+%%WWWDIR%%/pluxml/core/admin/parametres_version.php
+%%WWWDIR%%/pluxml/core/admin/prepend.php
+%%WWWDIR%%/pluxml/core/admin/statique.php
+%%WWWDIR%%/pluxml/core/admin/statiques.php
+%%WWWDIR%%/pluxml/core/admin/top.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.admin.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.capcha.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.encrypt.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.erreur.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.feed.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.glob.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.motor.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.record.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.show.php
+%%WWWDIR%%/pluxml/core/lib/class.plx.utils.php
+%%WWWDIR%%/pluxml/core/lib/functions.js
+%%WWWDIR%%/pluxml/data/articles/.htaccess
+%%WWWDIR%%/pluxml/data/commentaires/.htaccess
+%%WWWDIR%%/pluxml/data/configuration/.htaccess
+%%WWWDIR%%/pluxml/data/statiques/.htaccess
+%%WWWDIR%%/pluxml/feed.php
+%%WWWDIR%%/pluxml/index.php
+%%WWWDIR%%/pluxml/install.php
+%%WWWDIR%%/pluxml/themes/defaut/article.php
+%%WWWDIR%%/pluxml/themes/defaut/categorie.php
+%%WWWDIR%%/pluxml/themes/defaut/erreur.php
+%%WWWDIR%%/pluxml/themes/defaut/footer.php
+%%WWWDIR%%/pluxml/themes/defaut/header.php
+%%WWWDIR%%/pluxml/themes/defaut/home.php
+%%WWWDIR%%/pluxml/themes/defaut/img/blue.gif
+%%WWWDIR%%/pluxml/themes/defaut/img/comment.gif
+%%WWWDIR%%/pluxml/themes/defaut/img/feed-icon-14x14.gif
+%%WWWDIR%%/pluxml/themes/defaut/img/fond_page.jpg
+%%WWWDIR%%/pluxml/themes/defaut/img/info.gif
+%%WWWDIR%%/pluxml/themes/defaut/img/tab.jpg
+%%WWWDIR%%/pluxml/themes/defaut/sidebar.php
+%%WWWDIR%%/pluxml/themes/defaut/static.php
+%%WWWDIR%%/pluxml/themes/defaut/style.css
+%%WWWDIR%%/pluxml/version
+@dirrm %%WWWDIR%%/pluxml/themes/defaut/img
+@dirrm %%WWWDIR%%/pluxml/themes/defaut
+@dirrm %%WWWDIR%%/pluxml/themes
+@dirrm %%WWWDIR%%/pluxml/data/statiques
+@dirrm %%WWWDIR%%/pluxml/data/images
+@dirrm %%WWWDIR%%/pluxml/data/documents
+@dirrm %%WWWDIR%%/pluxml/data/configuration
+@dirrm %%WWWDIR%%/pluxml/data/commentaires
+@dirrm %%WWWDIR%%/pluxml/data/articles
+@dirrm %%WWWDIR%%/pluxml/data
+@dirrm %%WWWDIR%%/pluxml/core/lib
+@dirrm %%WWWDIR%%/pluxml/core/admin/img
+@dirrm %%WWWDIR%%/pluxml/core/admin
+@dirrm %%WWWDIR%%/pluxml/core
+@dirrm %%WWWDIR%%/pluxml
 @dirrm %%WWWDIR%%
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%WWWDIR%%