From b7ea26c26b3464a080cd368c681721590147dc5e Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Tue, 15 Dec 2009 15:33:25 +0000
Subject: [PATCH] - wrap the patterns into a distfile i mirror, makes this a
 lot cleaner - set DIST_SUBDIR

---
 editors/nedit/Makefile | 18 +++++++----------
 editors/nedit/distinfo | 45 ++++++++++++++----------------------------
 2 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index d987c31efbe..7fbf607897e 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2009/12/15 08:17:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.48 2009/12/15 15:33:25 jasper Exp $
 # $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
 
 COMMENT=		X11/Motif GUI text editor
@@ -6,10 +6,7 @@ COMMENT=		X11/Motif GUI text editor
 DISTNAME=		nedit-5.5
 PKGNAME=		${DISTNAME}p8
 DISTFILES=		${DISTNAME}-src${EXTRACT_SUFX} \
-			diff.pats.gz:1 \
-			mipsasm.pats.gz:1 \
-			postgresql.pats.gz:1 \
-			ruby.pats.gz:1
+			nedit_patterns.tgz:1
 PATCHFILES=		wrapmark.diff:0
 CATEGORIES=		editors x11
 
@@ -19,6 +16,8 @@ MASTER_SITES=		http://www.nedit.org/ftp/v5_5/ \
 MASTER_SITES0=		http://www.bsdfrog.org/OpenBSD/distfiles/
 MASTER_SITES1=		http://www.phil.uu.nl/~lievisse/distfiles/
 
+DIST_SUBDIR=		nedit
+
 HOMEPAGE=		http://www.nedit.org/
 
 MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -42,7 +41,7 @@ NO_REGRESS=		Yes
 
 FLAVOR?=
 
-CFLAGS+=	-DBUILD_UNTESTED_NEDIT
+CFLAGS+=		-DBUILD_UNTESTED_NEDIT
 
 # gcc 3.3.5 internal compiler error
 .if ${MACHINE_ARCH} == "mips64"
@@ -51,8 +50,6 @@ EXTRA_CFLAGS=	-O0
 
 MAKE_FLAGS+=	EXTRA_CFLAGS=${EXTRA_CFLAGS}
 
-PATTERNS=	diff mipsasm postgresql ruby
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/source/nedit ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKBUILD}/source/nc ${PREFIX}/bin/ncl
@@ -63,8 +60,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit
 	${INSTALL_DATA} ${WRKSRC}/doc/nedit.doc ${PREFIX}/share/doc/nedit
 	${INSTALL_DATA_DIR} ${PREFIX}/share/nedit/patterns
-.for p in ${PATTERNS}
-	${INSTALL_DATA} ${WRKDIR}/$p.pats ${PREFIX}/share/nedit/patterns/
-.endfor
+	${INSTALL_DATA} ${WRKDIR}/nedit_patterns/*.pats \
+		${PREFIX}/share/nedit/patterns/
 
 .include <bsd.port.mk>
diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo
index c0bc4aa17e9..55ae3cb940b 100644
--- a/editors/nedit/distinfo
+++ b/editors/nedit/distinfo
@@ -1,30 +1,15 @@
-MD5 (diff.pats.gz) = ca0exzpd7gG2uyoG2rtr8Q==
-MD5 (mipsasm.pats.gz) = Wh14F4InizHxhXN8IhYLNw==
-MD5 (nedit-5.5-src.tar.gz) = Nh6Bw4CYxSMptZI8mGJwmA==
-MD5 (postgresql.pats.gz) = 8UU61f1rtQxCfawcG/ynUw==
-MD5 (ruby.pats.gz) = evBASb8ZgQEbymR27G7QfA==
-MD5 (wrapmark.diff) = ND/JW+ALY6PlIJBDhHzl0g==
-RMD160 (diff.pats.gz) = sJfTkTrpT3uZrevaJsRupuLLdzQ=
-RMD160 (mipsasm.pats.gz) = h41Moi3nI4PNpnFovZo+BGvMHLI=
-RMD160 (nedit-5.5-src.tar.gz) = n0nxyTZED9KmL6qMxuxiTErPWkM=
-RMD160 (postgresql.pats.gz) = esE+YhIGopUfxH+OyjJurcq3H4E=
-RMD160 (ruby.pats.gz) = 2nJTsJRcvpKa9RH/om4yC/9h5eg=
-RMD160 (wrapmark.diff) = SK2+rNnjMxLNg6pdR7tLMbk4tRU=
-SHA1 (diff.pats.gz) = b7UYWiqM+HE4PbluJGDGHolgGcs=
-SHA1 (mipsasm.pats.gz) = LSalLpxRJQaqLR0tc37Os0QOD70=
-SHA1 (nedit-5.5-src.tar.gz) = veQASQ9dKoQbFGt4BqrP8QWKUx0=
-SHA1 (postgresql.pats.gz) = Vjf+sZH/K4mhZh0njfjKha0jngU=
-SHA1 (ruby.pats.gz) = qodA83ZZ+0eCoTAe02EbnrarFOc=
-SHA1 (wrapmark.diff) = bWP8rvs6FtjbpPTSplPUmM2s3l4=
-SHA256 (diff.pats.gz) = vupSpH/vA66tmNBPGP3RWJiH9iCYT2+vLR7vnvMG13g=
-SHA256 (mipsasm.pats.gz) = JEfWBMbBYhhNLWJP11at/7icpiSV0Y/QlVlYA21v+7w=
-SHA256 (nedit-5.5-src.tar.gz) = fNa7yd8VQhzM6Zj0xqzZZuCmRTxV6JegMN4TLggkP1I=
-SHA256 (postgresql.pats.gz) = GSp6h1QZ8KR53GnK30sg4OjebdcIUgA8i8F7XNCxLlQ=
-SHA256 (ruby.pats.gz) = 0s3+QLvjYBRAcTWxW1Ua/oiCrpkEacFN568sv6GypcQ=
-SHA256 (wrapmark.diff) = zVi6lmNskZwQ4zfIedeKFD//kbECfO/Hq8uocohGqO0=
-SIZE (diff.pats.gz) = 910
-SIZE (mipsasm.pats.gz) = 1137
-SIZE (nedit-5.5-src.tar.gz) = 1503942
-SIZE (postgresql.pats.gz) = 2499
-SIZE (ruby.pats.gz) = 1032
-SIZE (wrapmark.diff) = 50327
+MD5 (nedit/nedit-5.5-src.tar.gz) = Nh6Bw4CYxSMptZI8mGJwmA==
+MD5 (nedit/nedit_patterns.tgz) = N6fyFenceKDK079aUY5YYw==
+MD5 (nedit/wrapmark.diff) = ND/JW+ALY6PlIJBDhHzl0g==
+RMD160 (nedit/nedit-5.5-src.tar.gz) = n0nxyTZED9KmL6qMxuxiTErPWkM=
+RMD160 (nedit/nedit_patterns.tgz) = 658GrEOKv1rXPJvX34mMGGRYslw=
+RMD160 (nedit/wrapmark.diff) = SK2+rNnjMxLNg6pdR7tLMbk4tRU=
+SHA1 (nedit/nedit-5.5-src.tar.gz) = veQASQ9dKoQbFGt4BqrP8QWKUx0=
+SHA1 (nedit/nedit_patterns.tgz) = oqef763vmYCJfnignXyrA0QXF0k=
+SHA1 (nedit/wrapmark.diff) = bWP8rvs6FtjbpPTSplPUmM2s3l4=
+SHA256 (nedit/nedit-5.5-src.tar.gz) = fNa7yd8VQhzM6Zj0xqzZZuCmRTxV6JegMN4TLggkP1I=
+SHA256 (nedit/nedit_patterns.tgz) = F4EyqGsMSNAKMEYYf5rQUQ+5+Cj/4MT+ooFKFEpSflA=
+SHA256 (nedit/wrapmark.diff) = zVi6lmNskZwQ4zfIedeKFD//kbECfO/Hq8uocohGqO0=
+SIZE (nedit/nedit-5.5-src.tar.gz) = 1503942
+SIZE (nedit/nedit_patterns.tgz) = 4974
+SIZE (nedit/wrapmark.diff) = 50327