--VS++wcV0S1rZb1Fb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Jan 12, 2005 at 05:15:00PM +0000, Rhialto wrote:
> >Number:         28946
> >Category:       pkg
> >Synopsis:       new package: lang/agfl
> >Confidential:   no
> >Severity:       non-critical
> >Priority:       low
> >Responsible:    pkg-manager
> >State:          open
> >Class:          change-request
> >Submitter-Id:   net
> >Arrival-Date:   Wed Jan 12 17:15:00 +0000 2005
> >Originator:     Rhialto
> >Release:        NetBSD 2.0

I took a quick look over this one, and made some changes so that it
passed pkglint. In addition, patch-ac had the wrong path to a file
which had to be patched. When I'd corrected the pathname, it turned
out that identical copies of the same file were in two subdirectories,
so I made them all point to the same patched file using symbolic links.

Changes are attached to this mail.

Unfortunately, the build won't complete - it uses latex to process
the documentation. I haven't made an attempt to fix this yet.

Regards,
Alistair

--VS++wcV0S1rZb1Fb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=agfl-diffs

diff -r -u agfl/Makefile agfl-agc/Makefile
--- agfl/Makefile	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/Makefile	2005-01-14 09:49:12.000000000 +0000
@@ -1,15 +1,16 @@
 # $NetBSD$
 
 DISTNAME=	agfl-${AGFL_VERSION}
-AGFL_VERSION=	2.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.ru.nl/pub/agfl/${AGFL_VERSION}/unix/sources/
 
 MAINTAINER=	olafs@cs.ru.nl
 HOMEPAGE=	http://www.cs.ru.nl/agfl/
-COMMENT=	formalism for the syntactic description of Natural Languages
+COMMENT=	Formalism for the syntactic description of Natural Languages
+
+PKG_INSTALLATION_TYPES=	pkgviews overwrite
 
-PKG_INSTALLATION_TYPES=	pkgviews overwrite 
+AGFL_VERSION=	2.3
 
 CONFIGURE_ARGS += --with-cdl3=${BUILDLINK_PREFIX.cdl3}
 
@@ -22,6 +23,12 @@
 SUBST_FILES.rpath = gen/src/gen.c
 SUBST_SED.rpath = "s!define RPATH.*\"\"!define RPATH \"-Wl,-R ${PREFIX}/lib -Wl,-R ${VIEWBASE}/lib \"!"
 
+post-extract:
+	for d in nmrts pmrts; do					\
+		${RM} ${WRKSRC}/gen/rts/$$d/rtsagfl.c;			\
+		cd ${WRKSRC}/gen/rts/$$d && ${LN} -s ../rtsagfl.c;	\
+	done
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/agfl
 	${INSTALL_DATA} ${WRKSRC}/doc/userdoc/manual.ps ${PREFIX}/share/doc/agfl/manual.ps
diff -r -u agfl/PLIST agfl-agc/PLIST
--- agfl/PLIST	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/PLIST	2005-01-14 08:51:45.000000000 +0000
@@ -1,3 +1,4 @@
+@comment $NetBSD$
 bin/datconvert
 bin/gen
 bin/gra2o
diff -r -u agfl/distinfo agfl-agc/distinfo
--- agfl/distinfo	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/distinfo	2005-01-14 09:49:37.000000000 +0000
@@ -2,13 +2,13 @@
 
 SHA1 (agfl-2.3.tar.gz) = 2d1fc5ea1259e71bdcbeb61da7b134538466a4a0
 Size (agfl-2.3.tar.gz) = 1022438 bytes
-SHA1 (patch-aa) = 8961b2014fbcd3479dbe5a42fc5fc439a8306ba6
-SHA1 (patch-ab) = 4dbc5782be18bd3b89a33d26fb00e3a8ae758a87
-SHA1 (patch-ac) = 0a27ce66a3a5e7f24507a886af16c7066c496e8e
-SHA1 (patch-ad) = a6530ba2e7ff7ff8087dd5967355ebb7de2a00ec
-SHA1 (patch-ae) = 218583efb287d45c5896e18f2857495a9e7ec3ea
-SHA1 (patch-af) = c938bd3fc8171e170bdbbc11cb07a9d63d89cad3
-SHA1 (patch-ag) = 5bca9999a6a1eefefa44d0507ead53a21c4e43c9
-SHA1 (patch-ah) = 8b98950b55f8f4b2f91737da05a4c5c00368cbcf
-SHA1 (patch-ai) = 2d08756cdd8403126602bf7e5f4571eb17430e1d
-SHA1 (patch-aj) = f3501795606193a2c0b54e440e768cc957379b50
+SHA1 (patch-aa) = 4a266fadf7265f81defc2f3729ab9b4541328b0b
+SHA1 (patch-ab) = c4a7697190525b3dfeb5f9d58488cf675e01b512
+SHA1 (patch-ac) = cb8cae29953280efc30d7fcc3dfb542fccb5bcf9
+SHA1 (patch-ad) = b554f34c9703d0cd2c54592eb40c4438d3ef44e9
+SHA1 (patch-ae) = 30fd905772361e6075943c07bb6abf195d5dd5af
+SHA1 (patch-af) = de1579b5b0e3e404740210d8000edad617956317
+SHA1 (patch-ag) = 73ad08ce34aecdec106a574893107b07a022ea62
+SHA1 (patch-ah) = 2ef3c7594dff4b48dfceb0938a62464a6ee25980
+SHA1 (patch-ai) = 730257b437f063868f15f73378ebcfa258a56556
+SHA1 (patch-aj) = 42e46e0786dc27a73c11cb2e721426c2d358c712
diff -r -u agfl/patches/patch-aa agfl-agc/patches/patch-aa
--- agfl/patches/patch-aa	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-aa	2005-01-14 08:46:55.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Add system detection.
 
 --- configure.dist	2003-10-28 17:48:54.000000000 +0100
diff -r -u agfl/patches/patch-ab agfl-agc/patches/patch-ab
--- agfl/patches/patch-ab	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-ab	2005-01-14 08:46:58.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 A "negative" unsigned value is not a good idea.
 
 --- gen/rts/posmemo.c.dist	2003-07-22 15:32:07.000000000 +0200
diff -r -u agfl/patches/patch-ac agfl-agc/patches/patch-ac
--- agfl/patches/patch-ac	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-ac	2005-01-14 09:49:33.000000000 +0000
@@ -1,7 +1,9 @@
+$NetBSD$
+
 A "negative" unsigned value is not a good idea.
 
---- rtsagfl.c.orig	2003-08-15 22:04:43.000000000 +0200
-+++ rtsagfl.c	2005-01-06 11:02:11.000000000 +0100
+--- gen/rts/rtsagfl.c.orig	2003-08-15 22:04:43.000000000 +0200
++++ gen/rts/rtsagfl.c	2005-01-06 11:02:11.000000000 +0100
 @@ -278,7 +278,7 @@
  #endif /* DEBUG_NEGMEMO */
  
diff -r -u agfl/patches/patch-ad agfl-agc/patches/patch-ad
--- agfl/patches/patch-ad	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-ad	2005-01-14 08:46:58.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 An apparent typo.
 
 --- gen/rts/rtslex.h.dist	2003-07-20 15:28:52.000000000 +0200
diff -r -u agfl/patches/patch-ae agfl-agc/patches/patch-ae
--- agfl/patches/patch-ae	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-ae	2005-01-14 08:46:58.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Avoid double definitions.
 
 --- gen/src/pattern.c.dist	2001-10-17 11:30:15.000000000 +0200
diff -r -u agfl/patches/patch-af agfl-agc/patches/patch-af
--- agfl/patches/patch-af	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-af	2005-01-14 08:46:58.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Patch in RPATH; it will be edited again from make post-patch.
 mygen.c depends on and is made from gen.c
 
diff -r -u agfl/patches/patch-ag agfl-agc/patches/patch-ag
--- agfl/patches/patch-ag	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-ag	2005-01-14 08:47:27.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Machdep file for NetBSD/alpha
 
 --- /dev/null	2005-01-05 18:16:07.000000000 +0100
@@ -22,7 +24,7 @@
 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 + */
 +
-+/* $Id: machdep.i386-freebsd,v 1.1 2001/10/17 12:47:00 ejv Exp $ */
++/* From Id: machdep.i386-freebsd,v 1.1 2001/10/17 12:47:00 ejv Exp */
 +
 +#define LONG_MAX				0x7fffffffffffffff
 +#define GLOBAL(name)				.globl	name
diff -r -u agfl/patches/patch-ah agfl-agc/patches/patch-ah
--- agfl/patches/patch-ah	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-ah	2005-01-14 08:47:38.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Machdep file for NetBSD/i386
 
 --- /dev/null 2005-01-05 18:16:13.000000000 +0100
@@ -22,7 +24,7 @@
 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 + */
 +
-+/* $Id: machdep.i386-freebsd,v 1.1 2001/10/17 12:47:00 ejv Exp $ */
++/* From Id: machdep.i386-freebsd,v 1.1 2001/10/17 12:47:00 ejv Exp */
 +
 +#define LONG_MAX				2147483647
 +#define GLOBAL(name)				.globl	name
diff -r -u agfl/patches/patch-ai agfl-agc/patches/patch-ai
--- agfl/patches/patch-ai	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-ai	2005-01-14 08:46:58.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Avoid a warning, potential error.
 
 --- lexgen/src/insout.h.dist	2003-11-08 12:24:43.000000000 +0100
diff -r -u agfl/patches/patch-aj agfl-agc/patches/patch-aj
--- agfl/patches/patch-aj	2005-01-14 10:26:10.000000000 +0000
+++ agfl-agc/patches/patch-aj	2005-01-14 08:46:58.000000000 +0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Make one of the examples actually work.
 
 --- gen/test/verb.gra.dist	2000-08-25 12:54:11.000000000 +0200

--VS++wcV0S1rZb1Fb--