diff options
| author | mjl <mjl> | 2002-01-18 22:27:35 +0000 |
|---|---|---|
| committer | mjl <mjl> | 2002-01-18 22:27:35 +0000 |
| commit | 287fec17145e02033b0776bdd289608c2acc7214 (patch) | |
| tree | 011ecb3a1f8ab0105555122e843d22587cdfc17d /editors/nedit | |
| parent | b4f6a2b191287215d068d68d064bc33134791ed1 (diff) | |
| download | pkgsrc-287fec17145e02033b0776bdd289608c2acc7214.tar.gz | |
Fix PR/15277 a bit differently -- just don't let the pkg's Makefile
stomp over CFLAGS so it will find all the buildlinked stuff.
Diffstat (limited to 'editors/nedit')
| -rw-r--r-- | editors/nedit/Makefile | 3 | ||||
| -rw-r--r-- | editors/nedit/distinfo | 4 | ||||
| -rw-r--r-- | editors/nedit/patches/patch-aa | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 98f634e6df5..9c15e693c6b 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/01/17 17:11:48 agc Exp $ +# $NetBSD: Makefile,v 1.22 2002/01/18 22:27:35 mjl Exp $ VERS= 5.2 DISTNAME= nedit-${VERS}-src @@ -12,7 +12,6 @@ COMMENT= Motif based standard GUI style text editor USE_BUILDLINK_ONLY= YES ALL_TARGET= netbsd -MAKE_ENV+= _MOTIFBASE=${_MOTIFBASE} WRKSRC= ${WRKDIR}/${PKGNAME} diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo index 7baae7f7ac0..79ec7c7ddf8 100644 --- a/editors/nedit/distinfo +++ b/editors/nedit/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/01/17 17:11:49 agc Exp $ +$NetBSD: distinfo,v 1.6 2002/01/18 22:27:35 mjl Exp $ SHA1 (nedit-5.2-src.tar.gz) = 00327cb34f02318eb786d44051478dc367f65563 Size (nedit-5.2-src.tar.gz) = 768534 bytes -SHA1 (patch-aa) = 4edc5c9ffe57763d5c80e19e37d0c570f5d4be99 +SHA1 (patch-aa) = d95ad0eaf120fb7b8e95b71ef5f1520a7dcb7393 SHA1 (patch-ab) = 1d566822879aa6519bea91acb03cdba139edd250 diff --git a/editors/nedit/patches/patch-aa b/editors/nedit/patches/patch-aa index 12c85a04594..5ff58fa1c80 100644 --- a/editors/nedit/patches/patch-aa +++ b/editors/nedit/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.10 2002/01/17 17:11:49 agc Exp $ +$NetBSD: patch-aa,v 1.11 2002/01/18 22:27:35 mjl Exp $ --- makefiles/Makefile.netbsd.orig Sat Aug 18 01:02:55 2001 +++ makefiles/Makefile.netbsd Wed Oct 31 00:18:05 2001 @@ -7,9 +7,9 @@ $NetBSD: patch-aa,v 1.10 2002/01/17 17:11:49 agc Exp $ # -DREPLACE_SCOPE to the CFLAGS. See the README file for more information. # -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -+CFLAGS=-O -I${X11BASE}/include -I${_MOTIFBASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD ++CFLAGS+=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD ARFLAGS=-ur -LIBS= -L/usr/X11R6/lib -lm -lXm -lXpm -lXext -lXt -lSM -lICE -lX11 -+LIBS= ${LDFLAGS} ${MOTIFLIB} -L${_MOTIFBASE}/lib -L${X11BASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 ++LIBS= ${LDFLAGS} ${MOTIFLIB} -lm -lXpm -lXext -lXt -lSM -lICE -lX11 include Makefile.common |