Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1568808982256900"
MIME-Version: 1.0
Date: Wed, 18 Sep 2019 12:16:22 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/detox
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20190918121622.AE29DFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1568808982256900
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Wed Sep 18 12:16:22 UTC 2019

Modified Files:
	pkgsrc/sysutils/detox: Makefile distinfo
	pkgsrc/sysutils/detox/patches: patch-aa

Log Message:
detox: fix build when using flex from pkgsrc (i.e. linux)

Look for -lfl in LDFLAGS as well, not just the default paths.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/detox/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/detox/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/sysutils/detox/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1568808982256900
Content-Disposition: inline
Content-Length: 2562
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/detox/Makefile
diff -u pkgsrc/sysutils/detox/Makefile:1.7 pkgsrc/sysutils/detox/Makefile:1.8
--- pkgsrc/sysutils/detox/Makefile:1.7	Wed Mar 30 12:51:16 2016
+++ pkgsrc/sysutils/detox/Makefile	Wed Sep 18 12:16:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/03/30 12:51:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2019/09/18 12:16:22 maya Exp $
 #
 
 DISTNAME=		detox-1.2.0
@@ -17,6 +17,8 @@ INSTALL_TARGET=		install-base install-un
 EGDIR=			${PREFIX}/share/examples/detox
 CONF_FILES=		${EGDIR}/detoxrc ${PKG_SYSCONFDIR}/detoxrc
 
+MAKE_ENV+=		L_OPT=-L${PREFIX}/lib
+
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/detoxrc ${DESTDIR}${EGDIR}/detoxrc

Index: pkgsrc/sysutils/detox/distinfo
diff -u pkgsrc/sysutils/detox/distinfo:1.3 pkgsrc/sysutils/detox/distinfo:1.4
--- pkgsrc/sysutils/detox/distinfo:1.3	Wed Nov  4 01:32:11 2015
+++ pkgsrc/sysutils/detox/distinfo	Wed Sep 18 12:16:22 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:32:11 agc Exp $
+$NetBSD: distinfo,v 1.4 2019/09/18 12:16:22 maya Exp $
 
 SHA1 (detox-1.2.0.tar.bz2) = cfb88a1adefaf4ee3933baf9a6530c102baa47ce
 RMD160 (detox-1.2.0.tar.bz2) = 02eb1a5ebc28f6f6e024d58b998758d156002a70
 SHA512 (detox-1.2.0.tar.bz2) = 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
 Size (detox-1.2.0.tar.bz2) = 86118 bytes
-SHA1 (patch-aa) = 31eca361d838b78642873c380ebf497483790cdb
+SHA1 (patch-aa) = b1a3855a2cbf9d1d3325f22c00bdccd772ad768a

Index: pkgsrc/sysutils/detox/patches/patch-aa
diff -u pkgsrc/sysutils/detox/patches/patch-aa:1.1.1.1 pkgsrc/sysutils/detox/patches/patch-aa:1.2
--- pkgsrc/sysutils/detox/patches/patch-aa:1.1.1.1	Thu Dec  1 03:32:03 2005
+++ pkgsrc/sysutils/detox/patches/patch-aa	Wed Sep 18 12:16:22 2019
@@ -1,8 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/12/01 03:32:03 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2019/09/18 12:16:22 maya Exp $
 
---- Makefile.in.orig	2005-08-28 07:46:30.000000000 +0200
+Find where -lfl might be,
+
+don't install directly to sysconfdir (we install to the
+share/examples in the package Makefile)
+
+--- Makefile.in.orig	2008-04-12 01:02:47.000000000 +0000
 +++ Makefile.in
-@@ -124,7 +124,7 @@ install-safe-config:
+@@ -40,7 +40,7 @@ sysconfdir = @sysconfdir@
+ datadir = @datadir@
+ 
+ CFLAGS = @CFLAGS@
+-L_OPT = @LEXLIB@ @LIBS@
++L_OPT = @LEXLIB@ @LIBS@ @LDFLAGS@
+ 
+ CC = @CC@
+ LEX = @LEX@
+@@ -149,7 +149,7 @@ install-safe-config:
  	fi
  
  install-unsafe-config:


--_----------=_1568808982256900--