2 files changed, 21 insertions, 69 deletions
diff --git a/install/freebsd/INSTALL b/install/freebsd/INSTALL
index e8c92b02d..53fc613d1 100755
--- a/install/freebsd/INSTALL
+++ b/install/freebsd/INSTALL
@@ -1,53 +1,26 @@
 #!/bin/sh
 
-# if /usr/local/sbin/portupgrade does not exist
-# then install portupgrade
 ( cd /usr/ports/sysutils/portupgrade
-  #??? setenv WITH_OPENSSL_PORT "yes"
-  make install clean
+  make install
 )
 
-# ???
-##rehash
-#pkgdb -u
+pkgdb -u
 
-# if cvsup is not installed, then
 portinstall -PR cvsup-without-gui
 
-#cp /usr/share/examples/cvsup/ports-supfile /root
-#perl -pi -e 's/CHANGE_THIS/cvsup13/;' /root/ports-supfile
-#cvsup /root/ports-supfile
-
-# choose the fastest cvsup server, then cvsup update
-/usr/local/bin/cvsup -g -L 2 -h cvsup2.freebsd.org /usr/share/examples/cvsup/ports-supfile
-
-# Update the ports database
-#/usr/local/sbin/portsdb -Uu
-portsdb -Uu
-
-portinstall -PR portupgrade
-
-portinstall -PR lang/perl5.8
-# if FreeBSD 4.x, then
-/usr/local/bin/use.perl port
-
-#portupgrade -f `(pkg_info -R perl-5\* |tail +4; \
-#        find /usr/local/lib/perl5/site_perl/5.[68].[1245] -type f -print0 \
-#        | xargs -0 pkg_which -fv | sed -e '/: ?/d' -e 's/.*: //')|sort -u`
-
+cp /usr/share/examples/cvsup/ports-supfile /root
+perl -pi -e 's/CHANGE_THIS/cvsup1/;' /root/ports-supfile
+cvsup /root/ports-supfile
 
 for port in `grep -v '^ *#' ports`; do
-  portinstall -PR $port
+  #cd /usr/ports/$port
+  #make install || exit
+  portinstall -P -R $port || exit
 done
 
-for a in JavaScript::RPC::Server::CGI Chart::LinesPoints Frontier::RPC2; do perl -MCPAN -e"install $a"; done
+for a in Net::SSH DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration Business::CreditCard; do perl -MCPAN -e"install $a"; done
 
 su -l pgsql -c initdb
-echo '
-postgresql_enable="YES"
-postgresql_data="/usr/local/pgsql/data"
-postgresql_flags="-w -s -m fast"
-' >>/etc/rc.conf
 
 /usr/local/etc/rc.d/010.pgsql.sh start
 
@@ -61,16 +34,7 @@ su -l freeside -c 'createdb freeside'
 cd ../..
 make install-perl-modules
 make create-config
-freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-su freeside -c 'freeside-setup ivan'
-su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
+make deploy
 
 #edit apache config, etc.
 
-echo '
-apache_enable="YES"
-apache_flags="-DSSL"
-' >>/etc/rc.conf
-
-make deploy
-
diff --git a/install/freebsd/ports b/install/freebsd/ports
index 90b49e668..019c5e194 100644
--- a/install/freebsd/ports
+++ b/install/freebsd/ports
@@ -1,13 +1,10 @@
 shells/zsh
 misc/screen
-security/sudo
 ftp/lftp
-lang/perl5.8
 www/apache13-modssl
 www/mod_perl
 net/rsync
-databases/postgresql74-server
-#databases/postgresql74-client
+databases/postgresql7
 misc/p5-Array-PrintCols
 devel/p5-Term-Query
 converters/p5-MIME-Base64
@@ -18,9 +15,9 @@ www/p5-HTML-Tagset
 www/p5-HTML-Parser
 net/p5-Net
 misc/p5-Locale-Codes
-net/p5-Net-Whois-Raw
+net/p5-Net-Whois
 www/p5-libwww
-finance/p5-Business-CreditCard
+     #misc/p5-Business-CreditCard
 devel/p5-Data-ShowTable
 mail/p5-Mail-Tools
 devel/p5-TimeDate
@@ -31,26 +28,17 @@ devel/p5-String-Approx
 textproc/p5-Text-Template
 databases/p5-DBI
 databases/p5-DBD-Pg
-    #databases/p5-DBD-mysql
-    #databases/p5-DBIx-DataSource
-database/p5-DBIx-DBSchema
-net/p5-Net-SSH
+#databases/p5-DBD-mysql
+databases/p5-DBIx-DataSource
+    #database/p5-DBIx-DBSchema
+    #net/p5-Net-SSH
 textproc/p5-String-ShellQuote
 net/p5-Net-SCP
-    #www/p5-Apache-ASP
-www/p5-HTML-Mason
+www/p5-Apache-ASP
+    #www/p5-HTML-Mason
 devel/p5-Tie-IxHash
-devel/p5-Time-Duration
-www/p5-HTML-Widgets-SelectLayers
+    #devel/p5-Time-Duration
+    #www/p5-HTML-Widgets-SelectLayers
 devel/p5-Storable
 www/p5-Apache-DBI
 devel/p5-Cache-Cache
-security/p5-Crypt-PasswdMD5
-net-mgmt/p5-NetAddr-IP
-graphics/p5-GD
-textproc/p5-Spreadsheet-WriteExcel
-textproc/p5-Text-CSV_XS
-misc/p5-Locale-SubCountry
-devel/p5-IO-stringy
-textproc/p5-XML-Parser
-mail/p5-MIME-Tools