pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/30462: emacs-nox11 does not build under darwin (patch)

The following reply was made to PR pkg/30462; it has been noted by GNATS.

From: Antoine Reilles <Antoine.Reilles%loria.fr@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/30462: emacs-nox11 does not build under darwin (patch)
Date: Wed, 8 Jun 2005 10:42:36 +0200

 --Apple-Mail-2-326519155
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
        charset=UTF-8;
        delsp=yes;
        format=flowed
 
 Forgot the simple patch, here it is, to apply with patch -p0 in =20
 editors/emacs-nox11/
 
 =EF=BF=BC=
 
 --Apple-Mail-2-326519155
 Content-Type: multipart/mixed;
        boundary=Apple-Mail-3-326519156
 
 
 --Apple-Mail-3-326519156
 Content-Transfer-Encoding: 7bit
 Content-Type: text/html;
        charset=US-ASCII
 
 <HTML><BODY style="word-wrap: break-word; -khtml-nbsp-mode: space; 
-khtml-line-break: after-white-space; "><DIV></DIV>Forgot the simple patch, 
here it is<FONT class="Apple-style-span" color="#0000DD"></FONT>, to apply with 
patch -p0 in editors/emacs-nox11/<DIV><BR 
class="khtml-block-placeholder"></DIV><DIV><SPAN></SPAN></DIV></BODY></HTML>
 --Apple-Mail-3-326519156
 Content-Transfer-Encoding: 7bit
 Content-Type: application/octet-stream;
        x-unix-mode=0644;
        name="emacs-nox11.diff"
 Content-Disposition: attachment;
        filename=emacs-nox11.diff
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/editors/emacs-nox11/Makefile,v
 retrieving revision 1.18
 diff -u -r1.18 Makefile
 --- Makefile   22 May 2005 20:07:56 -0000      1.18
 +++ Makefile   8 Jun 2005 08:14:13 -0000
 @@ -26,6 +26,28 @@
  
  CONFIGURE_ARGS+=--without-x
  
 +.include "../../mk/bsd.prefs.mk"
 +
 +.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]*))
 +# 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} == "Darwin"
 +PLIST_SUBST+= FNS_EL="@comment "
 +PLIST_SUBST+= DOCTAIL=""
 +.else
 +PLIST_SUBST+= FNS_EL=""
 +PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1"
 +.endif
 +
  INFO_FILES=   ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs
  INFO_FILES+=  emacs-mime eshell eudc forms gnus idlwave message mh-e pcl-cvs
  INFO_FILES+=  reftex sc speedbar vip viper widget woman
 @@ -33,6 +55,9 @@
  post-extract:
        ${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
        ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
 +      ${CP} ${FILESDIR}/powermac.h ${WRKSRC}/src/m
 +      ${CP} ${FILESDIR}/darwin.h ${WRKSRC}/src/s
 +      ${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src
  
  pre-install:
        @${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/editors/emacs-nox11/PLIST,v
 retrieving revision 1.6
 diff -u -r1.6 PLIST
 --- PLIST      22 Mar 2005 15:39:55 -0000      1.6
 +++ PLIST      8 Jun 2005 08:14:13 -0000
 @@ -12,7 +12,7 @@
  libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
  libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver
  libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fakemail
 -libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el
 
+${FNS_EL}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el
  libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/hexl
  libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/movemail
  libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/profile
 @@ -30,7 +30,7 @@
  share/emacs/${EMACSVERSION}/etc/COPYING
  share/emacs/${EMACSVERSION}/etc/DEBUG
  share/emacs/${EMACSVERSION}/etc/DISTRIB
 -share/emacs/${EMACSVERSION}/etc/DOC-${EMACSVERSION}.1
 +share/emacs/${EMACSVERSION}/etc/DOC${DOCTAIL}
  share/emacs/${EMACSVERSION}/etc/FTP
  share/emacs/${EMACSVERSION}/etc/GNU
  share/emacs/${EMACSVERSION}/etc/HELLO
 
 --Apple-Mail-3-326519156
 Content-Transfer-Encoding: 7bit
 Content-Type: text/html;
        charset=US-ASCII
 
 <HTML><BODY style="word-wrap: break-word; -khtml-nbsp-mode: space; 
-khtml-line-break: after-white-space; "><DIV><SPAN></SPAN></DIV></BODY></HTML>
 --Apple-Mail-3-326519156--
 
 --Apple-Mail-2-326519155--
Home | Main Index | Thread Index | Old Index