diff options
| -rw-r--r-- | editors/emacs20/Makefile | 27 | ||||
| -rw-r--r-- | editors/emacs20/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs20/patches/patch-af | 13 |
3 files changed, 19 insertions, 25 deletions
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 374453b887d..52af551df17 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/04/11 00:31:43 uebayasi Exp $ +# $NetBSD: Makefile,v 1.2 2003/04/11 04:00:17 uebayasi Exp $ DISTNAME= emacs-20.7 PKGREVISION= 2 @@ -28,7 +28,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes GNU_ARCH.mipsbe= mips -BUILD_DEFS+= USE_INET6 EMACS_USE_POP EMACS_USE_X EMACS_USE_X_TOOLKIT +BUILD_DEFS+= USE_INET6 EMACS_USE_POP .include "../../mk/bsd.prefs.mk" @@ -37,11 +37,21 @@ EMACS_USE_POP?= yes (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES)) CONFIGURE_ARGS+=--with-pop .endif -USE_X11= yes -CONFIGURE_ARGS+=--with-x=yes + +.if defined(EMACS_USE_X) +BUILD_DEFS+= EMACS_USE_X EMACS_USE_X_TOOLKIT +USE_X11= yes +CONFIGURE_ARGS+= --with-x=yes .if defined(EMACS_USE_X_TOOLKIT) -CONFIGURE_ARGS+=--with-x-toolkit=${EMACS_USE_X_TOOLKIT} +CONFIGURE_ARGS+= --with-x-toolkit=${EMACS_USE_X_TOOLKIT} +.if ${EMACS_USE_X_TOOLKIT} == "lucid" || ${EMACS_USE_X_TOOLKIT} == "athena" +.include "../../mk/xaw.buildlink2.mk" +.elif ${EMACS_USE_X_TOOLKIT} == "motif" +.include "../../mk/motif.buildlink2.mk" .endif +.endif +.endif # EMACS_USE_X + .if defined(USE_INET6) && ${USE_INET6} == YES CONFIGURE_ARGS+=--with-ipv6 .else @@ -59,12 +69,5 @@ pre-install: post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs -.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "athena" -.include "../../mk/xaw.buildlink2.mk" -.endif -.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "motif" -.include "../../mk/motif.buildlink2.mk" -.endif - .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo index 8a8f9c19363..935c12185f1 100644 --- a/editors/emacs20/distinfo +++ b/editors/emacs20/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/04/11 00:31:43 uebayasi Exp $ +$NetBSD: distinfo,v 1.2 2003/04/11 04:00:17 uebayasi Exp $ SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452 Size (emacs-20.7.tar.gz) = 15043428 bytes @@ -13,7 +13,7 @@ SHA1 (patch-ab) = eb16c1ab30e8aac6e6877e8c0f9388961b8003b2 SHA1 (patch-ac) = 9586951e581271664b28d5e812ee14105de508cf SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6 SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880 -SHA1 (patch-af) = c35816b47a46d4a3d8381a20e593fa29297e1f4d +SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9 SHA1 (patch-ah) = 2cfb03c57fad97db9eaaf9cda610f5d6c906aa4a SHA1 (patch-ai) = d1e5bb8fe797761f63fad42dbfb48834284f4533 diff --git a/editors/emacs20/patches/patch-af b/editors/emacs20/patches/patch-af index 9efb2bbe21a..5a042bc6772 100644 --- a/editors/emacs20/patches/patch-af +++ b/editors/emacs20/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ +$NetBSD: patch-af,v 1.2 2003/04/11 04:00:18 uebayasi Exp $ ---- src/Makefile.in.orig Thu Jan 16 19:08:48 2003 +--- src/Makefile.in.orig Thu Mar 27 12:43:25 2003 +++ src/Makefile.in @@ -329,7 +329,7 @@ #ifdef USE_X_TOOLKIT @@ -20,15 +20,6 @@ $NetBSD: patch-af,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ #endif #ifndef LIB_GCC -@@ -457,7 +457,7 @@ - #endif /* not ORDINARY_LINK */ - - ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \ -- LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS) -+ LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE - - /* A macro which other sections of Makefile can redefine to munge the - flags before they're passed to LD. This is helpful if you have @@ -804,14 +804,7 @@ #define OBJECTS_MACHINE #endif |