===================================================================
RCS file: /cvs/ports/mail/squirrelmail/Makefile,v
retrieving revision 1.14
retrieving revision 1.17
diff -u -r1.14 -r1.17
--- ports/mail/squirrelmail/Makefile	2013/02/20 20:20:25	1.14
+++ ports/mail/squirrelmail/Makefile	2013/10/06 17:29:16	1.17
@@ -1,26 +1,24 @@
-# $OpenBSD: Makefile,v 1.14 2013/02/20 20:20:25 kirby Exp $
+# $OpenBSD: Makefile,v 1.17 2013/10/06 17:29:16 kirby Exp $
 
 COMMENT =		standards-based webmail package written in PHP
 
 DISTNAME =		squirrelmail-webmail-1.4.22
+REVISION = 		0
 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
@@ -32,9 +30,10 @@
 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/squirrelmail/data/,/var/squirrelmail/data,g' \
-		${WRKDIST}/config/config_default.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}