diff -naur free-sa.old/Makefile free-sa/Makefile
--- free-sa.old/Makefile	Mon Mar 26 18:25:45 2007
+++ free-sa/Makefile	Mon Apr  2 14:42:36 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	free-sa
-PORTVERSION=	1.0.2
+PORTVERSION=	1.2.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,6 +17,6 @@
 USE_GMAKE=	yes
 
 MAN1=	free-sa.1
-MAN5=	sa.conf.5
+MAN5=	free-sa.conf.5
 
 .include <bsd.port.mk>
diff -naur free-sa.old/distinfo free-sa/distinfo
--- free-sa.old/distinfo	Mon Mar 26 18:25:45 2007
+++ free-sa/distinfo	Mon Apr  2 14:18:14 2007
@@ -1,3 +1,3 @@
-MD5 (free-sa-1.0.2.tar.gz) = 3620fcfbaefacf131ddc71ee5ac2b4be
-SHA256 (free-sa-1.0.2.tar.gz) = 85946909e4366f8567db3ef23e1ff1aca03422ff9be98ca942d84d3be8b9a8e2
-SIZE (free-sa-1.0.2.tar.gz) = 44743
+MD5 (free-sa-1.2.0.tar.gz) = 51389ffe0dc4987fb3a3456bd3450da6
+SHA256 (free-sa-1.2.0.tar.gz) = f3a003c7412c5d351338a1a97173009ff124814b9231ad16889ce97a17151fbe
+SIZE (free-sa-1.2.0.tar.gz) = 51543
diff -naur free-sa.old/files/patch-Makefile free-sa/files/patch-Makefile
--- free-sa.old/files/patch-Makefile	Mon Mar 26 18:25:45 2007
+++ free-sa/files/patch-Makefile	Mon Apr  2 14:46:38 2007
@@ -1,30 +1,16 @@
---- Makefile.orig	Thu Mar 22 19:06:58 2007
-+++ Makefile	Fri Mar 23 22:21:04 2007
-@@ -9,7 +9,7 @@
- # etc dir
- ETCDIR = $(PREFIX)/etc/$(PROGLNAME)
- # where put reports (you can change it later via sa.conf configuration file)
--WWWDIR = $(PREFIX)/var/www/htdocs/$(PROGLNAME)
-+WWWDIR = $(PREFIX)/www/$(PROGLNAME)
- # temporary parent dir for sorting (you can change it later via sa.conf configuration file)
- TMPDIR = /tmp
- # where log file lives (you can change it later via sa.conf configuration file)
-@@ -18,9 +18,6 @@
- # C compiler
- CC = gcc
- 
--# Optimisations flags
--OPTIM = -pipe -O3 -march=$(MARCH) -fomit-frame-pointer
--
- # Warnings flags
- WARNS = -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 	-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual
-@@ -48,7 +45,7 @@
-        -DPROGNAME=\"$(PROGNAME)\" -DPROGVERSION=\"$(PROGVERSION)\" -DPROGURL=\"$(PROGURL)\"
- 
- # All compiling flags
--CFLAGS = $(OPTIM) -I. -I.. $(WARNS) $(CSTDF) $(DEFS)
-+CFLAGS += -I. -I.. $(WARNS) $(CSTDF) $(DEFS)
- 
- # All linking flags
- LDFLAGS += $(LIBS) $(CFLAGS)
+--- Makefile.orig	Mon Apr  2 14:45:41 2007
++++ Makefile	Mon Apr  2 14:46:20 2007
+@@ -14,11 +14,9 @@
+ install:
+ 	$(MAKEDIRS)
+ 	@(										\
+-	$(INSTALLDIR) $(PREFIX);							\
+-	$(INSTALLDIR) $(PREFIX)/doc;							\
+-	$(INSTALLDIR) $(PREFIX)/doc/$(PROGLNAME)-$(PROGVERSION);			\
++	$(INSTALLDIR) $(PREFIX)/share/doc/$(PROGLNAME)-$(PROGVERSION);			\
+ 	$(INSTALLODR) $(TMPDIR);							\
+ 	for IDOCFILE in COPYING ChangeLog FAQ INSTALL README README.DEV TRANSLATIONS; do\
+-	    $(INSTALLFIL) $$IDOCFILE $(PREFIX)/doc/$(PROGLNAME)-$(PROGVERSION);		\
++	    $(INSTALLFIL) $$IDOCFILE $(PREFIX)/share/doc/$(PROGLNAME)-$(PROGVERSION);		\
+ 	done										\
+ 	)
Only in free-sa/files: patch-global.mk
diff -naur free-sa.old/pkg-plist free-sa/pkg-plist
--- free-sa.old/pkg-plist	Mon Mar 26 18:25:45 2007
+++ free-sa/pkg-plist	Mon Apr  2 14:50:56 2007
@@ -1,40 +1,63 @@
 bin/free-sa
-etc/free-sa/downloads
-etc/free-sa/sa.conf
-share/free-sa/English
-share/free-sa/Russian
-share/free-sa/RussianMail
-share/doc/free-sa-1.0.2/COPYING
-share/doc/free-sa-1.0.2/INSTALL
-share/doc/free-sa-1.0.2/README
-share/doc/free-sa-1.0.2/README.DEV
-www/free-sa/d.png
-www/free-sa/g.png
-www/free-sa/gsa.css
-www/free-sa/lsa.css
-www/free-sa/rsa.css
-www/free-sa/themes/default
-www/free-sa/themes/rbsec/d.png
-www/free-sa/themes/rbsec/g.png
-www/free-sa/themes/rbsec/gsa.css
-www/free-sa/themes/rbsec/lsa.css
-www/free-sa/themes/rbsec/rsa.css
-www/free-sa/themes/sarg/d.png
-www/free-sa/themes/sarg/g.png
-www/free-sa/themes/sarg/gsa.css
-www/free-sa/themes/sarg/lsa.css
-www/free-sa/themes/sarg/rsa.css
-www/free-sa/themes/silver/d.png
-www/free-sa/themes/silver/g.png
-www/free-sa/themes/silver/gsa.css
-www/free-sa/themes/silver/lsa.css
-www/free-sa/themes/silver/rsa.css
-www/free-sa/themes/sa.js
+etc/free-sa/downloads-archives.sample
+etc/free-sa/downloads-cddvd.sample
+etc/free-sa/downloads-office.sample
+etc/free-sa/downloads-audio.sample
+etc/free-sa/downloads-code.sample
+etc/free-sa/downloads-video.sample
+etc/free-sa/downloads.sample
+etc/free-sa/free-sa.conf.sample
+share/free-sa/Russian.KOI8-R
+share/free-sa/RussianMail.KOI8-R
+share/free-sa/German.UTF8
+share/free-sa/GermanMail.UTF8
+share/free-sa/Czech.ISO8859-2
+share/free-sa/CzechMail.ISO8859-2
+share/free-sa/Belarusian.CP1251
+share/free-sa/BelarusianMail.CP1251
+share/free-sa/English.ISO8859-1
+share/free-sa/EnglishMail.ISO8859-1
+share/free-sa/Estonian.UTF8
+share/free-sa/EstonianMail.UTF8
+share/free-sa/Italian.ISO8859-1
+share/free-sa/ItalianMail.ISO8859-1
+share/free-sa/Slovak.UTF8
+share/free-sa/SlovakMail.UTF8
+share/doc/free-sa-1.2.0/COPYING
+share/doc/free-sa-1.2.0/INSTALL
+share/doc/free-sa-1.2.0/README
+share/doc/free-sa-1.2.0/README.DEV
+share/doc/free-sa-1.2.0/ChangeLog     
+share/doc/free-sa-1.2.0/FAQ
+share/doc/free-sa-1.2.0/TRANSLATIONS
+www/data/free-sa/sa.js
+www/data/free-sa/d.png
+www/data/free-sa/g.png
+www/data/free-sa/gsa.css
+www/data/free-sa/lsa.css
+www/data/free-sa/rsa.css
+www/data/free-sa/themes/default
+www/data/free-sa/themes/rbsec/d.png
+www/data/free-sa/themes/rbsec/g.png
+www/data/free-sa/themes/rbsec/gsa.css
+www/data/free-sa/themes/rbsec/lsa.css
+www/data/free-sa/themes/rbsec/rsa.css
+www/data/free-sa/themes/sarg/d.png
+www/data/free-sa/themes/sarg/g.png
+www/data/free-sa/themes/sarg/gsa.css
+www/data/free-sa/themes/sarg/lsa.css
+www/data/free-sa/themes/sarg/rsa.css
+www/data/free-sa/themes/silver/d.png
+www/data/free-sa/themes/silver/g.png
+www/data/free-sa/themes/silver/gsa.css
+www/data/free-sa/themes/silver/lsa.css
+www/data/free-sa/themes/silver/rsa.css
+www/data/free-sa/themes/sa.js
 @dirrm etc/free-sa
 @dirrm share/free-sa
-@dirrm share/doc/free-sa-1.0.2
-@dirrm www/free-sa/themes/rbsec
-@dirrm www/free-sa/themes/sarg
-@dirrm www/free-sa/themes/silver
-@dirrm www/free-sa/themes
-@dirrm www/free-sa
+@dirrm share/doc/free-sa-1.2.0
+@dirrm www/data/free-sa/themes/rbsec
+@dirrm www/data/free-sa/themes/sarg
+@dirrm www/data/free-sa/themes/silver
+@dirrm www/data/free-sa/themes
+@dirrm www/data/free-sa