CVS commit: pkgsrc/editors/xemacs-current

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Nov 16 15:07:05 UTC 2017

Modified Files:
        pkgsrc/editors/xemacs-current: Makefile.common distinfo
        pkgsrc/editors/xemacs-current/patches: patch-src_Makefile.in.in
Added Files:
        pkgsrc/editors/xemacs-current/patches: patch-lwlib_Makefile.in.in

Log Message:
Unbreak SunOS builds (here: OmniOS).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/xemacs-current/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/editors/xemacs-current/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/xemacs-current/patches/patch-lwlib_Makefile.in.in
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/editors/xemacs-current/patches/patch-src_Makefile.in.in

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

Modified files:

Index: pkgsrc/editors/xemacs-current/Makefile.common
diff -u pkgsrc/editors/xemacs-current/Makefile.common:1.5 pkgsrc/editors/xemacs-current/Makefile.common:1.6
--- pkgsrc/editors/xemacs-current/Makefile.common:1.5   Wed Nov 15 14:46:31 2017
+++ pkgsrc/editors/xemacs-current/Makefile.common       Thu Nov 16 15:07:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2017/11/15 14:46:31 hauke Exp $
+# $NetBSD: Makefile.common,v 1.6 2017/11/16 15:07:04 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -6,7 +6,7 @@
 DISTNAME=      xemacs-21.5.34
 EMACSVERSION=  21.5-b34
 EMACS_DISTNAME=        xemacs-${EMACSVERSION}
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 

Index: pkgsrc/editors/xemacs-current/distinfo
diff -u pkgsrc/editors/xemacs-current/distinfo:1.29 pkgsrc/editors/xemacs-current/distinfo:1.30
--- pkgsrc/editors/xemacs-current/distinfo:1.29 Wed Nov 15 14:46:31 2017
+++ pkgsrc/editors/xemacs-current/distinfo      Thu Nov 16 15:07:04 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2017/11/15 14:46:31 hauke Exp $
+$NetBSD: distinfo,v 1.30 2017/11/16 15:07:04 hauke Exp $
 
 SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
 RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
@@ -8,8 +8,9 @@ SHA1 (patch-Makefile.in.in) = 113ba38717
 SHA1 (patch-configure) = 0f576275a42b883f4502fbe5156aa2d84f17f6a8
 SHA1 (patch-lib-src_Makefile.in.in) = 6e9c2b9e4cd9e63fbdc88ff4792e74a57ed925ae
 SHA1 (patch-lib-src_fakemail.c) = e62f75055b80f207696cfd77cd7b55fd46e8249b
+SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0
 SHA1 (patch-modules_common_Makefile.common) = d62a23a05e72cc196557e2f7fbbccea791ee0101
-SHA1 (patch-src_Makefile.in.in) = fdc21712f28a332fda4bd11ea45002eca957cc83
+SHA1 (patch-src_Makefile.in.in) = 7a7ea5fe03b11e8690f44f4dbef17e793fbf50f2
 SHA1 (patch-src_dired.c) = d850495e567224dc7a43e1db74f4e305a906f177
 SHA1 (patch-src_lisp.h) = c5f3b5f920ec6d451a5d5c5d1e414d6ae3d6660f
 SHA1 (patch-src_unexelf.c) = 96b2cf1d2512ad23fca98db9b48c34533bba8b66

Index: pkgsrc/editors/xemacs-current/patches/patch-src_Makefile.in.in
diff -u pkgsrc/editors/xemacs-current/patches/patch-src_Makefile.in.in:1.1 pkgsrc/editors/xemacs-current/patches/patch-src_Makefile.in.in:1.2
--- pkgsrc/editors/xemacs-current/patches/patch-src_Makefile.in.in:1.1  Wed Nov 15 15:01:36 2017
+++ pkgsrc/editors/xemacs-current/patches/patch-src_Makefile.in.in      Thu Nov 16 15:07:05 2017
@@ -1,11 +1,25 @@
-$NetBSD: patch-src_Makefile.in.in,v 1.1 2017/11/15 15:01:36 hauke Exp $
+$NetBSD: patch-src_Makefile.in.in,v 1.2 2017/11/16 15:07:05 hauke Exp $
 
 Deal with bulk build namespace intrusion.
 
+SunOS 5 bmake / gmake fixes
+
 Was patch-an
 
 --- src/Makefile.in.in.orig    2013-08-21 17:43:45.000000000 +0000
 +++ src/Makefile.in.in
+@@ -392,9 +392,9 @@ ldflags  = $(LDFLAGS) $(ld_switch_all) $
+ 
+ #ifdef SOLARIS2
+ %.o : %.c
+-#else
+-.c.o:
++      $(CC) -c $(cflags) $<
+ #endif
++.c.o:
+       $(CC) -c $(cflags) $<
+ 
+ ## Create preprocessor output (debugging purposes only)
 @@ -437,10 +437,10 @@ RAW_EXE  = temacs
  DO_TEMACS = $(DUMPENV) ./$(RAW_EXE)
  DO_XEMACS = ./$(PROGNAME)

Added files:

Index: pkgsrc/editors/xemacs-current/patches/patch-lwlib_Makefile.in.in
diff -u /dev/null pkgsrc/editors/xemacs-current/patches/patch-lwlib_Makefile.in.in:1.1
--- /dev/null   Thu Nov 16 15:07:05 2017
+++ pkgsrc/editors/xemacs-current/patches/patch-lwlib_Makefile.in.in    Thu Nov 16 15:07:05 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-lwlib_Makefile.in.in,v 1.1 2017/11/16 15:07:05 hauke Exp $
+
+SunOS 5 bmake / gmake fixes
+
+--- lwlib/Makefile.in.in.orig  2013-08-21 17:43:43.000000000 +0000
++++ lwlib/Makefile.in.in
+@@ -61,9 +61,9 @@ cflags = $(CFLAGS) $(cppflags)
+ 
+ #ifdef SOLARIS2
+ %.o : %.c
+-#else
+-.c.o:
++      $(CC) -c $(cflags) $<
+ #endif
++.c.o:
+       $(CC) -c $(cflags) $<
+ 
+ ## Create preprocessor output (debugging purposes only)