tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: emacs packages fail
> I've already reported this bug about year ago but it is still not fixed.
> http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=37146
> Result of 'make show-var VARNAME=DEPENDS' should not depend
> on whether emacs is installed or not.
I remind that problem is that 'pkg_info -e [x]emacs' is run in order
to get the emacs version.
How about the attached patch?
Tests are also available.
? emacsen.patch
? emacs/patch-bb
? mule/patches/patch-cj
? mule/patches/patch-co
Index: emacs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/Makefile,v
retrieving revision 1.113
diff -u -r1.113 Makefile
--- emacs/Makefile 2 Jun 2008 21:09:48 -0000 1.113
+++ emacs/Makefile 9 Sep 2008 20:38:02 -0000
@@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.113 2008/06/02 21:09:48 markd Exp $
+.include "../../editors/emacs/Makefile.ver"
+
PKGNAME?= ${DISTNAME}
COMMENT?= GNU editing macros (editor)
-DISTNAME= emacs-22.1
+DISTNAME= emacs-${_EMACS_VERSION}
PKGREVISION= 5
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
Index: emacs/Makefile.ver
===================================================================
RCS file: emacs/Makefile.ver
diff -N emacs/Makefile.ver
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ emacs/Makefile.ver 9 Sep 2008 20:38:02 -0000
@@ -0,0 +1,3 @@
+# $NetBSD$
+
+_EMACS_VERSION= 22.1
Index: emacs20/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs20/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- emacs20/Makefile 13 Jul 2008 17:28:33 -0000 1.35
+++ emacs20/Makefile 9 Sep 2008 20:38:02 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.35 2008/07/13 17:28:33 dholland Exp $
-DISTNAME= emacs-20.7
+.include "../../editors/emacs20/Makefile.ver"
+
+DISTNAME= emacs-${_EMACS_VERSION}
PKGREVISION= 11
CATEGORIES= editors
MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ \
Index: emacs20/Makefile.ver
===================================================================
RCS file: emacs20/Makefile.ver
diff -N emacs20/Makefile.ver
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ emacs20/Makefile.ver 9 Sep 2008 20:38:02 -0000
@@ -0,0 +1,3 @@
+# $NetBSD$
+
+_EMACS_VERSION= 20.7
Index: emacs21/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs21/Makefile.common,v
retrieving revision 1.5
diff -u -r1.5 Makefile.common
--- emacs21/Makefile.common 3 Jun 2008 22:17:00 -0000 1.5
+++ emacs21/Makefile.common 9 Sep 2008 20:38:02 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile.common,v 1.5 2008/06/03 22:17:00 markd Exp $
-DISTNAME= emacs-${EMACSVERSION}a
+.include "../../editors/emacs21/Makefile.ver"
+
+DISTNAME= emacs-${_EMACS_VERSION}a
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -17,15 +19,14 @@
PLIST_SRC= ${.CURDIR}/../../editors/emacs21/PLIST
# needed for 21.4a, can probably go away on next update
-EMACSVERSION= 21.4
-WRKSRC= ${WRKDIR}/emacs-${EMACSVERSION}
-PLIST_SUBST+= EMACSVERSION=${EMACSVERSION:Q}
+WRKSRC= ${WRKDIR}/emacs-${_EMACS_VERSION}
+PLIST_SUBST+= _EMACS_VERSION=${_EMACS_VERSION:Q}
MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp
# build PATH in the dumped emacs is not a problem
CHECK_WRKREF_SKIP+= bin/emacs
-CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION}
+CHECK_WRKREF_SKIP+= bin/emacs-${_EMACS_VERSION}
CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
@@ -54,7 +55,7 @@
PLIST_SUBST+= DOCTAIL=""
.else
PLIST.fns.el= yes
-PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1"
+PLIST_SUBST+= DOCTAIL="-${_EMACS_VERSION}.1"
.endif
# Disable W^X.
Index: emacs21/Makefile.ver
===================================================================
RCS file: emacs21/Makefile.ver
diff -N emacs21/Makefile.ver
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ emacs21/Makefile.ver 9 Sep 2008 20:38:02 -0000
@@ -0,0 +1,3 @@
+# $NetBSD$
+
+_EMACS_VERSION=21.4
Index: emacs21-nox11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs21-nox11/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- emacs21-nox11/Makefile 13 Jul 2008 18:36:22 -0000 1.7
+++ emacs21-nox11/Makefile 9 Sep 2008 20:38:02 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2008/07/13 18:36:22 dholland Exp $
-PKGNAME= emacs-nox11-${EMACSVERSION}a
+PKGNAME= emacs-nox11-${_EMACS_VERSION}a
PKGREVISION= 13
CATEGORIES= editors
COMMENT_EXTRA= : non-X11 version
Index: xemacs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/xemacs/Makefile,v
retrieving revision 1.88
diff -u -r1.88 Makefile
--- xemacs/Makefile 29 Apr 2008 14:07:15 -0000 1.88
+++ xemacs/Makefile 9 Sep 2008 20:38:03 -0000
@@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.88 2008/04/29 14:07:15 tonnerre Exp $
+.include "../../editors/xemacs/Makefile.ver"
+
PKGNAME?= ${DISTNAME}
COMMENT?= XEmacs text editor version 21
-DISTNAME= xemacs-21.4.17
+DISTNAME= xemacs-${_EMACS_VERSION}
PKGREVISION= 5
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
Index: xemacs/Makefile.ver
===================================================================
RCS file: xemacs/Makefile.ver
diff -N xemacs/Makefile.ver
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xemacs/Makefile.ver 9 Sep 2008 20:38:03 -0000
@@ -0,0 +1,3 @@
+# $NetBSD$
+
+_EMACS_VERSION= 21.4.17
Index: xemacs-current/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/xemacs-current/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- xemacs-current/Makefile 4 May 2008 22:27:07 -0000 1.65
+++ xemacs-current/Makefile 9 Sep 2008 20:38:03 -0000
@@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.65 2008/05/04 22:27:07 tonnerre Exp $
+.include "../../editors/xemacs-current/Makefile.ver"
+
PKGNAME?= ${DISTNAME}
COMMENT?= *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
-DISTNAME= xemacs-21.5.27
-EMACSVERSION= 21.5-b27
+DISTNAME= xemacs-${_EMACS_VERSION}
EMACS_DISTNAME= xemacs-${EMACSVERSION}
PKGREVISION= 2
CATEGORIES= editors
Index: xemacs-current/Makefile.ver
===================================================================
RCS file: xemacs-current/Makefile.ver
diff -N xemacs-current/Makefile.ver
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xemacs-current/Makefile.ver 9 Sep 2008 20:38:03 -0000
@@ -0,0 +1,4 @@
+# $NetBSD$
+
+EMACSVERSION= 21.5-b27
+_EMACS_VERSION= ${EMACSVERSION:C/-b/./1}
TEST1:
0 emacs>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
emacs-22.1nb5
22.1
0 emacs>cd ../emacs-nox11
0 emacs-nox11>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
emacs-nox11-22.1nb5
22.1
0 emacs-nox11>cd ../emacs21
0 emacs21>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
emacs-21.4anb13
21.4
0 emacs21>cd ../emacs21-nox11
0 emacs21-nox11>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
emacs-nox11-21.4anb13
21.4
0 emacs21-nox11>cd ../emacs20
0 emacs20>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
emacs-20.7nb11
20.7
0 emacs20>cd ../xemacs
0 xemacs>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
xemacs-21.4.17nb5
21.4.17
0 xemacs>cd ../xemacs-nox11
0 xemacs-nox11>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
xemacs-nox11-21.4.17nb5
21.4.17
0 xemacs-nox11>cd ../xemacs-current
0 xemacs-current>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
xemacs-21.5.27nb2
21.5.27
0 xemacs-current>cd ../xemacs-current-nox11
0 xemacs-current-nox11>make show-vars VARNAMES='PKGNAME _EMACS_VERSION'
xemacs-nox11-21.5.27nb2
21.5.27
TEST2:
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=emacs22
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m emacs>=22:../../editors/emacs
emacs>=22:../../editors/emacs semi>=1.14:../../devel/semi
apel>=10:../../devel/apel
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=emacs22nox
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m emacs-nox11>=22:../../editors/emacs-nox11
emacs-nox11>=22:../../editors/emacs-nox11 semi>=1.14:../../devel/semi
apel>=10:../../devel/apel
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=emacs21
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m emacs>=21.2<22:../../editors/emacs21
emacs>=21.2<22:../../editors/emacs21 semi>=1.14:../../devel/semi
apel>=10:../../devel/apel Mule-UCS>=0.84:../../editors/mule-ucs
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=emacs21nox
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m emacs-nox11>=21.2<22:../../editors/emacs21-nox11
emacs-nox11>=21.2<22:../../editors/emacs21-nox11 semi>=1.14:../../devel/semi
apel>=10:../../devel/apel Mule-UCS>=0.84:../../editors/mule-ucs
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=emacs20
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m emacs>=20.7<21:../../editors/emacs20
emacs>=20.7<21:../../editors/emacs20 semi>=1.14:../../devel/semi
Mule-UCS>=0.84:../../editors/mule-ucs
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=xemacs214
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m xemacs>=21.4<21.5:../../editors/xemacs
xemacs>=21.4<21.5:../../editors/xemacs xemacs-semi>=1.14:../../devel/semi
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=xemacs214nox
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m xemacs-nox11>=21.4<21.5:../../editors/xemacs-nox11
xemacs-nox11>=21.4<21.5:../../editors/xemacs-nox11
xemacs-semi>=1.14:../../devel/semi
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=xemacs215
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m xemacs>=21.5<21.6:../../editors/xemacs-current
xemacs>=21.5<21.6:../../editors/xemacs-current
xemacs-semi>=1.14:../../devel/semi
0 emacs-w3m>make show-vars VARNAMES='PKGNAME DEPENDS' EMACS_TYPE=xemacs215nox
emacs-w3m-1.4.4nb1
w3m>=0.5.1nb2:../../www/w3m
xemacs-nox11>=21.5<21.6:../../editors/xemacs-current-nox11
xemacs-nox11>=21.5<21.6:../../editors/xemacs-current-nox11
xemacs-semi>=1.14:../../devel/semi
--
Best regards, Aleksey Cheusov.
Home |
Main Index |
Thread Index |
Old Index