diff options
| author | sbd <sbd> | 2012-03-10 08:20:13 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-03-10 08:20:13 +0000 |
| commit | d976c86afc6166c1e38f5e605b09cd74c97516d6 (patch) | |
| tree | 6d4086c4d0f3031a45c9a0e310024f7d145c68d7 /editors/ng/patches | |
| parent | cab2c4bd88df5cdfb4259d9e169b8f1be95e5207 (diff) | |
| download | pkgsrc-d976c86afc6166c1e38f5e605b09cd74c97516d6.tar.gz | |
1) Add missing mk/termcap buildlink3.
2) Always respect CPPFLAGS/LDFLAGS.
3) Enable "USE_CANNA" on Linux and SunOS.
Bump PKGREVISION.
Diffstat (limited to 'editors/ng/patches')
| -rw-r--r-- | editors/ng/patches/patch-aa | 12 | ||||
| -rw-r--r-- | editors/ng/patches/patch-sys_sysv_Makefile | 25 |
2 files changed, 32 insertions, 5 deletions
diff --git a/editors/ng/patches/patch-aa b/editors/ng/patches/patch-aa index 03a426b54ac..e56aa6aa5a7 100644 --- a/editors/ng/patches/patch-aa +++ b/editors/ng/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2002/06/10 12:37:43 sakamoto Exp $ +$NetBSD: patch-aa,v 1.6 2012/03/10 08:20:13 sbd Exp $ ---- sys/bsd/Makefile.orig Sun Oct 1 00:59:42 2000 -+++ sys/bsd/Makefile Thu Feb 15 18:28:30 2001 +--- sys/bsd/Makefile.orig 2000-09-30 15:59:42.000000000 +0000 ++++ sys/bsd/Makefile @@ -13,12 +13,15 @@ SYS = bsd @@ -15,8 +15,10 @@ $NetBSD: patch-aa,v 1.5 2002/06/10 12:37:43 sakamoto Exp $ +CANNAINC = ${CPPFLAGS} +.else CANNADEF = - CANNALIB = - CANNAINC = +-CANNALIB = +-CANNAINC = ++CANNALIB = ${LDFLAGS} ++CANNAINC = ${CPPFLAGS} +.endif # CDEFS gets defines, and gets passed to lint. CFLAGS gets flags, and doesn't diff --git a/editors/ng/patches/patch-sys_sysv_Makefile b/editors/ng/patches/patch-sys_sysv_Makefile new file mode 100644 index 00000000000..8859c06cf5a --- /dev/null +++ b/editors/ng/patches/patch-sys_sysv_Makefile @@ -0,0 +1,25 @@ +$NetBSD: patch-sys_sysv_Makefile,v 1.1 2012/03/10 08:20:13 sbd Exp $ + +--- sys/sysv/Makefile.orig 2012-03-10 08:14:15.662278295 +0000 ++++ sys/sysv/Makefile +@@ -15,12 +15,15 @@ + SYS = sysv + + # Canna configurations +-#CANNADEF = -DCANNA +-#CANNALIB = -L/usr/share/lib -lcanna +-#CANNAINC = -I/usr/share/include ++.if ${USE_CANNA} == "YES" ++CANNADEF = -DCANNA ++CANNALIB = ${LDFLAGS} -lcanna ++CANNAINC = ${CPPFLAGS} ++.else + CANNADEF = +-CANNALIB = +-CANNAINC = ++CANNALIB = ${LDFLAGS} ++CANNAINC = ${CPPFLAGS} ++.endif + + # CDEFS gets defines, and gets passed to lint. CFLAGS gets flags, and doesn't + # get passed to lint. |