Update to 1.2.0 stable release.

Approved by:	roam, nork (mentor/implicitly)

8 files changed, 10 insertions, 92 deletions

diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile
index e7e28c306d01..57430b31be1d 100644
--- a/mail/qmailadmin-devel/Makefile
+++ b/mail/qmailadmin-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qmailadmin
-PORTVERSION=	1.0.29
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/qmailadmin-devel/distinfo b/mail/qmailadmin-devel/distinfo
index bc0795a9e86d..9b3fed185fe9 100644
--- a/mail/qmailadmin-devel/distinfo
+++ b/mail/qmailadmin-devel/distinfo
@@ -1 +1,2 @@
-MD5 (qmailadmin-1.0.29.tar.gz) = 2664fdc0ef0350abea1aacc270ba8d25
+MD5 (qmailadmin-1.2.0.tar.gz) = 35d53eb676aaf84a8b860d659398ac58
+SIZE (qmailadmin-1.2.0.tar.gz) = 322743
diff --git a/mail/qmailadmin-devel/files/patch-Makefile.in b/mail/qmailadmin-devel/files/patch-Makefile.in
deleted file mode 100644
index 0f8ec64c4935..000000000000
--- a/mail/qmailadmin-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.in.orig	Sat Oct 18 01:37:05 2003
-+++ Makefile.in	Mon Oct 20 22:37:00 2003
-@@ -131,39 +131,6 @@
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--$(ACLOCAL_M4):  configure.in 
--	cd $(srcdir) && $(ACLOCAL)
--
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
--
--config.h: stamp-h
--	@if test ! -f $@; then \
--		rm -f stamp-h; \
--		$(MAKE) stamp-h; \
--	else :; fi
--stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
--	     $(SHELL) ./config.status
--	@echo timestamp > stamp-h 2> /dev/null
--$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/stamp-h.in; \
--		$(MAKE) $(srcdir)/stamp-h.in; \
--	else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
- 
- mostlyclean-hdr:
- 
diff --git a/mail/qmailadmin-devel/pkg-plist b/mail/qmailadmin-devel/pkg-plist
index ae28c9066c6b..20b21b983427 100644
--- a/mail/qmailadmin-devel/pkg-plist
+++ b/mail/qmailadmin-devel/pkg-plist
@@ -35,6 +35,7 @@
 %%DATADIR%%/lang/de
 %%DATADIR%%/lang/en
 %%DATADIR%%/lang/es
+%%DATADIR%%/lang/fi
 %%DATADIR%%/lang/fr
 %%DATADIR%%/lang/hu
 %%DATADIR%%/lang/it
@@ -42,7 +43,7 @@
 %%DATADIR%%/lang/nl
 %%DATADIR%%/lang/no
 %%DATADIR%%/lang/pl
-%%DATADIR%%/lang/pt-BR
+%%DATADIR%%/lang/pt-br
 %%DATADIR%%/lang/ru
 %%DATADIR%%/lang/sk
 %%DATADIR%%/lang/sv
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index e7e28c306d01..57430b31be1d 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qmailadmin
-PORTVERSION=	1.0.29
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/qmailadmin/distinfo b/mail/qmailadmin/distinfo
index bc0795a9e86d..9b3fed185fe9 100644
--- a/mail/qmailadmin/distinfo
+++ b/mail/qmailadmin/distinfo
@@ -1 +1,2 @@
-MD5 (qmailadmin-1.0.29.tar.gz) = 2664fdc0ef0350abea1aacc270ba8d25
+MD5 (qmailadmin-1.2.0.tar.gz) = 35d53eb676aaf84a8b860d659398ac58
+SIZE (qmailadmin-1.2.0.tar.gz) = 322743
diff --git a/mail/qmailadmin/files/patch-Makefile.in b/mail/qmailadmin/files/patch-Makefile.in
deleted file mode 100644
index 0f8ec64c4935..000000000000
--- a/mail/qmailadmin/files/patch-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.in.orig	Sat Oct 18 01:37:05 2003
-+++ Makefile.in	Mon Oct 20 22:37:00 2003
-@@ -131,39 +131,6 @@
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--$(ACLOCAL_M4):  configure.in 
--	cd $(srcdir) && $(ACLOCAL)
--
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
--
--config.h: stamp-h
--	@if test ! -f $@; then \
--		rm -f stamp-h; \
--		$(MAKE) stamp-h; \
--	else :; fi
--stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
--	     $(SHELL) ./config.status
--	@echo timestamp > stamp-h 2> /dev/null
--$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/stamp-h.in; \
--		$(MAKE) $(srcdir)/stamp-h.in; \
--	else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
- 
- mostlyclean-hdr:
- 
diff --git a/mail/qmailadmin/pkg-plist b/mail/qmailadmin/pkg-plist
index ae28c9066c6b..20b21b983427 100644
--- a/mail/qmailadmin/pkg-plist
+++ b/mail/qmailadmin/pkg-plist
@@ -35,6 +35,7 @@
 %%DATADIR%%/lang/de
 %%DATADIR%%/lang/en
 %%DATADIR%%/lang/es
+%%DATADIR%%/lang/fi
 %%DATADIR%%/lang/fr
 %%DATADIR%%/lang/hu
 %%DATADIR%%/lang/it
@@ -42,7 +43,7 @@
 %%DATADIR%%/lang/nl
 %%DATADIR%%/lang/no
 %%DATADIR%%/lang/pl
-%%DATADIR%%/lang/pt-BR
+%%DATADIR%%/lang/pt-br
 %%DATADIR%%/lang/ru
 %%DATADIR%%/lang/sk
 %%DATADIR%%/lang/sv