[pkgsrc/trunk]: pkgsrc/graphics/netpbm USE_GNU_TOOLS+=lex instead of .if OPSY...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6440765c75aa
branches:  trunk
changeset: 468365:6440765c75aa
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Feb 13 10:53:09 2004 +0000

description:
USE_GNU_TOOLS+=lex instead of .if OPSYS || OPSYS .. and simplify
passing the socket libraries on Solaris.

diffstat:

 graphics/netpbm/Makefile |  18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diffs (45 lines):

diff -r 42edd82dccc8 -r 6440765c75aa graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Fri Feb 13 08:26:03 2004 +0000
+++ b/graphics/netpbm/Makefile  Fri Feb 13 10:53:09 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2004/02/01 01:43:29 jlam Exp $
+# $NetBSD: Makefile,v 1.91 2004/02/13 10:53:09 grant Exp $
 
 DISTNAME=      netpbm-10.11.8
 PKGREVISION=   1
@@ -13,7 +13,7 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=        yes
-USE_GNU_TOOLS+=        make
+USE_GNU_TOOLS+=        lex make
 USE_PERL5=     yes
 
 INSTALL_TARGET=        install-dev install-run
@@ -25,23 +25,15 @@
                generator/ppmrainbow manweb
 STAGEDIR=      ${WRKDIR}/staging
 
+LIBS.SunOS=    -lsocket -lnsl
+MAKE_ENV+=     NETWORKLD="${LIBS}"
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=             2.95.3
 .endif
 
-.if ${OPSYS} == SunOS
-MAKE_ENV+=     NETWORKLD="-lsocket -lnsl"
-.else
-MAKE_ENV+=     NETWORKLD=""
-.endif
-
-.if (${OPSYS} == SunOS) || (${OPSYS} == IRIX) || \
-    (${OPSYS} == Linux && !exists(/usr/bin/flex))
-BUILD_DEPENDS+=        flex>=2.5.4:../../devel/flex
-.endif
-
 pre-configure:
        ${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config