pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/editors/emacs20



Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Nov 11 09:10:41 UTC 2016

Modified Files:
        pkgsrc/editors/emacs20: Makefile

Log Message:
emacs20: retire elaborate logic to match versions of NetBSD below 1.7

older binutils worked fine without this option, and it was a performance
hit, but it's unrealistic to see anyone using such old binutils today.

not matching some operating systems will cause runtime crashes.

forgotten to apply patch in PR pkg/43091: emacs20 doesn't work
(..on linux, which doesn't match the elaborate logic)

bump PKGREVISION as it is only apparent at runtime.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/editors/emacs20/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.53 pkgsrc/editors/emacs20/Makefile:1.54
--- pkgsrc/editors/emacs20/Makefile:1.53        Sat Jul  9 06:38:14 2016
+++ pkgsrc/editors/emacs20/Makefile     Fri Nov 11 09:10:41 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2016/07/09 06:38:14 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2016/11/11 09:10:41 maya Exp $
 
 DISTNAME=      emacs-20.7
 PKGNAME=       ${DISTNAME:S/emacs/emacs20/}
-PKGREVISION=   19
+PKGREVISION=   20
 CATEGORIES=    editors
 MASTER_SITES=  http://ftp.gnu.org/pub/old-gnu/emacs/   \
                ftp://ftp.gnu.org/pub/old-gnu/emacs
@@ -44,19 +44,10 @@ CHECK_WRKREF_SKIP+= bin/emacs-20.7
 
 .include "../../mk/bsd.prefs.mk"
 
-# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1.
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M1.[0-5]*) && \
-     empty(OS_VERSION:M1.6_*) && \
-     empty(OS_VERSION:M1.6) && \
-     empty(OS_VERSION:M1.6.[0-9]*) && \
-     empty(OS_VERSION:M1.6[A-P]*))) || \
-    (${OPSYS} == "DragonFly")
 # If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
 # sections and .data reloc sections, both of which Emacs can't handle
 # properly.  Analyzed by Stephen Ma.
 LDFLAGS+=      -Wl,-z,nocombreloc
-.endif
 
 .if (${OPSYS} == "NetBSD") && \
     !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)



Home | Main Index | Thread Index | Old Index