3 files changed, 218 insertions, 148 deletions

diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index c70422e22834..2a7f2f505423 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	coppermine
-PORTVERSION=	1.3.5
+PORTVERSION=	1.4.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A web picture gallery script
 
 USE_PHP=	mysql pcre
-WANT_PHP_MOD=	yes
 USE_ZIP=	yes
 
 .if defined (WITH_IMAGEMAGICK)
@@ -25,16 +24,20 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 USE_PHP+=	gd
 .endif
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+CPGDIR?=	www/coppermine
+WWWOWN?=	www
+WWWGRP?=	www
+
 NO_BUILD=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/cpg${PORTVERSION:S/.//g}
 DOCFILES=	CHANGELOG
 EXCEPTFILES=	${DOCFILES} COPYING docs/COPYING
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB=	CPGDIR=${CPGDIR}
 
-pre-fetch:
-.if !defined(CPGDIR)
+pre-everything::
+.if ${CPGDIR} == "www/coppermine"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Define CPGDIR to override default of 'www/coppermine'."
 	@${ECHO_MSG} ""
@@ -51,21 +54,17 @@ pre-patch:
 	    -e 's|%%CPGDIR%%|${CPGDIR}|g' \
 	    ${.CURDIR}/pkg-message > ${PKGMESSAGE}
 
-CPGDIR?=	www/coppermine
-WWWOWN?=	www
-WWWGRP?=	www
-
 do-install:
 	@${MKDIR} -m 0755 ${PREFIX}/${CPGDIR}
-	@cd ${WRKSRC} && \
+	cd ${WRKSRC} && \
 	    ${FIND} . -name \*.orig ${EXCEPTFILES:S/^/-o -name /} -o -print | \
 	    ${CPIO} ${CPIOARGS} ${WWWOWN}:${WWWGRP} ${PREFIX}/${CPGDIR}
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
 .endif
-
-post-install:
 	@${CAT} ${PKGMESSAGE}
 
 ########################################################################
@@ -76,17 +75,17 @@ post-install:
 # build a pkg-plist file.
 build-plist:
 	${FIND} ${DOCSDIR} -type f | \
-	    ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
-	    ${SORT} > pkg-plist
+		${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
+		${SORT} > pkg-plist
 	${FIND} ${PREFIX}/${CPGDIR}/* -type f | \
-	    ${SED} -e 's|${PREFIX}/${CPGDIR}|%%CPGDIR%%|' | \
-	    ${SORT} >> pkg-plist
+		${SED} -e 's|${PREFIX}/${CPGDIR}|%%CPGDIR%%|' | \
+		${SORT} >> pkg-plist
 	${FIND} ${PREFIX}/${CPGDIR}/* -type d | \
-	    ${SED} -e 's|${PREFIX}/${CPGDIR}|@dirrm %%CPGDIR%%|' | \
-	    ${SORT} -r >> pkg-plist
+		${SED} -e 's|${PREFIX}/${CPGDIR}|@dirrm %%CPGDIR%%|' | \
+		${SORT} -r >> pkg-plist
 	${FIND} ${DOCSDIR} -type d | \
-	    ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \
-	    ${SORT} -r >> pkg-plist
+		${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \
+		${SORT} -r >> pkg-plist
 	${ECHO} "@dirrmtry %%CPGDIR%%" >> pkg-plist
 
 .include <bsd.port.mk>
diff --git a/www/coppermine/distinfo b/www/coppermine/distinfo
index 19003b5aa078..269956e32d2b 100644
--- a/www/coppermine/distinfo
+++ b/www/coppermine/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpg1.3.5.zip) = 3cdf1bfc3223827179e3acd3f92d9953
-SHA256 (cpg1.3.5.zip) = c6ddc74b9ecef23bc9bad19d53374bdda546cfb9ecaf3022336989fab2eb81af
-SIZE (cpg1.3.5.zip) = 3047281
+MD5 (cpg1.4.6.zip) = 936091d488a577fb5b226320f0871fb1
+SHA256 (cpg1.4.6.zip) = 0b1ed29840e7727013de380922b44da4b6af8871ff72077e5bd066d19415228e
+SIZE (cpg1.4.6.zip) = 3101625
diff --git a/www/coppermine/pkg-plist b/www/coppermine/pkg-plist
index f1e8f5b69ef8..39cb1f2c7927 100644
--- a/www/coppermine/pkg-plist
+++ b/www/coppermine/pkg-plist
@@ -1,39 +1,56 @@
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%CPGDIR%%/README.txt
 %%CPGDIR%%/addfav.php
 %%CPGDIR%%/addpic.php
 %%CPGDIR%%/admin.php
 %%CPGDIR%%/albmgr.php
 %%CPGDIR%%/albums/edit/index.html
-%%CPGDIR%%/albums/index.html
-%%CPGDIR%%/albums/userpics/index.html
+%%CPGDIR%%/albums/edit/no_FTP-uploads_into_this_folder!
+%%CPGDIR%%/albums/index.php
+%%CPGDIR%%/albums/userpics/index.php
+%%CPGDIR%%/albums/userpics/no_FTP-uploads_into_this_folder!
 %%CPGDIR%%/anycontent.php
 %%CPGDIR%%/banning.php
-%%CPGDIR%%/bridge/invisionboard.inc.php
+%%CPGDIR%%/bridge/coppermine.inc.php
+%%CPGDIR%%/bridge/invisionboard20.inc.php
+%%CPGDIR%%/bridge/mambo.inc.php
+%%CPGDIR%%/bridge/mybb.inc.php
+%%CPGDIR%%/bridge/phorum.inc.php
 %%CPGDIR%%/bridge/phpbb.inc.php
-%%CPGDIR%%/bridge/punbb.inc.php
-%%CPGDIR%%/bridge/smf.inc.php
-%%CPGDIR%%/bridge/vbulletin.inc.php
-%%CPGDIR%%/bridge/vbulletin23.inc.php
-%%CPGDIR%%/bridge/vbulletin3.0_readme.txt
+%%CPGDIR%%/bridge/phpbb2018.inc.php
+%%CPGDIR%%/bridge/phpbb22.inc.php
+%%CPGDIR%%/bridge/punbb115.inc.php
+%%CPGDIR%%/bridge/punbb12.inc.php
+%%CPGDIR%%/bridge/smf10.inc.php
+%%CPGDIR%%/bridge/udb_base.inc.php
 %%CPGDIR%%/bridge/vbulletin30.inc.php
-%%CPGDIR%%/bridge/vbulletin3gamma.inc.php
-%%CPGDIR%%/bridge/woltlab21.inc.php
-%%CPGDIR%%/bridge/yabbse.inc.php
+%%CPGDIR%%/bridge/xmb.inc.php
+%%CPGDIR%%/bridge/xoops.inc.php
+%%CPGDIR%%/bridgemgr.php
 %%CPGDIR%%/calendar.php
 %%CPGDIR%%/catmgr.php
+%%CPGDIR%%/charsetmgr.php
 %%CPGDIR%%/config.php
 %%CPGDIR%%/db_ecard.php
 %%CPGDIR%%/db_input.php
 %%CPGDIR%%/delete.php
 %%CPGDIR%%/displayecard.php
 %%CPGDIR%%/displayimage.php
+%%CPGDIR%%/displayreport.php
+%%CPGDIR%%/docs/README.html
 %%CPGDIR%%/docs/faq.htm
+%%CPGDIR%%/docs/faq_fr.htm
 %%CPGDIR%%/docs/index.htm
+%%CPGDIR%%/docs/index_fr.htm
 %%CPGDIR%%/docs/pics/admin_menu.gif
-%%CPGDIR%%/docs/pics/admin_mode_bar.GIF
+%%CPGDIR%%/docs/pics/admin_mode_bar.gif
 %%CPGDIR%%/docs/pics/albmgr.gif
-%%CPGDIR%%/docs/pics/album_menu.GIF
-%%CPGDIR%%/docs/pics/category_cp.GIF
+%%CPGDIR%%/docs/pics/album_menu.gif
+%%CPGDIR%%/docs/pics/barre_menu_fr.gif
+%%CPGDIR%%/docs/pics/bridge_01_start.gif
+%%CPGDIR%%/docs/pics/bridge_02_app.gif
+%%CPGDIR%%/docs/pics/bridge_03_path.gif
+%%CPGDIR%%/docs/pics/category_cp.gif
 %%CPGDIR%%/docs/pics/config_language.gif
 %%CPGDIR%%/docs/pics/cpg10.gif
 %%CPGDIR%%/docs/pics/cpg110.gif
@@ -41,6 +58,7 @@
 %%CPGDIR%%/docs/pics/cpg120.gif
 %%CPGDIR%%/docs/pics/cpg121.gif
 %%CPGDIR%%/docs/pics/cpg13x.gif
+%%CPGDIR%%/docs/pics/cpg140.gif
 %%CPGDIR%%/docs/pics/cpg1x.gif
 %%CPGDIR%%/docs/pics/cpg_all.gif
 %%CPGDIR%%/docs/pics/cpg_exclam.gif
@@ -51,24 +69,66 @@
 %%CPGDIR%%/docs/pics/cust_thmb_final.gif
 %%CPGDIR%%/docs/pics/delete.gif
 %%CPGDIR%%/docs/pics/down.gif
+%%CPGDIR%%/docs/pics/ecard_log.gif
 %%CPGDIR%%/docs/pics/edit.gif
-%%CPGDIR%%/docs/pics/edit_album.GIF
-%%CPGDIR%%/docs/pics/edit_picture.GIF
+%%CPGDIR%%/docs/pics/edit_album.gif
+%%CPGDIR%%/docs/pics/edit_picture.gif
 %%CPGDIR%%/docs/pics/edit_video.gif
-%%CPGDIR%%/docs/pics/group_cp.GIF
-%%CPGDIR%%/docs/pics/groupsscrsht2.jpg
+%%CPGDIR%%/docs/pics/exif_data_cpg1.4.x.jpg
+%%CPGDIR%%/docs/pics/exifmanager_cpg1.4.x.gif
+%%CPGDIR%%/docs/pics/fr_admin_menu.gif
+%%CPGDIR%%/docs/pics/fr_albmgr.gif
+%%CPGDIR%%/docs/pics/fr_album_menu.gif
+%%CPGDIR%%/docs/pics/fr_bridge_01_start.gif
+%%CPGDIR%%/docs/pics/fr_bridge_02_app.gif
+%%CPGDIR%%/docs/pics/fr_category_cp.gif
+%%CPGDIR%%/docs/pics/fr_config_language.gif
+%%CPGDIR%%/docs/pics/fr_coppermine_logo_french.jpg
+%%CPGDIR%%/docs/pics/fr_ecard_log.gif
+%%CPGDIR%%/docs/pics/fr_edit_album.gif
+%%CPGDIR%%/docs/pics/fr_edit_picture.gif
+%%CPGDIR%%/docs/pics/fr_exif_data_cpg1.jpg
+%%CPGDIR%%/docs/pics/fr_exifmanager_cpg1.gif
+%%CPGDIR%%/docs/pics/fr_group_cp.gif
+%%CPGDIR%%/docs/pics/fr_groupsscrsht2.jpg
+%%CPGDIR%%/docs/pics/fr_modifyalb_reset.gif
+%%CPGDIR%%/docs/pics/fr_searchnew_1.gif
+%%CPGDIR%%/docs/pics/fr_searchnew_2.gif
+%%CPGDIR%%/docs/pics/fr_usermgr.gif
+%%CPGDIR%%/docs/pics/fr_util_re-size.gif
+%%CPGDIR%%/docs/pics/fr_versioncheck_options.gif
+%%CPGDIR%%/docs/pics/group_cp.gif
 %%CPGDIR%%/docs/pics/link.gif
+%%CPGDIR%%/docs/pics/modifyalb_reset.gif
+%%CPGDIR%%/docs/pics/plugin_manager.gif
+%%CPGDIR%%/docs/pics/powered-mysql.gif
+%%CPGDIR%%/docs/pics/powered-php.gif
 %%CPGDIR%%/docs/pics/searchnew_1.gif
 %%CPGDIR%%/docs/pics/searchnew_2.gif
 %%CPGDIR%%/docs/pics/spacer.gif
 %%CPGDIR%%/docs/pics/up.gif
 %%CPGDIR%%/docs/pics/user_folder_link.gif
+%%CPGDIR%%/docs/pics/usermgr.gif
 %%CPGDIR%%/docs/pics/util_re-size.gif
+%%CPGDIR%%/docs/pics/valid-css.gif
+%%CPGDIR%%/docs/pics/valid-xhtml10.gif
+%%CPGDIR%%/docs/pics/versioncheck_comparison.gif
+%%CPGDIR%%/docs/pics/versioncheck_options.gif
+%%CPGDIR%%/docs/showdoc.php
+%%CPGDIR%%/docs/style.css
+%%CPGDIR%%/docs/tester-README.txt
 %%CPGDIR%%/docs/theme.htm
+%%CPGDIR%%/docs/theme/edit_style.html
+%%CPGDIR%%/docs/theme/edit_template.html
+%%CPGDIR%%/docs/theme/edit_theme.html
+%%CPGDIR%%/docs/theme/index.html
+%%CPGDIR%%/docs/theme/style.css
+%%CPGDIR%%/docs/theme/validation.html
 %%CPGDIR%%/docs/translation.htm
 %%CPGDIR%%/ecard.php
 %%CPGDIR%%/editOnePic.php
 %%CPGDIR%%/editpics.php
+%%CPGDIR%%/exifmgr.php
 %%CPGDIR%%/faq.php
 %%CPGDIR%%/forgot_passwd.php
 %%CPGDIR%%/getlang.php
@@ -76,15 +136,15 @@
 %%CPGDIR%%/image_processor.php
 %%CPGDIR%%/images/arrow_upleft.gif
 %%CPGDIR%%/images/ascending.gif
+%%CPGDIR%%/images/calendar.gif
 %%CPGDIR%%/images/coppermine_logo.png
 %%CPGDIR%%/images/delete.gif
 %%CPGDIR%%/images/descending.gif
 %%CPGDIR%%/images/down.gif
 %%CPGDIR%%/images/ecard.gif
 %%CPGDIR%%/images/edit.gif
-%%CPGDIR%%/images/flags/al.gif
-%%CPGDIR%%/images/flags/es_gln.gif
 %%CPGDIR%%/images/flags/ae.gif
+%%CPGDIR%%/images/flags/al.gif
 %%CPGDIR%%/images/flags/am.gif
 %%CPGDIR%%/images/flags/ar.gif
 %%CPGDIR%%/images/flags/at.gif
@@ -114,11 +174,13 @@
 %%CPGDIR%%/images/flags/ee.gif
 %%CPGDIR%%/images/flags/eg.gif
 %%CPGDIR%%/images/flags/es.gif
+%%CPGDIR%%/images/flags/es_gln.gif
 %%CPGDIR%%/images/flags/fi.gif
 %%CPGDIR%%/images/flags/fj.gif
 %%CPGDIR%%/images/flags/fr.gif
 %%CPGDIR%%/images/flags/gb-cm.gif
 %%CPGDIR%%/images/flags/gb.gif
+%%CPGDIR%%/images/flags/ge.gif
 %%CPGDIR%%/images/flags/gr.gif
 %%CPGDIR%%/images/flags/hk.gif
 %%CPGDIR%%/images/flags/hr.gif
@@ -180,14 +242,19 @@
 %%CPGDIR%%/images/folder.gif
 %%CPGDIR%%/images/gif48x48.gif
 %%CPGDIR%%/images/green.gif
+%%CPGDIR%%/images/h_powered-mysql.gif
+%%CPGDIR%%/images/h_powered-php.gif
+%%CPGDIR%%/images/h_valid-css.gif
+%%CPGDIR%%/images/h_valid-xhtml10.gif
+%%CPGDIR%%/images/help.gif
 %%CPGDIR%%/images/info.gif
 %%CPGDIR%%/images/logo.gif
 %%CPGDIR%%/images/move_down.gif
 %%CPGDIR%%/images/move_up.gif
 %%CPGDIR%%/images/next.gif
-%%CPGDIR%%/images/nopic.jpg
+%%CPGDIR%%/images/powered-mysql.gif
+%%CPGDIR%%/images/powered-php.gif
 %%CPGDIR%%/images/prev.gif
-%%CPGDIR%%/images/private.jpg
 %%CPGDIR%%/images/rating0.gif
 %%CPGDIR%%/images/rating1.gif
 %%CPGDIR%%/images/rating2.gif
@@ -196,6 +263,7 @@
 %%CPGDIR%%/images/rating5.gif
 %%CPGDIR%%/images/read_error48x48.gif
 %%CPGDIR%%/images/red.gif
+%%CPGDIR%%/images/report.gif
 %%CPGDIR%%/images/slideshow.gif
 %%CPGDIR%%/images/smiles/icon_arrow.gif
 %%CPGDIR%%/images/smiles/icon_biggrin.gif
@@ -236,8 +304,10 @@
 %%CPGDIR%%/images/thumb_mp3.jpg
 %%CPGDIR%%/images/thumb_mpeg.jpg
 %%CPGDIR%%/images/thumb_mpg.jpg
+%%CPGDIR%%/images/thumb_nopic.jpg
 %%CPGDIR%%/images/thumb_ogg.jpg
 %%CPGDIR%%/images/thumb_pdf.jpg
+%%CPGDIR%%/images/thumb_private.jpg
 %%CPGDIR%%/images/thumb_qtv.jpg
 %%CPGDIR%%/images/thumb_ra.jpg
 %%CPGDIR%%/images/thumb_ram.jpg
@@ -251,15 +321,26 @@
 %%CPGDIR%%/images/thumb_wmv.jpg
 %%CPGDIR%%/images/thumb_xls.jpg
 %%CPGDIR%%/images/thumb_zip.jpg
+%%CPGDIR%%/images/thumbnails.gif
+%%CPGDIR%%/images/tile.gif
 %%CPGDIR%%/images/unk48x48.gif
 %%CPGDIR%%/images/up.gif
 %%CPGDIR%%/images/up_dup.gif
 %%CPGDIR%%/images/up_na.gif
 %%CPGDIR%%/images/up_ok.gif
 %%CPGDIR%%/images/up_pb.gif
+%%CPGDIR%%/images/valid-css.gif
+%%CPGDIR%%/images/valid-xhtml10.gif
+%%CPGDIR%%/images/vote.jpg
+%%CPGDIR%%/images/writable_false_right.gif
+%%CPGDIR%%/images/writable_false_wrong.gif
+%%CPGDIR%%/images/writable_true_right.gif
+%%CPGDIR%%/images/writable_true_wrong.gif
 %%CPGDIR%%/include/archive.php
 %%CPGDIR%%/include/config.inc.php.sample
 %%CPGDIR%%/include/crop.inc.php
+%%CPGDIR%%/include/debugger.inc.php
+%%CPGDIR%%/include/exif.php
 %%CPGDIR%%/include/exifReader.inc.php
 %%CPGDIR%%/include/exif_php.inc.php
 %%CPGDIR%%/include/functions.inc.php
@@ -268,115 +349,88 @@
 %%CPGDIR%%/include/index.html
 %%CPGDIR%%/include/init.inc.php
 %%CPGDIR%%/include/iptc.inc.php
+%%CPGDIR%%/include/keyword.inc.php
+%%CPGDIR%%/include/langfallback.inc.php
+%%CPGDIR%%/include/logger.inc.php
 %%CPGDIR%%/include/mailer.inc.php
+%%CPGDIR%%/include/makers/canon.php
+%%CPGDIR%%/include/makers/fujifilm.php
+%%CPGDIR%%/include/makers/gps.php
+%%CPGDIR%%/include/makers/nikon.php
+%%CPGDIR%%/include/makers/olympus.php
+%%CPGDIR%%/include/makers/sanyo.php
+%%CPGDIR%%/include/mb.inc.php
 %%CPGDIR%%/include/media.functions.inc.php
+%%CPGDIR%%/include/phpmailer.lang-en.php
 %%CPGDIR%%/include/picmgmt.inc.php
+%%CPGDIR%%/include/plugin_api.inc.php
 %%CPGDIR%%/include/search.inc.php
 %%CPGDIR%%/include/select_lang.inc.php
 %%CPGDIR%%/include/slideshow.inc.php
 %%CPGDIR%%/include/smilies.inc.php
+%%CPGDIR%%/include/smtp.inc.php
 %%CPGDIR%%/include/sql_parse.php
+%%CPGDIR%%/include/themes.inc.php
+%%CPGDIR%%/include/update.inc.php
+%%CPGDIR%%/include/zip.lib.php
 %%CPGDIR%%/index.php
 %%CPGDIR%%/install.php
 %%CPGDIR%%/installer.css
-%%CPGDIR%%/lang/albanian-utf-8.php
-%%CPGDIR%%/lang/albanian.php
-%%CPGDIR%%/lang/galician-utf-8.php
-%%CPGDIR%%/lang/galician.php
-%%CPGDIR%%/lang/portuguese-utf-8.php
-%%CPGDIR%%/lang/portuguese.php
-%%CPGDIR%%/lang/arabic-utf-8.php
-%%CPGDIR%%/lang/arabic.php
-%%CPGDIR%%/lang/basque-utf-8.php
+%%CPGDIR%%/keyword_create_dict.php
+%%CPGDIR%%/keyword_select.php
+%%CPGDIR%%/keywordmgr.php
 %%CPGDIR%%/lang/basque.php
-%%CPGDIR%%/lang/brazilian_portuguese-utf-8.php
-%%CPGDIR%%/lang/brazilian_portuguese.php
-%%CPGDIR%%/lang/bulgarian-utf-8.php
 %%CPGDIR%%/lang/bulgarian.php
-%%CPGDIR%%/lang/catalan-utf-8.php
-%%CPGDIR%%/lang/catalan.php
-%%CPGDIR%%/lang/chinese_big5-utf-8.php
 %%CPGDIR%%/lang/chinese_big5.php
-%%CPGDIR%%/lang/chinese_gb-utf-8.php
 %%CPGDIR%%/lang/chinese_gb.php
-%%CPGDIR%%/lang/croatian-utf-8.php
-%%CPGDIR%%/lang/croatian.php
-%%CPGDIR%%/lang/czech-utf-8.php
 %%CPGDIR%%/lang/czech.php
-%%CPGDIR%%/lang/danish-utf-8.php
 %%CPGDIR%%/lang/danish.php
-%%CPGDIR%%/lang/dutch-utf-8.php
 %%CPGDIR%%/lang/dutch.php
-%%CPGDIR%%/lang/english-utf-8.php
 %%CPGDIR%%/lang/english.php
-%%CPGDIR%%/lang/estonian-utf-8.php
-%%CPGDIR%%/lang/estonian.php
-%%CPGDIR%%/lang/finnish-utf-8.php
+%%CPGDIR%%/lang/english_gb.php
 %%CPGDIR%%/lang/finnish.php
-%%CPGDIR%%/lang/french-utf-8.php
 %%CPGDIR%%/lang/french.php
-%%CPGDIR%%/lang/german-utf-8.php
+%%CPGDIR%%/lang/galician.php
+%%CPGDIR%%/lang/georgian.php
 %%CPGDIR%%/lang/german.php
-%%CPGDIR%%/lang/german_sie-utf-8.php
 %%CPGDIR%%/lang/german_sie.php
-%%CPGDIR%%/lang/greek-utf-8.php
 %%CPGDIR%%/lang/greek.php
-%%CPGDIR%%/lang/hebrew-utf-8.php
 %%CPGDIR%%/lang/hebrew.php
-%%CPGDIR%%/lang/hungarian-utf-8.php
 %%CPGDIR%%/lang/hungarian.php
-%%CPGDIR%%/lang/indonesian-utf-8.php
-%%CPGDIR%%/lang/indonesian.php
-%%CPGDIR%%/lang/italian-utf-8.php
 %%CPGDIR%%/lang/italian.php
-%%CPGDIR%%/lang/italian2-utf-8.php
-%%CPGDIR%%/lang/italian2.php
-%%CPGDIR%%/lang/japanese-utf-8.php
 %%CPGDIR%%/lang/japanese.php
-%%CPGDIR%%/lang/kurdish-utf-8.php
-%%CPGDIR%%/lang/kurdish.php
-%%CPGDIR%%/lang/latvian-utf-8.php
-%%CPGDIR%%/lang/latvian.php
-%%CPGDIR%%/lang/malay-utf-8.php
-%%CPGDIR%%/lang/malay.php
-%%CPGDIR%%/lang/norwegian-utf-8.php
+%%CPGDIR%%/lang/korean.php
 %%CPGDIR%%/lang/norwegian.php
-%%CPGDIR%%/lang/persian-utf-8.php
-%%CPGDIR%%/lang/polish-utf-8.php
+%%CPGDIR%%/lang/persian.php
 %%CPGDIR%%/lang/polish.php
-%%CPGDIR%%/lang/romanian-utf-8.php
-%%CPGDIR%%/lang/romanian.php
-%%CPGDIR%%/lang/romanian_no_diacritics-utf-8.php
-%%CPGDIR%%/lang/romanian_no_diacritics.php
-%%CPGDIR%%/lang/russian-utf-8.php
+%%CPGDIR%%/lang/portuguese.php
 %%CPGDIR%%/lang/russian.php
-%%CPGDIR%%/lang/slovak-utf-8.php
 %%CPGDIR%%/lang/slovak.php
-%%CPGDIR%%/lang/slovenian-utf-8.php
 %%CPGDIR%%/lang/slovenian.php
-%%CPGDIR%%/lang/spanish-utf-8.php
 %%CPGDIR%%/lang/spanish.php
-%%CPGDIR%%/lang/swedish-utf-8.php
 %%CPGDIR%%/lang/swedish.php
-%%CPGDIR%%/lang/thai-utf-8.php
-%%CPGDIR%%/lang/thai.php
-%%CPGDIR%%/lang/turkish-utf-8.php
 %%CPGDIR%%/lang/turkish.php
-%%CPGDIR%%/lang/uighur-utf-8.php
-%%CPGDIR%%/lang/uighur.php
-%%CPGDIR%%/lang/vietnamese-utf-8.php
-%%CPGDIR%%/lang/vietnamese.php
-%%CPGDIR%%/lang/welsh-utf-8.php
-%%CPGDIR%%/lang/welsh.php
+%%CPGDIR%%/lang/ukrainian.php
 %%CPGDIR%%/login.php
 %%CPGDIR%%/logout.php
+%%CPGDIR%%/logs/log_header.inc.php
+%%CPGDIR%%/minibrowser.php
+%%CPGDIR%%/mode.php
 %%CPGDIR%%/modifyalb.php
 %%CPGDIR%%/phpinfo.php
 %%CPGDIR%%/picEditor.php
+%%CPGDIR%%/picmgr.php
+%%CPGDIR%%/pluginmgr.php
+%%CPGDIR%%/plugins/sample/codebase.php
+%%CPGDIR%%/plugins/sample/configuration.php
+%%CPGDIR%%/plugins/sef_urls/codebase.php
+%%CPGDIR%%/plugins/sef_urls/configuration.php
+%%CPGDIR%%/plugins/sef_urls/ht.txt
 %%CPGDIR%%/profile.php
 %%CPGDIR%%/ratepic.php
-%%CPGDIR%%/readme
 %%CPGDIR%%/register.php
+%%CPGDIR%%/relocate_server.php
+%%CPGDIR%%/report_file.php
 %%CPGDIR%%/reviewcom.php
 %%CPGDIR%%/scripts.js
 %%CPGDIR%%/search.php
@@ -385,7 +439,9 @@
 %%CPGDIR%%/sql/basic.sql
 %%CPGDIR%%/sql/schema.sql
 %%CPGDIR%%/sql/update.sql
+%%CPGDIR%%/stat_details.php
 %%CPGDIR%%/themes/classic/images/button_bg.gif
+%%CPGDIR%%/themes/classic/images/button_bg_anim.gif
 %%CPGDIR%%/themes/classic/images/site_logo.png
 %%CPGDIR%%/themes/classic/images/tile.gif
 %%CPGDIR%%/themes/classic/style.css
@@ -393,6 +449,8 @@
 %%CPGDIR%%/themes/classic/theme.php
 %%CPGDIR%%/themes/eyeball/images/bg.gif
 %%CPGDIR%%/themes/eyeball/images/button_bg.gif
+%%CPGDIR%%/themes/eyeball/images/button_bg_anim.gif
+%%CPGDIR%%/themes/eyeball/images/ecard.gif
 %%CPGDIR%%/themes/eyeball/images/hline_bg.gif
 %%CPGDIR%%/themes/eyeball/images/hline_blue_ball.gif
 %%CPGDIR%%/themes/eyeball/images/hline_left.gif
@@ -404,16 +462,22 @@
 %%CPGDIR%%/themes/eyeball/images/imv_prev.gif
 %%CPGDIR%%/themes/eyeball/images/imv_slideshow.gif
 %%CPGDIR%%/themes/eyeball/images/imv_up.gif
+%%CPGDIR%%/themes/eyeball/images/info.gif
+%%CPGDIR%%/themes/eyeball/images/next.gif
+%%CPGDIR%%/themes/eyeball/images/prev.gif
 %%CPGDIR%%/themes/eyeball/images/rating0.gif
 %%CPGDIR%%/themes/eyeball/images/rating1.gif
 %%CPGDIR%%/themes/eyeball/images/rating2.gif
 %%CPGDIR%%/themes/eyeball/images/rating3.gif
 %%CPGDIR%%/themes/eyeball/images/rating4.gif
 %%CPGDIR%%/themes/eyeball/images/rating5.gif
+%%CPGDIR%%/themes/eyeball/images/report.gif
+%%CPGDIR%%/themes/eyeball/images/slideshow.gif
 %%CPGDIR%%/themes/eyeball/images/spacer.gif
 %%CPGDIR%%/themes/eyeball/images/tableh1a_bg_left.gif
 %%CPGDIR%%/themes/eyeball/images/tableh1a_bg_middle.gif
 %%CPGDIR%%/themes/eyeball/images/tableh1a_bg_right.gif
+%%CPGDIR%%/themes/eyeball/images/thumbnails.gif
 %%CPGDIR%%/themes/eyeball/images/tile.gif
 %%CPGDIR%%/themes/eyeball/images/top_background_r1_c1.gif
 %%CPGDIR%%/themes/eyeball/images/top_background_r1_c2.gif
@@ -431,6 +495,7 @@
 %%CPGDIR%%/themes/eyeball/theme.php
 %%CPGDIR%%/themes/fruity/images/blind.gif
 %%CPGDIR%%/themes/fruity/images/button_bg.gif
+%%CPGDIR%%/themes/fruity/images/button_bg_anim.gif
 %%CPGDIR%%/themes/fruity/images/delete.gif
 %%CPGDIR%%/themes/fruity/images/ecard.gif
 %%CPGDIR%%/themes/fruity/images/edit.gif
@@ -455,22 +520,29 @@
 %%CPGDIR%%/themes/fruity/images/rating3.gif
 %%CPGDIR%%/themes/fruity/images/rating4.gif
 %%CPGDIR%%/themes/fruity/images/rating5.gif
+%%CPGDIR%%/themes/fruity/images/report.gif
 %%CPGDIR%%/themes/fruity/images/site_logo.jpg
 %%CPGDIR%%/themes/fruity/images/site_logo.png
 %%CPGDIR%%/themes/fruity/images/slideshow.gif
 %%CPGDIR%%/themes/fruity/images/thumbnail.gif
+%%CPGDIR%%/themes/fruity/images/thumbnails.gif
 %%CPGDIR%%/themes/fruity/images/tile.gif
 %%CPGDIR%%/themes/fruity/images/yellow_corner.gif
 %%CPGDIR%%/themes/fruity/style.css
 %%CPGDIR%%/themes/fruity/template.html
 %%CPGDIR%%/themes/fruity/theme.php
 %%CPGDIR%%/themes/hardwired/images/back.gif
+%%CPGDIR%%/themes/hardwired/images/bottom-left.gif
+%%CPGDIR%%/themes/hardwired/images/bottom-middle.gif
+%%CPGDIR%%/themes/hardwired/images/bottom-right.gif
 %%CPGDIR%%/themes/hardwired/images/box_left_icon.gif
+%%CPGDIR%%/themes/hardwired/images/button_bg_anim.gif
 %%CPGDIR%%/themes/hardwired/images/buttoncenter.gif
 %%CPGDIR%%/themes/hardwired/images/buttoncenter1.gif
 %%CPGDIR%%/themes/hardwired/images/buttonleft.gif
 %%CPGDIR%%/themes/hardwired/images/buttonleft1.gif
 %%CPGDIR%%/themes/hardwired/images/buttonleftad.gif
+%%CPGDIR%%/themes/hardwired/images/buttonleftfaq.gif
 %%CPGDIR%%/themes/hardwired/images/buttonleftmemb.gif
 %%CPGDIR%%/themes/hardwired/images/buttonleftmy.gif
 %%CPGDIR%%/themes/hardwired/images/buttonleftout.gif
@@ -480,12 +552,16 @@
 %%CPGDIR%%/themes/hardwired/images/delete.gif
 %%CPGDIR%%/themes/hardwired/images/ecard.gif
 %%CPGDIR%%/themes/hardwired/images/edit.gif
-%%CPGDIR%%/themes/hardwired/images/hardwired_bak.gif
-%%CPGDIR%%/themes/hardwired/images/hw_01.gif
-%%CPGDIR%%/themes/hardwired/images/hw_02.gif
-%%CPGDIR%%/themes/hardwired/images/hw_03.gif
+%%CPGDIR%%/themes/hardwired/images/far-left.gif
+%%CPGDIR%%/themes/hardwired/images/far-right.gif
+%%CPGDIR%%/themes/hardwired/images/hardwired.gif
 %%CPGDIR%%/themes/hardwired/images/info.gif
+%%CPGDIR%%/themes/hardwired/images/left-banner.gif
+%%CPGDIR%%/themes/hardwired/images/middle-left.gif
+%%CPGDIR%%/themes/hardwired/images/middle-right.gif
+%%CPGDIR%%/themes/hardwired/images/next.gif
 %%CPGDIR%%/themes/hardwired/images/nextimg.gif
+%%CPGDIR%%/themes/hardwired/images/prev.gif
 %%CPGDIR%%/themes/hardwired/images/previmg.gif
 %%CPGDIR%%/themes/hardwired/images/rating0.gif
 %%CPGDIR%%/themes/hardwired/images/rating1.gif
@@ -493,14 +569,20 @@
 %%CPGDIR%%/themes/hardwired/images/rating3.gif
 %%CPGDIR%%/themes/hardwired/images/rating4.gif
 %%CPGDIR%%/themes/hardwired/images/rating5.gif
+%%CPGDIR%%/themes/hardwired/images/report.gif
+%%CPGDIR%%/themes/hardwired/images/right-banner.gif
 %%CPGDIR%%/themes/hardwired/images/slideshow.gif
+%%CPGDIR%%/themes/hardwired/images/spacer.gif
+%%CPGDIR%%/themes/hardwired/images/thumbnails.gif
 %%CPGDIR%%/themes/hardwired/images/tile.gif
+%%CPGDIR%%/themes/hardwired/images/top-left.gif
+%%CPGDIR%%/themes/hardwired/images/top-right.gif
 %%CPGDIR%%/themes/hardwired/style.css
 %%CPGDIR%%/themes/hardwired/template.html
 %%CPGDIR%%/themes/hardwired/theme.php
-%%CPGDIR%%/themes/igames/images/aladdin.gif
 %%CPGDIR%%/themes/igames/images/box_left_icon.gif
 %%CPGDIR%%/themes/igames/images/button_bg.gif
+%%CPGDIR%%/themes/igames/images/button_bg_anim.gif
 %%CPGDIR%%/themes/igames/images/left_menu_button.gif
 %%CPGDIR%%/themes/igames/images/left_menu_button_over.gif
 %%CPGDIR%%/themes/igames/images/menu_button.gif
@@ -521,6 +603,7 @@
 %%CPGDIR%%/themes/igames/images/tableh2_bg.gif
 %%CPGDIR%%/themes/igames/images/tile.gif
 %%CPGDIR%%/themes/igames/images/top_panel_r1_c1.jpg
+%%CPGDIR%%/themes/igames/images/top_panel_r1_c2.jpg
 %%CPGDIR%%/themes/igames/images/top_panel_r1_c4.jpg
 %%CPGDIR%%/themes/igames/images/top_panel_r1_c5.jpg
 %%CPGDIR%%/themes/igames/images/top_panel_r2_c1.jpg
@@ -531,6 +614,7 @@
 %%CPGDIR%%/themes/igames/template.html
 %%CPGDIR%%/themes/igames/theme.php
 %%CPGDIR%%/themes/mac_ox_x/images/button_bg.gif
+%%CPGDIR%%/themes/mac_ox_x/images/button_bg_anim.gif
 %%CPGDIR%%/themes/mac_ox_x/images/home.gif
 %%CPGDIR%%/themes/mac_ox_x/images/main_table_r1_c1.gif
 %%CPGDIR%%/themes/mac_ox_x/images/main_table_r1_c1b.gif
@@ -567,6 +651,7 @@
 %%CPGDIR%%/themes/mac_ox_x/theme.php
 %%CPGDIR%%/themes/project_vii/images/box_left_icon.gif
 %%CPGDIR%%/themes/project_vii/images/button_bg.gif
+%%CPGDIR%%/themes/project_vii/images/button_bg_anim.gif
 %%CPGDIR%%/themes/project_vii/images/left_menu_button.gif
 %%CPGDIR%%/themes/project_vii/images/left_menu_button_over.gif
 %%CPGDIR%%/themes/project_vii/images/menu_button.gif
@@ -588,6 +673,7 @@
 %%CPGDIR%%/themes/rainy_day/images/button1_r1_c2.gif
 %%CPGDIR%%/themes/rainy_day/images/button1_r1_c3.gif
 %%CPGDIR%%/themes/rainy_day/images/button_bg.gif
+%%CPGDIR%%/themes/rainy_day/images/button_bg_anim.gif
 %%CPGDIR%%/themes/rainy_day/images/rating0.gif
 %%CPGDIR%%/themes/rainy_day/images/rating1.gif
 %%CPGDIR%%/themes/rainy_day/images/rating2.gif
@@ -623,39 +709,17 @@
 %%CPGDIR%%/themes/rainy_day/style.css
 %%CPGDIR%%/themes/rainy_day/template.html
 %%CPGDIR%%/themes/rainy_day/theme.php
-%%CPGDIR%%/themes/styleguide/domLib.js
-%%CPGDIR%%/themes/styleguide/domTT.js
-%%CPGDIR%%/themes/styleguide/images/albmgr_php.gif
-%%CPGDIR%%/themes/styleguide/images/banning_php.gif
-%%CPGDIR%%/themes/styleguide/images/catmgr_php.gif
-%%CPGDIR%%/themes/styleguide/images/config_php.gif
-%%CPGDIR%%/themes/styleguide/images/db_ecard_php.gif
-%%CPGDIR%%/themes/styleguide/images/delete_php.gif
-%%CPGDIR%%/themes/styleguide/images/displayimage_php.gif
-%%CPGDIR%%/themes/styleguide/images/ecard_php.gif
-%%CPGDIR%%/themes/styleguide/images/editpics_php.gif
-%%CPGDIR%%/themes/styleguide/images/forgot_passwd_php.gif
-%%CPGDIR%%/themes/styleguide/images/groupmgr_php.gif
-%%CPGDIR%%/themes/styleguide/images/index_php.gif
-%%CPGDIR%%/themes/styleguide/images/login_php.gif
-%%CPGDIR%%/themes/styleguide/images/logout_php.gif
-%%CPGDIR%%/themes/styleguide/images/modifyalb_php.gif
-%%CPGDIR%%/themes/styleguide/images/profile_php.gif
-%%CPGDIR%%/themes/styleguide/images/reviewcom_php.gif
-%%CPGDIR%%/themes/styleguide/images/search_php.gif
-%%CPGDIR%%/themes/styleguide/images/searchnew_php.gif
-%%CPGDIR%%/themes/styleguide/images/spacer.gif
-%%CPGDIR%%/themes/styleguide/images/thumbnails_php.gif
-%%CPGDIR%%/themes/styleguide/images/tile.gif
-%%CPGDIR%%/themes/styleguide/images/upload_php.gif
-%%CPGDIR%%/themes/styleguide/images/usermgr_php.gif
-%%CPGDIR%%/themes/styleguide/images/util_php.gif
-%%CPGDIR%%/themes/styleguide/readme.htm
-%%CPGDIR%%/themes/styleguide/template.html
-%%CPGDIR%%/themes/styleguide/theme.php
+%%CPGDIR%%/themes/sample/images/button_bg.gif
+%%CPGDIR%%/themes/sample/images/button_bg_anim.gif
+%%CPGDIR%%/themes/sample/images/site_logo.png
+%%CPGDIR%%/themes/sample/images/tile.gif
+%%CPGDIR%%/themes/sample/style.css
+%%CPGDIR%%/themes/sample/template.html
+%%CPGDIR%%/themes/sample/theme.php
 %%CPGDIR%%/themes/water_drop/images/bg.gif
 %%CPGDIR%%/themes/water_drop/images/box_left_icon.gif
 %%CPGDIR%%/themes/water_drop/images/button_bg.gif
+%%CPGDIR%%/themes/water_drop/images/button_bg_anim.gif
 %%CPGDIR%%/themes/water_drop/images/orange_carret.gif
 %%CPGDIR%%/themes/water_drop/images/tile.gif
 %%CPGDIR%%/themes/water_drop/style.css
@@ -668,12 +732,13 @@
 %%CPGDIR%%/usermgr.php
 %%CPGDIR%%/util.php
 %%CPGDIR%%/versioncheck.php
+%%CPGDIR%%/viewlog.php
 %%CPGDIR%%/xp_publish.php
 %%CPGDIR%%/zipdownload.php
 @dirrm %%CPGDIR%%/themes/water_drop/images
 @dirrm %%CPGDIR%%/themes/water_drop
-@dirrm %%CPGDIR%%/themes/styleguide/images
-@dirrm %%CPGDIR%%/themes/styleguide
+@dirrm %%CPGDIR%%/themes/sample/images
+@dirrm %%CPGDIR%%/themes/sample
 @dirrm %%CPGDIR%%/themes/rainy_day/images
 @dirrm %%CPGDIR%%/themes/rainy_day
 @dirrm %%CPGDIR%%/themes/project_vii/images
@@ -692,11 +757,17 @@
 @dirrm %%CPGDIR%%/themes/classic
 @dirrm %%CPGDIR%%/themes
 @dirrm %%CPGDIR%%/sql
+@dirrm %%CPGDIR%%/plugins/sef_urls
+@dirrm %%CPGDIR%%/plugins/sample
+@dirrm %%CPGDIR%%/plugins
+@dirrm %%CPGDIR%%/logs
 @dirrm %%CPGDIR%%/lang
+@dirrm %%CPGDIR%%/include/makers
 @dirrm %%CPGDIR%%/include
 @dirrm %%CPGDIR%%/images/smiles
 @dirrm %%CPGDIR%%/images/flags
 @dirrm %%CPGDIR%%/images
+@dirrm %%CPGDIR%%/docs/theme
 @dirrm %%CPGDIR%%/docs/pics
 @dirrm %%CPGDIR%%/docs
 @dirrm %%CPGDIR%%/bridge