Upgrade to 1.6.2

New version location noticed by:	ijliao

6 files changed, 41 insertions, 23 deletions

diff --git a/devel/gaa/Makefile b/devel/gaa/Makefile
index 83a6b101b178..f02b11219dae 100644
--- a/devel/gaa/Makefile
+++ b/devel/gaa/Makefile
@@ -6,16 +6,13 @@
 #
 
 PORTNAME=	gaa
-PORTVERSION=	1.5
+PORTVERSION=	1.6.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	demon@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 
-post-install:
-		@ ${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/devel/gaa/distinfo b/devel/gaa/distinfo
index c0a7935b98b2..5242026494e7 100644
--- a/devel/gaa/distinfo
+++ b/devel/gaa/distinfo
@@ -1 +1 @@
-MD5 (gaa-1.5.tgz) = 524807722639e86cc79f793291fee9a5
+MD5 (gaa-1.6.2.tar.gz) = 18d916ece62077cfbf727ab11019f277
diff --git a/devel/gaa/files/patch-configure b/devel/gaa/files/patch-configure
new file mode 100644
index 000000000000..9f93bdb661cc
--- /dev/null
+++ b/devel/gaa/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	Sun Jun  2 01:33:08 2002
++++ configure	Fri Jul 26 20:08:26 2002
+@@ -1159,8 +1159,8 @@
+ 
+ 
+ gaadatadir=$datadir/gaa
+-gaadocdir=$datadir/gaa/doc
+-gaasampledir=$datadir/gaa/sample
++gaadocdir=$datadir/doc/gaa
++gaasampledir=$datadir/examples/gaa
+ 
+ 
+ 
+@@ -2463,7 +2463,7 @@
+ 
+ 
+ if test $ac_cv_c_compiler_gnu != no; then
+-  CFLAGS="${CFLAGS} -ggdb3 -Wall -Wpointer-arith"
++  CFLAGS="${CFLAGS} -Wpointer-arith"
+ fi
+ 
+ 
diff --git a/devel/gaa/pkg-descr b/devel/gaa/pkg-descr
index 6109b8a1cf5a..db99d0392180 100644
--- a/devel/gaa/pkg-descr
+++ b/devel/gaa/pkg-descr
@@ -3,5 +3,7 @@ worry about the arguments given to it! A short text written in GAA
 language generates C-code which analyses the arguments and creates your
 program's help.
 
+WWW: http://gaa.sourceforge.net/
+
 --Dima
 dima@chg.ru
diff --git a/devel/gaa/pkg-message b/devel/gaa/pkg-message
deleted file mode 100644
index 076c5407e107..000000000000
--- a/devel/gaa/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-This program has no man-pages. Please read documentation in HTML format
-installed in share/gaa/doc/ directory.
--------------------------------------------------------------------------------
diff --git a/devel/gaa/pkg-plist b/devel/gaa/pkg-plist
index e0bf439e4fde..977825e3a040 100644
--- a/devel/gaa/pkg-plist
+++ b/devel/gaa/pkg-plist
@@ -1,15 +1,16 @@
 bin/gaa
+share/doc/gaa/gaa.html
+share/doc/gaa/gaa.ps
+share/doc/gaa/img1.png
+share/doc/gaa/gaa.css
+share/examples/gaa/sample.gaa
+share/examples/gaa/sample2.gaa
+share/examples/gaa/sample3.gaa
+share/examples/gaa/sample4.gaa
+share/examples/gaa/smain.c
+share/examples/gaa/smain2.c
+share/examples/gaa/config
 share/gaa/gaa.skel
-share/gaa/doc/GAAref.html
-share/gaa/doc/GAAtut.html
-share/gaa/doc/BACK.JPG
-share/gaa/doc/index.html
-share/gaa/doc/TOTORO2.GIF
-share/gaa/sample/sample.gaa
-share/gaa/sample/smain.c
-share/gaa/sample/sample2.gaa
-share/gaa/sample/smain2.c
-share/gaa/sample/config
-@dirrm share/gaa/sample
-@dirrm share/gaa/doc
+@dirrm share/doc/gaa
+@dirrm share/examples/gaa
 @dirrm share/gaa