4 files changed, 24 insertions, 36 deletions

diff --git a/german/wordpress/Makefile b/german/wordpress/Makefile
index 9fe67c8f9470..bbc693df291d 100644
--- a/german/wordpress/Makefile
+++ b/german/wordpress/Makefile
@@ -7,26 +7,23 @@
 #
 
 PORTNAME=	wordpress
-PORTVERSION=	3.0
+PORTVERSION=	3.0.3
 CATEGORIES=	german www
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 PKGNAMEPREFIX=	de-
-DISTNAME=	wordpress_300-de
+DISTNAME=	wordpress_303-de
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A state-of-the-art semantic personal publishing platform
 
+USE_ZIP=	yes
+NO_BUILD=	yes
+USE_PHP=	gd mysql pcre tokenizer xml zip
+WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	YES
-USE_PHP=	mysql pcre xml gd tokenizer
-NO_BUILD=	YES
-WANT_PHP_WEB=	YES
-WORDPRESS?=	www/wordpress
-PLIST_SUB+=	WORDPRESS=${WORDPRESS}
 PLIST=		${WRKDIR}/pkg-plist
-
-PORTDOCS=	license.txt readme.html liesmich.html
+PORTDOCS=	license.txt readme.html
 
 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
@@ -34,24 +31,18 @@ pre-everything::
 	@sleep 1
 
 pre-install:
-	cd ${WRKSRC} && ${FIND} -s * -type f | \
-		${SED} -e 's|^|${WORDPRESS}/|' > ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm ${WORDPRESS}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${WORDPRESS} >> ${PLIST}
-	if [! -f ${WRKSRC}/wp-config-sample.php]; then ${CP} \
+	cd ${WRKSRC}/ && \
+		(${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|'; \
+		${FIND} -d . -type d | ${SED} -e 's|^\.|@dirrm %%WWWDIR%%|') > ${PLIST}
+	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
 
 do-install:
-	@${MKDIR} ${PREFIX}/${WORDPRESS}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${WORDPRESS}
-	@${CHMOD} 755 ${PREFIX}/${WORDPRESS}
-	${CP} -R ${WRKSRC}/ ${PREFIX}/${WORDPRESS}
+	${INSTALL} -d -g ${WWWGRP} -m 755 -o ${WWWOWN} ${WWWDIR}/
+	${CP} -R ${WRKSRC}/ ${WWWDIR}/
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
-.endfor
+	${MKDIR} ${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
 post-install:
diff --git a/german/wordpress/distinfo b/german/wordpress/distinfo
index 4214a7f66f21..5bfa7f6f0571 100644
--- a/german/wordpress/distinfo
+++ b/german/wordpress/distinfo
@@ -1,3 +1,2 @@
-MD5 (wordpress_300-de.zip) = de2192e1bae59c3845c1b3feb028395c
-SHA256 (wordpress_300-de.zip) = b3a8596f9a67e8290d6f42f3dd1c60922098a9d2a1afd972d7d4d75836ad9128
-SIZE (wordpress_300-de.zip) = 3344551
+SHA256 (wordpress_303-de.zip) = 19d255ae68d790332e2091d66183b12a311ef6233d47f3b934848140f623a1e1
+SIZE (wordpress_303-de.zip) = 3261748
diff --git a/german/wordpress/pkg-descr b/german/wordpress/pkg-descr
index 148054d811ce..55ab7ab1942d 100644
--- a/german/wordpress/pkg-descr
+++ b/german/wordpress/pkg-descr
@@ -1,7 +1,7 @@
 WordPress is a state-of-the-art semantic personal publishing platform
-with a focus on aesthetics, web standards, and usability. 
+with a focus on aesthetics, web standards, and usability.
 
 More simply, Wordpress is what you use when you want to work
-with your blogging software, not fight it. 
+with your blogging software, not fight it.
 
 WWW:	http://wordpress-deutschland.org/
diff --git a/german/wordpress/pkg-message b/german/wordpress/pkg-message
index 1371d6d41723..0fcaa079166e 100644
--- a/german/wordpress/pkg-message
+++ b/german/wordpress/pkg-message
@@ -1,8 +1,6 @@
                   **** NOTE ****
-        Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
-        in ${PREFIX}/${WORDPRESS}
-        And Modify it to fit your MySQL.
-        Maybe you need 'mysqladmin create wordpress' first
-
-        If you are upgrading from 1.x or 2.0 to 2.x, please run
-        http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 2.1
+Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
+in ${WWWDIR} and modify it to fit your MySQL.
+Maybe you need 'mysqladmin create wordpress' first.
+If you are upgrading from 1.x or 2.x to 3.x, please run
+http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x