>Number:         149902
>Category:       misc
>Synopsis:       [PATCH] mail/dspam: important cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 23 09:20:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     David Demelier
>Release:        8.1-RELEASE
>Organization:
>Environment:
FreeBSD Melon.malikania.fr 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Sun Aug 22 
11:56:47 CEST 2010     r...@melon.malikania.fr:/usr/obj/usr/src/sys/Melon  amd64

>Description:
Said here : 
http://lists.freebsd.org/pipermail/freebsd-ports/2010-July/062390.html

I would like to clean the dspam Makefile to use WITH_(PGSQL|MYSQL)_VER instead 
of multiple version OPTIONS.

I made a lot of cleanup on this Makefile to make it really simplier, I think we 
could do better.
>How-To-Repeat:

>Fix:
--- Makefile.orig       2010-08-12 22:46:11.000000000 +0200
+++ Makefile    2010-08-12 23:26:19.000000000 +0200
@@ -12,7 +12,7 @@
 
 PORTNAME=      dspam
 PORTVERSION=   3.9.0
-PORTREVISION=  1
+PORTREVISION=  2
 CATEGORIES=    mail
 MASTER_SITES=  SF \
                http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
@@ -24,63 +24,43 @@
 MIN_OPTIONS_VER=       ${PORTNAME}-3.9.0
 
 ## debug / log / admin options
-OPTIONS=       SYSLOG "Logs via syslog" on
-OPTIONS+=      DEBUG "Enable debugging logging" on
-OPTIONS+=      VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
-OPTIONS+=      BNR_DEBUG "Enable debug for BNR" off
-OPTIONS+=      PREF_EXT "Preferences in database not in files" off
-OPTIONS+=      DAEMON "Daemonize dspam; speaks LMTP or DLMTP" on
-
-#
-OPTIONS+=      CLAMAV "Enable clamav support" on
-OPTIONS+=      CLAMAV_DEVEL "Enable clamav support" off
-OPTIONS+=      CLAMAV_LOCAL "RUN_DEPEND on selected clamav" on
-#
-OPTIONS+=      MYSQL40 "Use MySQL 4.0.x as back-end" off
-OPTIONS+=      MYSQL41 "Use MySQL 4.1.x as back-end" off
-OPTIONS+=      MYSQL50 "Use MySQL 5.0.x as back-end" on
-OPTIONS+=      MYSQL51 "Use MySQL 5.1.x as back-end" off
-OPTIONS+=      MYSQL55 "Use MySQL 5.5.x as back-end" off
-OPTIONS+=      MYSQL_COMPRESS "Compress dspam <--> MySQL" off
-OPTIONS+=      MYSQL_LOCAL "RUN_DEPEND on selected MySQL server ver." off
-OPTIONS+=      POSTGRESQL "Use PostgreSQL as back-end" on
-OPTIONS+=      POSTGRESQL_LOCAL "RUN_DEPEND on PostgreSQL server" off
-OPTIONS+=      SQLITE2 "Use SQLite v2.x as back-end" off
-OPTIONS+=      SQLITE3 "Use SQLite v3.x as back-end" on
-OPTIONS+=      HASH "Use hash driver" on
-#
-OPTIONS+=      EXTERNAL_LOOKUP "Enable rcpt verification via extlookup" off
-
-# layout
-OPTIONS+=      USER_HOMEDIR "Store user data in ~/.dspam" off
-OPTIONS+=      TRUSTED_USERS "Disable trusted user security" off
-OPTIONS+=      VIRT_USERS "Enable virtual users (needs SQL back-end)" off
-OPTIONS+=      LONG_USERNAMES "Usernames longer that OS supports" off
-OPTIONS+=      LARGE_SCALE "File structure for large scale" off
-OPTIONS+=      DOMAIN_SCALE "File structure for multiple domains" off
-
-## MTA and LDA
-OPTIONS+=      CYRUS21_LDA "Use Cyrus's 2.1 deliver as LDA" off
-OPTIONS+=      CYRUS22_LDA "Use Cyrus's 2.2 deliver as LDA" off
-OPTIONS+=      CYRUS23_LDA "Use Cyrus's 2.3 deliver as LDA" off
-OPTIONS+=      EXIM_LDA "Use Exim as local delivery agent" off
-OPTIONS+=      MAILDROP_LDA "Use Maildrop as local delivery agent" off
-OPTIONS+=      PROCMAIL_LDA "Use Procmail as local delivery agent" off
-OPTIONS+=      SAFECAT_LDA "Use Safecat as local delivery agent" off
-OPTIONS+=      SENDMAIL_LDA "Use Sendmail as local delivery agent" off
-
-OPTIONS+=      SENDMAIL "Play nice with sendmail server" off
-OPTIONS+=      POSTFIX_MBC "Dspam as mailbox_command in Postfix" off
-OPTIONS+=      QMAIL "Play nice with Qmail mail server" off
-
-OPTIONS+=      WebUI "Install WebUI, pulls in Apache or see below" off
-OPTIONS+=      LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
+OPTIONS=       SYSLOG "Logs via syslog" on \
+               DEBUG "Enable debugging logging" on \
+               VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off \
+               BNR_DEBUG "Enable debug for BNR" off \
+               PREF_EXT "Preferences in database not in files" off \
+               DAEMON "Daemonize dspam; speaks LMTP or DLMTP" on \
+               CLAMAV "Enable clamav support" off \
+               MYSQL "Use MySQL as back-end" off \
+               MYSQL_COMPRESS "Compress dspam <--> MySQL" off \
+               POSTGRESQL "Use PostgreSQL as back-end" on \
+               SQLITE2 "Use SQLite v2.x as back-end" off \
+               SQLITE3 "Use SQLite v3.x as back-end" on \
+               HASH "Use hash driver" on \
+               EXTERNAL_LOOKUP "Enable rcpt verification via extlookup" off \
+               USER_HOMEDIR "Store user data in ~/.dspam" off \
+               TRUSTED_USERS "Disable trusted user security" off \
+               VIRT_USERS "Enable virtual users (needs SQL back-end)" off \
+               LONG_USERNAMES "Usernames longer that OS supports" off \
+               LARGE_SCALE "File structure for large scale" off \
+               DOMAIN_SCALE "File structure for multiple domains" off \
+               CYRUS21_LDA "Use Cyrus's deliver as LDA" off \
+               CYRUS22_LDA "Use Cyrus's deliver as LDA" off \
+               CYRUS23_LDA "Use Cyrus's deliver as LDA" off \
+               EXIM_LDA "Use Exim as local delivery agent" off \
+               MAILDROP_LDA "Use Maildrop as local delivery agent" off \
+               PROCMAIL_LDA "Use Procmail as local delivery agent" off \
+               SAFECAT_LDA "Use Safecat as local delivery agent" off \
+               SENDMAIL_LDA "Use Sendmail as local delivery agent" off \
+               SENDMAIL "Play nice with sendmail server" off \
+               POSTFIX_MBC "Dspam as mailbox_command in Postfix" off \
+               QMAIL "Play nice with Qmail mail server" off \
+               WEBUI "Install WebUI" off
 
 USE_PERL5=     yes
 USE_AUTOTOOLS= libtool:22
 USE_LDCONFIG=  yes
 GNU_CONFIGURE= yes
-#CONFIGURE_ENV=        LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
                CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
                LDFLAGS="-L${LOCALBASE}/lib" \
@@ -169,21 +149,9 @@
 
 .ifndef(WITHOUT_CLAMAV)
 CONFIGURE_ARGS+=       --enable-clamav
-.      ifndef(WITHOUT_CLAMAV_LOCAL)
-RUN_DEPENDS+=  clamav>=0:${PORTSDIR}/security/clamav
-SUB_LIST+=     CLAMD=clamd
+SUB_LIST+=     CLAMD="clamd"
 .      else
-SUB_LIST+=     CLAMD=
-.      endif
-.endif
-.ifdef(WITH_CLAMAV_DEVEL)
-CONFIGURE_ARGS+=       --enable-clamav
-.      ifndef(WITHOUT_CLAMAV_LOCAL)
-RUN_DEPENDS+=  clamav-devel>=0:${PORTSDIR}/security/clamav-devel
-SUB_LIST+=     CLAMD=clamd
-.      else
-SUB_LIST+=     CLAMD=
-.      endif
+SUB_LIST+=     CLAMD="@comment "
 .endif
 
 # we need to know if we are building statically or dynamicaly for the plist
@@ -196,14 +164,7 @@
 CONFIGURE_ARGS+=       --with-pgsql-includes=${LOCALBASE}/include \
                --with-pgsql-libraries=${LOCALBASE}/lib
 PLIST_SUB+=    PGSQL=""
-#PKGNAMESUFFIX=        -pgsql
 _DBDRV_COUNT:= ${_DBDRV_COUNT}o
-.      if defined(WITH_POSTGRESQL_LOCAL)
-RUN_DEPENDS+=  
postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-SUB_LIST+=     PGSQL=postgresql
-.      else
-SUB_LIST+=     PGSQL=
-.      endif
 .else
 PLIST_SUB+=    PGSQL="@comment "
 _DBDRV:=       ${_DBDRV:S/pgsql_drv,//}
@@ -223,7 +184,7 @@
 _DBDRV:=       ${_DBDRV:S/sqlite_drv,//}
 .endif
 
-.if defined(USE_SQLITE)
+.if defined(WITH_SQLITE2) || !defined(WITHOUT_SQLITE3)
 CONFIGURE_ARGS+=       --with-sqlite-includes=${LOCALBASE}/include \
                        --with-sqlite-libraries=${LOCALBASE}/lib
 PLIST_SUB+=    SQLITE=""
@@ -233,32 +194,13 @@
 
 .ifndef(WITHOUT_HASH)
 PLIST_SUB+=    HASH=""
-#PKGNAMESUFFIX=        -css
 _DBDRV_COUNT:= ${_DBDRV_COUNT}o
 .else
 _DBDRV:=       ${_DBDRV:S/hash_drv,//}
 PLIST_SUB+=    HASH="@comment "
 .endif
 
-.ifdef(WITH_MYSQL40)
-WANT_MYSQL_VER=        40
-#PKGNAMESUFFIX=        -mysql40
-.elifdef(WITH_MYSQL41)
-WANT_MYSQL_VER=        41
-#PKGNAMESUFFIX=        -mysql41
-.elifndef(WITHOUT_MYSQL50)
-WANT_MYSQL_VER=        50
-#PKGNAMESUFFIX=        -mysql50
-.elifdef(WITH_MYSQL51)
-WANT_MYSQL_VER=        51
-#PKGNAMESUFFIX=        -mysql51
-.elifdef(WITH_MYSQL55)
-WANT_MYSQL_VER=        55
-#PKGNAMESUFFIX=        -mysql55
-.endif
-
-.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || \
-       !defined(WITHOUT_MYSQL50) || defined(WITH_MYSQL51) || 
defined(WITH_MYSQL55)
+.if defined(WITH_MYSQL)
 USE_MYSQL=     yes
 CONFIGURE_ARGS+=       --with-mysql-includes=${LOCALBASE}/include/mysql \
                --with-mysql-libraries=${LOCALBASE}/lib/mysql
@@ -267,12 +209,9 @@
 .      if defined(WITH_MYSQL_COMPRESS)
 CONFIGURE_ARGS+=       --enable-client-compression
 .      endif
-.      if defined(WITH_MYSQL_LOCAL)
-RUN_DEPENDS+=  
mysql-server>=0:${PORTSDIR}/databases/mysql${WANT_MYSQL_VER}-server
-SUB_LIST+=     MYSQL=mysql
+SUB_LIST+=     MYSQL="mysql"
 .      else
-SUB_LIST+=     MYSQL=
-.      endif
+SUB_LIST+=     MYSQL="@comment "
 .else
 _DBDRV:=       ${_DBDRV:S/mysql_drv,//}
 PLIST_SUB+=    MYSQL="@comment "
@@ -340,7 +279,7 @@
 .endif
 
 .ifdef(WITH_EXIM_LDA)
-.      ifdef(WITH_MYSQL40) || (WITH_MYSQL41)
+.      ifdef(WITH_MYSQL)
 _EXIM_EXT=     -mysql
 .      elifdef(WITH_POSTGRESQL)
 _EXIM_EXT=     -postgresql
@@ -394,12 +333,7 @@
 CONFIGURE_ARGS+=       --with-dspam-mode=${DSPAM_MODE}
 .endif
 
-.ifdef(WITH_WebUI)
-.      if defined(WITH_LIGHTTPD)
-RUN_DEPENDS+=  ${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
-.      else
-USE_APACHE=    1.3+
-.      endif
+.ifdef(WITH_WEBUI)
 LIB_DEPENDS+=  gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS+=  ${SITE_PERL}/mach/GD.pm:${PORTSDIR}/graphics/p5-GD
 RUN_DEPENDS+=  ${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
@@ -408,12 +342,12 @@
 CONFIGURE_ARGS+=--enable-logging
 CONFIGURE_ARGS+=--enable-user-logging
 USE_PERL5=     yes
-PLIST_SUB+=    WebUI=""
+PLIST_SUB+=    WEBUI=""
 _SED_SCRIPT+=  -e 's/%%WebUI%%//g'
 _SED_SCRIPT+=  -e 's,%%WWWDIR%%,${WWWDIR},g'
 PLIST_SUB+=    WWWDIR=${WWWDIR_REL}
 .else
-PLIST_SUB+=    WebUI="@comment "
+PLIST_SUB+=    WEBUI="@comment "
 _SED_SCRIPT+=  -e '/%%WebUI%%/D'
 .endif
 
@@ -462,7 +396,7 @@
 .      ifdef(WITHOUT_SYSLOG)
        @${ECHO_CMD} "LOGFILE=${LOGFILE} (default: 
${_VAR_DIR}/log/dspam/dspam.log)"
 .      endif
-.      ifdef(WITH_WebUI)
+.      ifdef(WITH_WEBUI)
                @${ECHO_CMD} "Define WWWDIR before making if you need the WebUI 
files"
                @${ECHO_CMD} "installed in other place that this installation's 
default"
                @${ECHO_CMD} "${WWWDIR}"
@@ -496,31 +430,27 @@
        @${ECHO_CMD} "You need to enable at least one database back-end."
        @${FALSE}
 .endif
-.if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \
+.if defined(WITH_VIRT_USERS) && !(defined(WITH_MYSQL) || \
        !defined(WITHOUT_POSTGRESQL) || !defined(WITHOUT_HASH) )
        @${ECHO_CMD} "You need MySQL, POSTGRESQL or HASH for virtual users."
        @${FALSE}
 .endif
-.if defined(WITH_PREF_EXT) && !( defined(USE_MYSQL) || \
+.if defined(WITH_PREF_EXT) && !( defined(WITH_MYSQL) || \
        !defined(WITHOUT_POSTGRESQL) )
        @${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
        @${FALSE}
 .endif
-.ifndef(WITHOUT_DAEMON) && !( defined(USE_MYSQL) || \
+.ifndef(WITHOUT_DAEMON) && !( defined(WITH_MYSQL) || \
        !defined(WITHOUT_POSTGRESQL) || !defined(WITHOUT_HASH) )
        @${ECHO_CMD} "You need MySQL, PostgreSQL or Hash for Daemon mode, 
because multithreading support is needed"
        @${FALSE}
 .endif
-.if ( defined(WITH_MYSQL40) && defined(WITH_MYSQL41) && 
!defined(WITHOUT_MYSQL50) && defined(WITH_MYSQL51))
-       @${ECHO_CMD} "You can compile with only one MySQL version driver."
-       @${FALSE}
-.endif
-.if defined(WITH_EXTERNAL_LOOKUP) && !( defined(USE_MYSQL) || \
-       !defined(WITHOUT_POSTGRESQL) || defined(USE_SQLITE) )
+.if defined(WITH_EXTERNAL_LOOKUP) && !( defined(WITH_MYSQL) || \
+       !defined(WITHOUT_POSTGRESQL) || defined(WITH_SQLITE) )
        @${ECHO_CMD} "You need MySQL, Postgres or SQLITE for EXTERNAL_LOOKUP."
        @${FALSE}
 .endif
-.if defined(WITH_USER_HOMEDIR) && defined(WITH_WebUI)
+.if defined(WITH_USER_HOMEDIR) && defined(WITH_WEBUI)
        @${ECHO_CMD} "USER_HOMEDIR and WebUI are incopatible"
        @${FALSE}
 .endif
@@ -528,10 +458,6 @@
        @${ECHO_CMD} "DOMAIN_SCALE and LARGE_SCALE are incopatible"
        @${FALSE}
 .endif
-.if defined(WITH_LIGHTHTTPD) && !defined(WITH_WebUI)
-       @${ECHO_CMD} "There's no reason to depend on LightHTTPD if you're not 
using WebUI"
-       @${FALSE}
-.endif
 
 post-install:
        ${CP} ${WRKSRC}/src/dspam.conf ${WRKSRC}/src/dspam.conf.sample
@@ -547,7 +473,7 @@
                ${RM} -R ${PREFIX}/lib/pkgconfig || true
 
 .ifndef NOPORTEXAMPLES
-.ifdef(USE_MYSQL)
+.ifdef(WITH_MYSQL)
        @${MKDIR} ${EXAMPLESDIR}/mysql
        cd  ${WRKSRC}/src/tools.mysql_drv && \
                ${INSTALL_DATA} mysql_objects-4.1.sql \
@@ -562,14 +488,14 @@
        @cd  ${WRKSRC}/src/tools.pgsql_drv && \
                ${INSTALL_DATA} *.sql ${EXAMPLESDIR}/pgsql
 .endif
-.ifdef(USE_SQLITE)
+.if defined(WITH_SQLITE2) || defined(WITH_SQLITE3)
        @${MKDIR} ${EXAMPLESDIR}/sqlite
        cd ${WRKSRC}/src/tools.sqlite_drv && \
                ${INSTALL_DATA} *.sql ${EXAMPLESDIR}/sqlite
 .endif
 .endif # NOPORTEXAMPLES
 
-.ifdef(WITH_WebUI)
+.ifdef(WITH_WEBUI)
 .      for I in admin.cgi admingraph.cgi configure.pl dspam.cgi graph.cgi 
templates/strings.pl
                ${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL},g" 
${WRKSRC}/webui/cgi-bin/${I}
 .      endfor
@@ -605,6 +531,11 @@
        @cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${DOCSDIR}
        @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${DOCSDIR}
        @cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR}/UPDATING
+
+       @${CAT} ${WRKSRC}/README.FreeBSD
+       @${ECHO_CMD} "If you haven't defined NOPORTDOCS you can review this"
+       @${ECHO_CMD} "message in ${DOCSDIR}/README.FreeBSD"
+       @${ECHO_CMD}
 .endif
 
        @${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME}
@@ -621,10 +552,6 @@
 
        @${MKDIR} -m ${DSPAM_HOME_MODE} ${LOG_DIR}
 
-       @${CAT} ${WRKSRC}/README.FreeBSD
-       @${ECHO_CMD} "If you haven't defined NOPORTDOCS you can review this"
-       @${ECHO_CMD} "message in ${DOCSDIR}/README.FreeBSD"
-       @${ECHO_CMD}
 
 check-options-version:
 .ifdef(_OPTIONS_READ)
--- pkg-plist.orig      2010-08-12 23:30:16.000000000 +0200
+++ pkg-plist   2010-08-12 23:30:42.000000000 +0200
@@ -89,119 +89,119 @@
 %%SQLITE%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
 %%sqlite%%%%portexample...@dirrm %%EXAMPLESDIR%%/sqlite
 @dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%%
-%%WebUI%%%%WWWDIR%%/admins.sample
-%%WebUI%%%%WWWDIR%%/admin.cgi
-%%WebUI%%%%WWWDIR%%/admingraph.cgi
-%%WebUI%%%%WWWDIR%%/base.css
-%%WebUI%%%%WWWDIR%%/configure.pl.sample
-%%WebUI%%%%WWWDIR%%/default.prefs.sample
-%%WebUI%%%%WWWDIR%%/dspam.cgi
-%%WebUI%%%%WWWDIR%%/graph.cgi
-%%WebUI%%%%WWWDIR%%/dspam-logo-small.gif
-%%WebUI%%%%WWWDIR%%/rgb.txt
-%%WebUI%%%%WWWDIR%%/templates/nav_admin_error.html
-%%WebUI%%%%WWWDIR%%/templates/nav_admin_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/nav_admin_status.html
-%%WebUI%%%%WWWDIR%%/templates/nav_admin_user.html
-%%WebUI%%%%WWWDIR%%/templates/nav_alerts.html
-%%WebUI%%%%WWWDIR%%/templates/nav_analysis.html
-%%WebUI%%%%WWWDIR%%/templates/nav_error.html
-%%WebUI%%%%WWWDIR%%/templates/nav_fragment.html
-%%WebUI%%%%WWWDIR%%/templates/nav_history.html
-%%WebUI%%%%WWWDIR%%/templates/nav_performance.html
-%%WebUI%%%%WWWDIR%%/templates/nav_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/nav_quarantine.html
-%%WebUI%%%%WWWDIR%%/templates/nav_viewmessage.html
-%%WebUI%%%%WWWDIR%%/templates/strings.pl
-%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_error.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_status.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_user.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_alerts.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_analysis.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_error.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_fragment.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_history.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_performance.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_quarantine.html
-%%WebUI%%%%WWWDIR%%/templates/de/nav_viewmessage.html
-%%WebUI%%%%WWWDIR%%/templates/de/strings.pl
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_error.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_status.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_user.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_alerts.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_analysis.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_error.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_fragment.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_history.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_performance.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_quarantine.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/nav_viewmessage.html
-%%WebUI%%%%WWWDIR%%/templates/es-es/strings.pl
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_error.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_status.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_user.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_alerts.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_analysis.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_error.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_fragment.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_history.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_performance.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_quarantine.html
-%%WebUI%%%%WWWDIR%%/templates/fr/nav_viewmessage.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_error.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_status.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_user.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_alerts.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_analysis.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_error.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_fragment.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_history.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_performance.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_quarantine.html
-%%WebUI%%%%WWWDIR%%/templates/he/nav_viewmessage.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_error.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_status.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_user.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_alerts.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_analysis.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_error.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_fragment.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_history.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_performance.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_quarantine.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_viewmessage.html
-%%WebUI%%%%WWWDIR%%/templates/pt-br/strings.pl
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_error.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_status.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_user.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_alerts.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_analysis.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_error.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_fragment.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_history.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_performance.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_preferences.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_quarantine.html
-%%WebUI%%%%WWWDIR%%/templates/ro/nav_viewmessage.html
-%%webu...@dirrm %%WWWDIR%%/templates/de
-%%webu...@dirrm %%WWWDIR%%/templates/es-es
-%%webu...@dirrm %%WWWDIR%%/templates/fr
-%%webu...@dirrm %%WWWDIR%%/templates/he
-%%webu...@dirrm %%WWWDIR%%/templates/pt-br
-%%webu...@dirrm %%WWWDIR%%/templates/ro
-%%webu...@dirrm %%WWWDIR%%/templates
-%%webu...@dirrm %%WWWDIR%%
+%%WEBUI%%%%WWWDIR%%/admins.sample
+%%WEBUI%%%%WWWDIR%%/admin.cgi
+%%WEBUI%%%%WWWDIR%%/admingraph.cgi
+%%WEBUI%%%%WWWDIR%%/base.css
+%%WEBUI%%%%WWWDIR%%/configure.pl.sample
+%%WEBUI%%%%WWWDIR%%/default.prefs.sample
+%%WEBUI%%%%WWWDIR%%/dspam.cgi
+%%WEBUI%%%%WWWDIR%%/graph.cgi
+%%WEBUI%%%%WWWDIR%%/dspam-logo-small.gif
+%%WEBUI%%%%WWWDIR%%/rgb.txt
+%%WEBUI%%%%WWWDIR%%/templates/nav_admin_error.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_admin_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_admin_status.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_admin_user.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_alerts.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_analysis.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_error.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_fragment.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_history.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_performance.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_quarantine.html
+%%WEBUI%%%%WWWDIR%%/templates/nav_viewmessage.html
+%%WEBUI%%%%WWWDIR%%/templates/strings.pl
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_admin_error.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_admin_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_admin_status.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_admin_user.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_alerts.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_analysis.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_error.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_fragment.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_history.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_performance.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_quarantine.html
+%%WEBUI%%%%WWWDIR%%/templates/de/nav_viewmessage.html
+%%WEBUI%%%%WWWDIR%%/templates/de/strings.pl
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_admin_error.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_admin_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_admin_status.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_admin_user.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_alerts.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_analysis.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_error.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_fragment.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_history.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_performance.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_quarantine.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/nav_viewmessage.html
+%%WEBUI%%%%WWWDIR%%/templates/es-es/strings.pl
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_admin_error.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_admin_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_admin_status.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_admin_user.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_alerts.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_analysis.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_error.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_fragment.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_history.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_performance.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_quarantine.html
+%%WEBUI%%%%WWWDIR%%/templates/fr/nav_viewmessage.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_admin_error.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_admin_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_admin_status.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_admin_user.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_alerts.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_analysis.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_error.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_fragment.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_history.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_performance.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_quarantine.html
+%%WEBUI%%%%WWWDIR%%/templates/he/nav_viewmessage.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_admin_error.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_admin_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_admin_status.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_admin_user.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_alerts.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_analysis.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_error.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_fragment.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_history.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_performance.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_quarantine.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/nav_viewmessage.html
+%%WEBUI%%%%WWWDIR%%/templates/pt-br/strings.pl
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_admin_error.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_admin_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_admin_status.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_admin_user.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_alerts.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_analysis.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_error.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_fragment.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_history.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_performance.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_preferences.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_quarantine.html
+%%WEBUI%%%%WWWDIR%%/templates/ro/nav_viewmessage.html
+%%webu...@dirrm %%WWWDIR%%/templates/de
+%%webu...@dirrm %%WWWDIR%%/templates/es-es
+%%webu...@dirrm %%WWWDIR%%/templates/fr
+%%webu...@dirrm %%WWWDIR%%/templates/he
+%%webu...@dirrm %%WWWDIR%%/templates/pt-br
+%%webu...@dirrm %%WWWDIR%%/templates/ro
+%%webu...@dirrm %%WWWDIR%%/templates
+%%webu...@dirrm %%WWWDIR%%
 @dirrm include/dspam
 @cwd %%DSPAM_HOME%%
 firstrun.txt.sample

>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"

Reply via email to