ports/80399: [PATCH] www/phpmyfaq: correct the directorys which needed by phpMyFAQ & fix pkg-message

[chinsan]

>Number:         80399
>Category:       ports
>Synopsis:       [PATCH] www/phpmyfaq: correct the directorys which needed by phpMyFAQ & fix pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 27 10:30:26 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root at harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
	- correct the directorys which needed by phpMyFAQ 
	- fix pkg-message
	Sorry for that.
>How-To-Repeat:
>Fix:

--- phpmyfaq.1.4.8_1.patch begins here ---
diff -ruN phpmyfaq.orig/Makefile phpmyfaq/Makefile
--- phpmyfaq.orig/Makefile	Fri Apr 22 12:06:12 2005
+++ phpmyfaq/Makefile	Sat Apr 23 17:23:53 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpmyfaq
 PORTVERSION=	1.4.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.phpmyfaq.de/download/
 DISTNAME=	${PORTNAME}.${PORTVERSION}.full
@@ -30,21 +31,15 @@
 
 PHPMYFAQDIR?=	${WWWDOCROOT}/${PHPMYFAQURL}
 PLIST=		${WRKDIR}/pkg-plist
-EXCEPTFILES=	${PREFIX}/${PHPMYFAQDIR}/install/bbcode2xhtml.php \
-		${PREFIX}/${PHPMYFAQDIR}/install/index.html \
-		${PREFIX}/${PHPMYFAQDIR}/install/installer.php \
-		${PREFIX}/${PHPMYFAQDIR}/install/update.php
 
 .include <bsd.port.pre.mk>
 
 pre-install:
-	cd ${WRKSRC} && ${MV} inc/data.php.original inc/data.php \
-		&&  ${MV} inc/config.php.original inc/config.php \
-		&& ${FIND} -s . -type f | \
+	cd ${WRKSRC} && ${FIND} -s . -type f | \
 		${SED} -e 's|^./||;s|^|${PHPMYFAQDIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${PHPMYFAQDIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${PHPMYFAQDIR}/attachment/ >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrm ${PHPMYFAQDIR}/attachments/ >> ${PLIST} \
 		&& ${ECHO_CMD} @dirrm ${PHPMYFAQDIR}/data/ >> ${PLIST} \
 		&& ${ECHO_CMD} @dirrm ${PHPMYFAQDIR}/pdf/ >> ${PLIST} \
 		&& ${ECHO_CMD} @dirrm ${PHPMYFAQDIR} >> ${PLIST}
@@ -52,23 +47,22 @@
 do-install:
 	# Data files
 	-${MKDIR} ${PREFIX}/${PHPMYFAQDIR}
-	@${CHOWN} www:www ${PREFIX}/${PHPMYFAQDIR}
 	@${CHMOD} 755 ${PREFIX}/${PHPMYFAQDIR}
 	@${CP} -R ${WRKSRC}/ ${PREFIX}/${PHPMYFAQDIR}
-	@${MKDIR} ${PREFIX}/${PHPMYFAQDIR}/attachment/
+	@${MKDIR} ${PREFIX}/${PHPMYFAQDIR}/attachments/
 	@${MKDIR} ${PREFIX}/${PHPMYFAQDIR}/data/
 	@${MKDIR} ${PREFIX}/${PHPMYFAQDIR}/pdf/
-	#set the correct permissions
+	# set the correct permissions
 	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQDIR}/inc/
-	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQDIR}/attachment/
+	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQDIR}/attachments/
 	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQDIR}/data/
 	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQDIR}/images/
 	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQDIR}/pdf/
 	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQDIR}/xml/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPMYFAQDIR}
 
 post-install:
 	@${SED} \
-	 -e 's|%%DELETEFILES%%|${EXCEPTFILES}|' \
 	 -e 's|%%PHPMYFAQURL%%|${PHPMYFAQURL}|' \
 	 -e 's|%%PHPMYFAQDIR%%|${PREFIX}/${PHPMYFAQDIR}|' ${PKGMESSAGE}
 
diff -ruN phpmyfaq.orig/pkg-message phpmyfaq/pkg-message
--- phpmyfaq.orig/pkg-message	Fri Apr 22 12:06:12 2005
+++ phpmyfaq/pkg-message	Sat Apr 23 17:24:26 2005
@@ -7,16 +7,10 @@
   database access method.
 
   To configure phpMyFAQ point your browser to
-	http://localhost/%%PHPMYFAQURL%%/install/index.php
+	http://localhost/%%PHPMYFAQURL%%/install/installer.php
 	http://localhost/%%PHPMYFAQURL%%/admin/index.php
 
   Use the username admin and your selected password 
   for your first login into the admin section.
-
-  After configuring phpMyFAQ and ensuring that it is operational, 
-  you MUST delete the following files manually for security purposes 
-  from %%PHPMYFAQDIR%%:
-
-  %%DELETEFILES%%
 
 ----------------------------------------------------------------------------
--- phpmyfaq.1.4.8_1.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: