===================================================================
RCS file: /cvs/ports/mail/squirrelmail/Makefile,v
retrieving revision 1.10
retrieving revision 1.18
diff -u -r1.10 -r1.18
--- ports/mail/squirrelmail/Makefile	2010/12/24 05:18:13	1.10
+++ ports/mail/squirrelmail/Makefile	2013/10/10 03:57:10	1.18
@@ -1,36 +1,39 @@
-# $OpenBSD: Makefile,v 1.10 2010/12/24 05:18:13 yason Exp $
+# $OpenBSD: Makefile,v 1.18 2013/10/10 03:57:10 kirby Exp $
 
 COMMENT =		standards-based webmail package written in PHP
 
-DISTNAME =		squirrelmail-1.4.21
+DISTNAME =		squirrelmail-webmail-1.4.22
+REVISION = 		1
+PKGNAME = 		${DISTNAME:S/-webmail//}
 
 CATEGORIES =		mail www
 
 HOMEPAGE =		http://www.squirrelmail.org/
 
-MAINTAINER =		Kirill Bychkov <yason@linklevel.net>
+MAINTAINER =		Kirill Bychkov <kirby@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
-PERMIT_PACKAGE_FTP =	Yes
-PERMIT_DISTFILES_CDROM =Yes
-PERMIT_DISTFILES_FTP =	Yes
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 
 NO_BUILD =		Yes
-NO_REGRESS = 		Yes
+NO_TEST = 		Yes
 PKG_ARCH = 		*
 
 PREFIX = 		/var/www
 INSTDIR = 		${PREFIX}/htdocs/squirrelmail
 
-RUN_DEPENDS = 		php5-core-*:www/php5/core
+MODULES = 		lang/php
+MODPHP_RUNDEP = 	Yes
 
 do-configure:
 	# This option hides SquirrelMail version on login page
 	echo "\$$hide_sm_attributions = true;" >> ${WRKDIST}/config/config_local.php
+	perl -pi -e 's,/var/local/,/var/,g' ${WRKDIST}/config/config_default.php
 	mv ${WRKDIST}/config/config_local.php ${WRKDIST}/config/config_local_default.php
+	# php-5.4 compatibility
+	perl -pi -e 's,hex2bin,convertHex2bin,g' ${WRKDIST}/plugins/mail_fetch/functions.php
 do-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}
 	cd ${WRKDIST}; tar cf - . | tar xf - -C ${INSTDIR}