[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 55 to the pkgsrc-2004Q2 branch, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d6ad2a337cff
branches:  pkgsrc-2004Q2
changeset: 476731:d6ad2a337cff
user:      agc <agc%pkgsrc.org@localhost>
date:      Thu Jul 15 19:26:46 2004 +0000

description:
Pullup ticket 55 to the pkgsrc-2004Q2 branch, requested by Lubomir Sedlacik.

Solaris build fixes for print/psify.

        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Sun Jun 27 13:32:16 UTC 2004

        Modified Files:
                pkgsrc/print/psify: Makefile

        Log Message:
        this blindly calls "gcc", so use buildlink3 so it uses the wrapper.

and

        Module Name:    pkgsrc
        Committed By:   salo
        Date:           Sat Jul 10 13:55:09 UTC 2004

        Modified Files:
                pkgsrc/print/psify: Makefile distinfo
        Added Files:
                pkgsrc/print/psify/patches: patch-aa

        Log Message:
        Require flex, don't hardcode CC, LEX, CFLAGS, LDFLAGS.
        Fixes build on Solaris.

diffstat:

 doc/CHANGES-pkgsrc-2004Q2    |   4 +++-
 print/psify/Makefile         |   5 ++++-
 print/psify/distinfo         |   3 ++-
 print/psify/patches/patch-aa |  19 +++++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diffs (72 lines):

diff -r 50cbd886f542 -r d6ad2a337cff doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Wed Jul 14 12:49:18 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Thu Jul 15 19:26:46 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.24 2004/07/14 12:49:18 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.25 2004/07/15 19:26:46 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -44,3 +44,5 @@
        apache2 security and bug fix
 Pullup ticket 58, requested by Martti Kuparinen [agc 2004-07-14]
        Further updates to bring xfce4 to 4.0.6 - bugfix release
+Pullup ticket 55, requested by Lubomir Sedlacik [agc 2004-07-15]
+       Solaris psify build fix
diff -r 50cbd886f542 -r d6ad2a337cff print/psify/Makefile
--- a/print/psify/Makefile      Wed Jul 14 12:49:18 2004 +0000
+++ b/print/psify/Makefile      Thu Jul 15 19:26:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:24:29 agc Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2004/07/15 19:26:46 agc Exp $
 #
 
 DISTNAME=      psify-19980216
@@ -13,7 +13,10 @@
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   psify
 EXTRACT_ONLY=  #empty
+
 NO_CONFIGURE=  yes
+USE_BUILDLINK3=        yes
+USE_GNU_TOOLS+=        lex
 
 INSTALL_TARGET=        install prefix=${PREFIX}
 
diff -r 50cbd886f542 -r d6ad2a337cff print/psify/distinfo
--- a/print/psify/distinfo      Wed Jul 14 12:49:18 2004 +0000
+++ b/print/psify/distinfo      Thu Jul 15 19:26:46 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:53 agc Exp $
+$NetBSD: distinfo,v 1.2.14.1 2004/07/15 19:26:46 agc Exp $
 
 SHA1 (psify/Makefile) = fbceb5e2add289e07a42fceb0978a95e57b316c3
 Size (psify/Makefile) = 498 bytes
@@ -8,3 +8,4 @@
 Size (psify/psify.lex) = 18541 bytes
 SHA1 (psify/psify.man) = f517bc97ba3d3ff20fa19f86f4a6c26d20e1afbc
 Size (psify/psify.man) = 4023 bytes
+SHA1 (patch-aa) = da19420bf10a2c22afc86a9140943c4857641fe9
diff -r 50cbd886f542 -r d6ad2a337cff print/psify/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/psify/patches/patch-aa      Thu Jul 15 19:26:46 2004 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1.2.2 2004/07/15 19:26:46 agc Exp $
+
+--- Makefile.orig      Sat Jul 10 15:43:55 2004
++++ Makefile   Sat Jul 10 15:44:27 2004
+@@ -2,10 +2,10 @@
+ 
+ PROG  = psify
+ OBJS  = psify.o lex.yy.o
+-CC    = gcc
+-LEX   = flex
+-CFLAGS        = -O
+-LDFLAGS = 
++#CC   = gcc
++#LEX  = flex
++#CFLAGS       = -O
++#LDFLAGS = 
+ #GREP = grep
+ #LIBS = `$(GREP) -q FLEX_SCANNER lex.yy.c || echo -ll`
+