diff options
| author | agc <agc> | 2004-07-15 19:26:46 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-07-15 19:26:46 +0000 |
| commit | 0199cc8ac69dc553b9041d75af86fe65ceb442ea (patch) | |
| tree | e1e2253d2007879585ea5c67c3e0b95e59f07213 | |
| parent | 8368ac701d596c6f5c97294bd205216be97d5a5f (diff) | |
| download | pkgsrc-0199cc8ac69dc553b9041d75af86fe65ceb442ea.tar.gz | |
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.
| -rw-r--r-- | doc/CHANGES-pkgsrc-2004Q2 | 4 | ||||
| -rw-r--r-- | print/psify/Makefile | 5 | ||||
| -rw-r--r-- | print/psify/distinfo | 3 | ||||
| -rw-r--r-- | print/psify/patches/patch-aa | 19 |
4 files changed, 28 insertions, 3 deletions
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index d349df41e5e..ec327960db1 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -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 @@ Pullup ticket 57, requested by Grant Beattie [agc 2004-07-14] 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 --git a/print/psify/Makefile b/print/psify/Makefile index aa938904f64..4f619f35422 100644 --- a/print/psify/Makefile +++ b/print/psify/Makefile @@ -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 @@ COMMENT= Pretty print C, CLU, SCHEME, Java and ARGUS source files WRKSRC= ${WRKDIR} DIST_SUBDIR= psify EXTRACT_ONLY= #empty + NO_CONFIGURE= yes +USE_BUILDLINK3= yes +USE_GNU_TOOLS+= lex INSTALL_TARGET= install prefix=${PREFIX} diff --git a/print/psify/distinfo b/print/psify/distinfo index 979ef243b23..c61ad8244a0 100644 --- a/print/psify/distinfo +++ b/print/psify/distinfo @@ -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 @@ SHA1 (psify/psify.lex) = ed5af37231547e5ac8788d47ca461181f9b7c512 Size (psify/psify.lex) = 18541 bytes SHA1 (psify/psify.man) = f517bc97ba3d3ff20fa19f86f4a6c26d20e1afbc Size (psify/psify.man) = 4023 bytes +SHA1 (patch-aa) = da19420bf10a2c22afc86a9140943c4857641fe9 diff --git a/print/psify/patches/patch-aa b/print/psify/patches/patch-aa new file mode 100644 index 00000000000..db2265408b8 --- /dev/null +++ b/print/psify/patches/patch-aa @@ -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` + |