Sun Feb 17 06:07:25 2013 UTC ()
Change PKGNAME from emacs-24.2 to emacs24-24.2.


(dholland)
diff -r1.12 -r1.13 pkgsrc/editors/emacs24/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/emacs24/Makefile.common
diff -r1.2 -r1.3 pkgsrc/editors/emacs24/version.mk
cvs diff -r1.12 -r1.13 pkgsrc/editors/emacs24/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/Makefile 2013/02/16 11:20:54 1.12
+++ pkgsrc/editors/emacs24/Attic/Makefile 2013/02/17 06:07:25 1.13
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.12 2013/02/16 11:20:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2013/02/17 06:07:25 dholland Exp $
2 2
3PKGREVISION= 6 3PKGREVISION= 6
4 4
5CONFLICTS+= emacs-nox11-[0-9]* 5CONFLICTS+= emacs24-nox11-[0-9]*
6 6
7.include "../../editors/emacs24/Makefile.common" 7.include "../../editors/emacs24/Makefile.common"
8 8
9.include "options.mk" 9.include "options.mk"
10 10
11SUBST_CLASSES+= prefix 11SUBST_CLASSES+= prefix
12SUBST_STAGE.prefix= pre-configure 12SUBST_STAGE.prefix= pre-configure
13SUBST_VARS.prefix= PREFIX 13SUBST_VARS.prefix= PREFIX
14SUBST_FILES.prefix= src/s/netbsd.h 14SUBST_FILES.prefix= src/s/netbsd.h
15 15
16.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 16.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
17.include "../../sysutils/desktop-file-utils/desktopdb.mk" 17.include "../../sysutils/desktop-file-utils/desktopdb.mk"
18.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs24/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/Makefile.common 2012/10/03 11:43:33 1.2
+++ pkgsrc/editors/emacs24/Attic/Makefile.common 2013/02/17 06:07:25 1.3
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile.common,v 1.2 2012/10/03 11:43:33 asau Exp $ 1# $NetBSD: Makefile.common,v 1.3 2013/02/17 06:07:25 dholland Exp $
2# 2#
3# used by editors/emacs24/Makefile 3# used by editors/emacs24/Makefile
4# used by editors/emacs24-nox11/Makefile 4# used by editors/emacs24-nox11/Makefile
5 5
6DISTNAME= emacs-${EMACS_VERSION} 6DISTNAME= emacs-${EMACS_VERSION}
 7PKGNAME?= ${DISTNAME:S/emacs/emacs24/}
7CATEGORIES= editors 8CATEGORIES= editors
8MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
12COMMENT= GNU editing macros (editor) 13COMMENT= GNU editing macros (editor)
13LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
14 15
15WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} 16WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}
16MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
17 18
18CONFLICTS+= emacs-nox11-[0-9]* 19CONFLICTS+= emacs-nox11-[0-9]*
19 20
@@ -62,17 +63,17 @@ CFLAGS+= -fno-pie @@ -62,17 +63,17 @@ CFLAGS+= -fno-pie
62.endif 63.endif
63 64
64.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h) 65.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
65CPPFLAGS+= -DTERMINFO 66CPPFLAGS+= -DTERMINFO
66.elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD" 67.elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"
67.include "../../mk/curses.buildlink3.mk" 68.include "../../mk/curses.buildlink3.mk"
68.else 69.else
69.include "../../mk/termcap.buildlink3.mk" 70.include "../../mk/termcap.buildlink3.mk"
70.endif 71.endif
71 72
72.include "../../mk/oss.buildlink3.mk" 73.include "../../mk/oss.buildlink3.mk"
73 74
74post-extract: 75post-extract:
75 cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp 76 cp ${.CURDIR}/../../editors/emacs23/files/site-init.el ${WRKSRC}/lisp
76 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s 77 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
77 ${CHMOD} -R go-w ${WRKSRC} 78 ${CHMOD} -R go-w ${WRKSRC}
78 ${CHMOD} ugo+rx ${WRKSRC}/leim/ja-dic ${WRKSRC}/leim/quail 79 ${CHMOD} ugo+rx ${WRKSRC}/leim/ja-dic ${WRKSRC}/leim/quail
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs24/Attic/version.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/version.mk 2012/08/28 00:55:52 1.2
+++ pkgsrc/editors/emacs24/Attic/version.mk 2013/02/17 06:07:25 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1# $NetBSD: version.mk,v 1.2 2012/08/28 00:55:52 mef Exp $ 1# $NetBSD: version.mk,v 1.3 2013/02/17 06:07:25 dholland Exp $
2 2
3_EMACS_FLAVOR= emacs 3_EMACS_FLAVOR= emacs
4_EMACS_REQD= emacs>=24.1<25 4_EMACS_REQD= emacs24>=24.1<25
5 5
6_EMACS_VERSION_MAJOR= 24 6_EMACS_VERSION_MAJOR= 24
7_EMACS_VERSION_MINOR= 2 7_EMACS_VERSION_MINOR= 2