2 files changed, 47 insertions, 36 deletions

diff --git a/www/typo344/Makefile b/www/typo344/Makefile
index 9cc782b6a5aa..8910fcf6e756 100644
--- a/www/typo344/Makefile
+++ b/www/typo344/Makefile
@@ -6,66 +6,79 @@
 #
 
 PORTNAME=	typo3
-PORTVERSION=	4.4.7
-PORTREVISION=	1
+PORTVERSION=	4.4.8
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
-DISTNAME=	${PORTNAME}_src-${PORTVERSION}
+DISTNAME=	${TYPO3EDITION}-${PORTVERSION}
 
 MAINTAINER=	jumper99@gmx.de
 COMMENT=	The typo3 content management system
 
+LICENSE=	GPLv2
+
 NO_LATEST_LINK=	yes
 NO_BUILD=	yes
-USE_PHP=	mysql pcre xml session ctype filter json
+USE_PHP=	ctype filter json mysql pcre session xml
 WANT_PHP_WEB=	yes
 IGNORE_WITH_PHP=	4
 
-LICENSE=	GPLv2
-
-TYPO3DIR=	www/${DISTNAME}
-SITEDIR?=	www/typo344
-SITESRC=	${WRKDIR}/${EDITION}-${PORTVERSION}
-
-EDITION=	dummy
+TYPO3WWW=	www
+TYPO3VER=	typo344
+TYPO3SITE=	${TYPO3WWW}/${TYPO3VER}
+TYPO3PKG=	${TYPO3EDITION}-${PORTVERSION}
+TYPO3SRC=	typo3_src-${PORTVERSION}
+TYPO3EDITION=	blankpackage
 
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} ${EDITION}-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	${TYPO3EDITION}-${PORTVERSION}${EXTRACT_SUFX}
 
-OPTIONS=	GD "Configure with GDlib/freetype support" off \
-		ZLIB "Configure with zlib support" off \
-		IMAGICK "Configure with ImageMagick support" off
+OPTIONS=	CURL "Configure with cURL support" off \
+		GD "Configure with GDlib/freetype support" off \
+		IMAGICK "Configure with ImageMagick support" off \
+		MBSTRING "Configure with mbstring support" off \
+		ZLIB "Configure with zlib support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GD)
-USE_PHP+=	gd
+.if defined(WITH_CURL)
+USE_PHP+=	curl
 .endif
 
-.if defined(WITH_ZLIB)
-USE_PHP+=	zlib
+.if defined(WITH_GD)
+USE_PHP+=	gd
 .endif
 
 .if defined(WITH_IMAGICK)
 LIB_DEPENDS+=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick-nox11
 .endif
 
+.if defined(WITH_MBSTRING)
+USE_PHP+=	mbstring
+.endif
+
+.if defined(WITH_ZLIB)
+USE_PHP+=	zlib
+.endif
+
 pre-install:
-	${MV} ${SITESRC}/typo3conf/localconf.php ${SITESRC}/typo3conf/localconf.php.dist
+	${MV} ${WRKDIR}/${TYPO3PKG}/typo3conf/localconf.php ${WRKDIR}/${TYPO3PKG}/typo3conf/localconf.php.dist
 
 do-install:
-	${CP} -R ${WRKSRC} ${PREFIX}/${TYPO3DIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${TYPO3DIR}
-	${CP} -R ${SITESRC} ${PREFIX}/${SITEDIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${SITEDIR}
+	${CP} -R ${WRKDIR}/${TYPO3PKG}/ ${PREFIX}/${TYPO3SITE}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${TYPO3SITE}
+	${MV} ${PREFIX}/${TYPO3SITE}/${TYPO3SRC} ${PREFIX}/${TYPO3WWW}
+	${RM} ${PREFIX}/${TYPO3SITE}/typo3_src && \
+		cd ${PREFIX}/${TYPO3SITE} && \
+		${LN} -s ../${TYPO3SRC} typo3_src
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${TYPO3WWW}/${TYPO3SRC}
 
 post-install:
-	@${FIND} ${PREFIX}/${TYPO3DIR} -not -type d \
-	  | ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
-	@${FIND} -d ${PREFIX}/${TYPO3DIR} -type d \
-	  | ${SED} -ne 's,^${PREFIX}/${TYPO3DIR},@dirrm ${TYPO3DIR},p' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/${SITEDIR} -not -type d \
-	  | ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
-	@${FIND} -d ${PREFIX}/${SITEDIR} -type d \
-	  | ${SED} -ne 's,^${PREFIX}/${SITEDIR},@dirrm ${SITEDIR},p' >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/${TYPO3WWW}/${TYPO3SRC} -not -type d \
+		| ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
+	@${FIND} -d ${PREFIX}/${TYPO3WWW}/${TYPO3SRC} -type d \
+		| ${SED} -ne 's,^${PREFIX}/${TYPO3WWW}/${TYPO3SRC},@dirrm ${TYPO3DIR}/${TYPO3WWW}/${TYPO3SRC},p' >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/${TYPO3SITE} -not -type d \
+		| ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
+	@${FIND} -d ${PREFIX}/${TYPO3SITE} -type d \
+		| ${SED} -ne 's,^${PREFIX}/${TYPO3SITE},@dirrm ${TYPO3SITE},p' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/www/typo344/distinfo b/www/typo344/distinfo
index 23510e7a68f0..b7801789de61 100644
--- a/www/typo344/distinfo
+++ b/www/typo344/distinfo
@@ -1,4 +1,2 @@
-SHA256 (typo3_src-4.4.7.tar.gz) = 803ee4f33c990b9dda72ee315aa9085b0f5b6168d3a97412e93504417483cb37
-SIZE (typo3_src-4.4.7.tar.gz) = 18546586
-SHA256 (dummy-4.4.7.tar.gz) = 1709fd9d90275132c32209220e7ed951e9d1e2d4b21d64ffcaca493cb08cbd59
-SIZE (dummy-4.4.7.tar.gz) = 9567
+SHA256 (blankpackage-4.4.8.tar.gz) = 73eeadbd7ad5784b0cf493c1c770c028beef97c6294a55a45e285c8c1e4cd646
+SIZE (blankpackage-4.4.8.tar.gz) = 18440068