Index: head/devel/beautifyphp/Makefile
===================================================================
--- head/devel/beautifyphp/Makefile	(revision 434811)
+++ head/devel/beautifyphp/Makefile	(revision 434812)
@@ -1,32 +1,39 @@
 # Created by: Yen-Ming Lee <leeym@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	beautifyphp
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 MASTER_SITES=	SF
 DISTNAME=	beautify_php_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR beautifier for PHP4
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
 
+USES=		shebangfix
+SHEBANG_FILES=	beautify_php
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	bin/beautify_php share/${PORTNAME}/beautify_php.php \
+PLIST_FILES=	bin/beautify_php \
+		share/${PORTNAME}/beautify_php.php \
 		share/pear/beautify_php.class.inc
 
 post-patch:
-	@${REINPLACE_CMD} 's,/usr/bin/php,${LOCALBASE}/bin/php,g' ${WRKSRC}/beautify_php
-	@${FIND} ${WRKSRC} -name "*.bak" -or -name "*.orig" -delete
+	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/beautify_php
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/beautify_php ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/beautify_php.php ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pear
 	${INSTALL_DATA} ${WRKSRC}/beautify_php.class.inc ${STAGEDIR}${PREFIX}/share/pear
 
 .include <bsd.port.mk>
Index: head/devel/beautifyphp/files/patch-beautify_php
===================================================================
--- head/devel/beautifyphp/files/patch-beautify_php	(revision 434811)
+++ head/devel/beautifyphp/files/patch-beautify_php	(revision 434812)
@@ -1,10 +1,10 @@
---- beautify_php.orig	Thu Aug  4 02:28:56 2005
-+++ beautify_php	Thu Aug  4 02:29:09 2005
+--- beautify_php.orig	2003-05-07 19:56:23 UTC
++++ beautify_php
 @@ -3,6 +3,7 @@
      /**
      * Console script to use Beautify PHP from the command line
      */
 +    ini_set('include_path', '/usr/local/share/pear:/usr/local/share/pear/bootstrap');
      /**
      * Require PEAR Class
      */
Index: head/devel/beautifyphp/pkg-descr
===================================================================
--- head/devel/beautifyphp/pkg-descr	(revision 434811)
+++ head/devel/beautifyphp/pkg-descr	(revision 434812)
@@ -1,24 +1,24 @@
 Beautify PHP
-WWW: http://www.bierkandt.org/beautify/index.php
 
-What it does:
 This program tries to reformat and beautify PHP source code files automatically.
 The program is Open Source and distributed under the terms of GNU GPL.
 It is written in PHP and has a web frontend.
 
 Who needs it:
 - people, who get PHP code from other coders and are slightly confused
 - people, who can't read their own PHP code anymore
 - people, who want to share their PHP code
 
 Basic features:
 - automatic indentation of PHP source code according to given number of spaces
 - automatic newlines, if required
 - includes settings for braces according to C or PEAR style
 - can make use of PHPs integrated code highlight option
 - can limit number of chars per line. This will break the code at a space and
   outputs the rest on the next line with an additional indent. (I used this to
   reformat my code to put it in a LATEX document. This PHP code normally can't
   be executed anymore, it is only useful for printout.)
 - turn off and on beautifying by inserting "// NO_BEAUTIFY" or "// BEAUTIFY"
   in source code
+
+WWW: http://www.bierkandt.org/beautify/index.php