View | Details | Raw Unified | Return to bug 108464
Collapse All | Expand All

(-)Mk/bsd.emacs.mk (-1 / +1 lines)
Lines 115-121 Link Here
115
# Emacs-22.x
115
# Emacs-22.x
116
.elif (${EMACS_PORT_NAME} == "emacs22")
116
.elif (${EMACS_PORT_NAME} == "emacs22")
117
EMACS_NAME=		emacs
117
EMACS_NAME=		emacs
118
EMACS_VER=		22.0.50
118
EMACS_VER=		22.0.93
119
EMACS_MAJOR_VER=	22
119
EMACS_MAJOR_VER=	22
120
EMACS_LIBDIR?=		share/${EMACS_NAME}
120
EMACS_LIBDIR?=		share/${EMACS_NAME}
121
EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
121
EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
(-)editors/emacs-devel/Makefile (-15 / +10 lines)
Lines 6-16 Link Here
6
#
6
#
7
7
8
PORTNAME=	emacs
8
PORTNAME=	emacs
9
PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
9
PORTVERSION=	${EMACS_VER}
10
CATEGORIES=	editors ipv6
10
CATEGORIES=	editors ipv6
11
MASTER_SITES=	${MASTER_SITE_LOCAL}
11
MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
12
MASTER_SITE_SUBDIR=	keramida
12
MASTER_SITE_SUBDIR=	emacs/pretest
13
DISTNAME=	${PORTNAME}-cvs-snapshot-2006.09.01.17.52.26
14
13
15
MAINTAINER=	keramida@ceid.upatras.gr
14
MAINTAINER=	keramida@ceid.upatras.gr
16
COMMENT=	GNU editing macros
15
COMMENT=	GNU editing macros
Lines 29-38 Link Here
29
		xemacs-[0-9]* xemacs-devel-[0-9]* \
28
		xemacs-[0-9]* xemacs-devel-[0-9]* \
30
		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
29
		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
31
30
32
EMACS_VER=	22.0.50
31
EMACS_VER=	22.0.93
33
SNAPSHOT=	20060901
32
GNU_CONFIGURE=	yes
34
USE_BZIP2=	yes
33
USE_GMAKE=	yes
35
USE_AUTOTOOLS=	autoconf:259
36
.if !defined(WITHOUT_X11)
34
.if !defined(WITHOUT_X11)
37
.if !defined(WITHOUT_GTK)
35
.if !defined(WITHOUT_GTK)
38
USE_GNOME=	gtk20
36
USE_GNOME=	gtk20
Lines 42-49 Link Here
42
USE_XPM=	yes
40
USE_XPM=	yes
43
.endif
41
.endif
44
42
45
WRKSRC=		${WRKDIR}/${PORTNAME}
46
47
CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
43
CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
48
.if defined(WITHOUT_X11)
44
.if defined(WITHOUT_X11)
49
CONFIGURE_ARGS=		--with-x=no
45
CONFIGURE_ARGS=		--with-x=no
Lines 57-62 Link Here
57
CONFIGURE_ARGS+=	--without-xim
53
CONFIGURE_ARGS+=	--without-xim
58
.endif
54
.endif
59
55
56
CONFIGURE_ARGS+=	--infodir='$${prefix}/info' --mandir='$${prefix}/man'
57
60
MAN1=		ctags.1 emacs.1 emacsclient.1 etags.1
58
MAN1=		ctags.1 emacs.1 emacsclient.1 etags.1
61
PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
59
PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
62
.if defined(WITHOUT_GTK)
60
.if defined(WITHOUT_GTK)
Lines 87-100 Link Here
87
	@${ECHO_MSG} "====>"
85
	@${ECHO_MSG} "====>"
88
.endif
86
.endif
89
87
90
pre-build:
91
	(cd ${WRKSRC} ; ${MAKE} bootstrap)
92
93
pre-install:
88
pre-install:
94
	(cd ${WRKSRC}/lisp ; \
89
	(cd ${WRKSRC}/lisp ; \
95
	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \
90
	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \
96
	 ${RM} ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.[0-9]* ; \
91
	 ${RM} ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.[0-9]* ; \
97
	 cd ${WRKSRC}/src ; \
92
	 cd ${WRKSRC}/src ; \
98
	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
93
	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
99
94
100
.include <bsd.port.post.mk>
95
.include <bsd.port.post.mk>
(-)editors/emacs-devel/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (emacs-cvs-snapshot-2006.09.01.17.52.26.tar.bz2) = cd31836242596e245eeb0209578ba063
1
MD5 (emacs-22.0.93.tar.gz) = 4e768a1489e514fbb78d1a5f9c512846
2
SHA256 (emacs-cvs-snapshot-2006.09.01.17.52.26.tar.bz2) = 97289c41e60ce38265700509fb78e75f14e40624eb726dd34c76039c60364b10
2
SHA256 (emacs-22.0.93.tar.gz) = 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e
3
SIZE (emacs-cvs-snapshot-2006.09.01.17.52.26.tar.bz2) = 20050570
3
SIZE (emacs-22.0.93.tar.gz) = 37118034
(-)editors/emacs-devel/pkg-plist (-7 / +7 lines)
Lines 22-27 Link Here
22
%%DATADIR%%/%%EMACS_VER%%/etc/COOKIES
22
%%DATADIR%%/%%EMACS_VER%%/etc/COOKIES
23
%%DATADIR%%/%%EMACS_VER%%/etc/COPYING
23
%%DATADIR%%/%%EMACS_VER%%/etc/COPYING
24
%%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
24
%%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
25
%%DATADIR%%/%%EMACS_VER%%/etc/DEVEL.HUMOR
25
%%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
26
%%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
26
%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
27
%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
27
%%DOC2%%%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2
28
%%DOC2%%%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2
Lines 113-126 Link Here
113
%%DATADIR%%/%%EMACS_VER%%/etc/fr-refcard.tex
114
%%DATADIR%%/%%EMACS_VER%%/etc/fr-refcard.tex
114
%%DATADIR%%/%%EMACS_VER%%/etc/fr-survival.tex
115
%%DATADIR%%/%%EMACS_VER%%/etc/fr-survival.tex
115
%%DATADIR%%/%%EMACS_VER%%/etc/future-bug
116
%%DATADIR%%/%%EMACS_VER%%/etc/future-bug
116
%%DATADIR%%/%%EMACS_VER%%/etc/gfdl.1
117
%%DATADIR%%/%%EMACS_VER%%/etc/gnu.xpm
117
%%DATADIR%%/%%EMACS_VER%%/etc/gnu.xpm
118
%%DATADIR%%/%%EMACS_VER%%/etc/gnus-logo.eps
118
%%DATADIR%%/%%EMACS_VER%%/etc/gnus-logo.eps
119
%%DATADIR%%/%%EMACS_VER%%/etc/gnus-refcard.tex
119
%%DATADIR%%/%%EMACS_VER%%/etc/gnus-refcard.tex
120
%%DATADIR%%/%%EMACS_VER%%/etc/gnus-tut.txt
120
%%DATADIR%%/%%EMACS_VER%%/etc/gnus-tut.txt
121
%%DATADIR%%/%%EMACS_VER%%/etc/gnus.pbm
121
%%DATADIR%%/%%EMACS_VER%%/etc/gnus.pbm
122
%%DATADIR%%/%%EMACS_VER%%/etc/grep.txt
122
%%DATADIR%%/%%EMACS_VER%%/etc/grep.txt
123
%%DATADIR%%/%%EMACS_VER%%/etc/images/README
124
%%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm
123
%%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm
125
%%DATADIR%%/%%EMACS_VER%%/etc/images/attach.xpm
124
%%DATADIR%%/%%EMACS_VER%%/etc/images/attach.xpm
126
%%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.pbm
125
%%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.pbm
Lines 633-639 Link Here
633
%%DATADIR%%/%%EMACS_VER%%/lisp/button.el.gz
632
%%DATADIR%%/%%EMACS_VER%%/lisp/button.el.gz
634
%%DATADIR%%/%%EMACS_VER%%/lisp/button.elc
633
%%DATADIR%%/%%EMACS_VER%%/lisp/button.elc
635
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/README
634
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/README
636
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/README.prev
637
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.el.gz
635
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.el.gz
638
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.elc
636
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.elc
639
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-alg.el.gz
637
%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-alg.el.gz
Lines 732-737 Link Here
732
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-french.elc
730
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-french.elc
733
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-hebrew.el.gz
731
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-hebrew.el.gz
734
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-hebrew.elc
732
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-hebrew.elc
733
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-html.el.gz
734
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-html.elc
735
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-islam.el.gz
735
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-islam.el.gz
736
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-islam.elc
736
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-islam.elc
737
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-iso.el.gz
737
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-iso.el.gz
Lines 1062-1067 Link Here
1062
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-backend.elc
1062
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-backend.elc
1063
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-button.el.gz
1063
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-button.el.gz
1064
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-button.elc
1064
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-button.elc
1065
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-capab.el.gz
1066
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-capab.elc
1065
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-compat.el.gz
1067
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-compat.el.gz
1066
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-compat.elc
1068
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-compat.elc
1067
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-dcc.el.gz
1069
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-dcc.el.gz
Lines 1084-1091 Link Here
1084
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-join.elc
1086
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-join.elc
1085
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.el.gz
1087
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.el.gz
1086
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.elc
1088
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.elc
1087
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.el.gz
1088
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.elc
1089
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.el.gz
1089
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.el.gz
1090
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.elc
1090
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.elc
1091
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-match.el.gz
1091
%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-match.el.gz
Lines 2469-2474 Link Here
2469
%%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.elc
2469
%%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.elc
2470
%%DATADIR%%/%%EMACS_VER%%/lisp/tumme.el.gz
2470
%%DATADIR%%/%%EMACS_VER%%/lisp/tumme.el.gz
2471
%%DATADIR%%/%%EMACS_VER%%/lisp/tumme.elc
2471
%%DATADIR%%/%%EMACS_VER%%/lisp/tumme.elc
2472
%%DATADIR%%/%%EMACS_VER%%/lisp/tutorial.el.gz
2473
%%DATADIR%%/%%EMACS_VER%%/lisp/tutorial.elc
2472
%%DATADIR%%/%%EMACS_VER%%/lisp/type-break.el.gz
2474
%%DATADIR%%/%%EMACS_VER%%/lisp/type-break.el.gz
2473
%%DATADIR%%/%%EMACS_VER%%/lisp/type-break.elc
2475
%%DATADIR%%/%%EMACS_VER%%/lisp/type-break.elc
2474
%%DATADIR%%/%%EMACS_VER%%/lisp/uniquify.el.gz
2476
%%DATADIR%%/%%EMACS_VER%%/lisp/uniquify.el.gz
Lines 2501-2508 Link Here
2501
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-history.elc
2503
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-history.elc
2502
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-http.el.gz
2504
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-http.el.gz
2503
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-http.elc
2505
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-http.elc
2504
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-https.el.gz
2505
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-https.elc
2506
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-imap.el.gz
2506
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-imap.el.gz
2507
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-imap.elc
2507
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-imap.elc
2508
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-irc.el.gz
2508
%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-irc.el.gz
(-)editors/emacs-devel/files/patch-configure.in (-12 lines)
Removed Link Here
1
--- ./configure.in.orig	Sun Aug 27 04:16:25 2006
2
+++ ./configure.in	Fri Sep  1 21:10:08 2006
3
@@ -237,6 +237,9 @@
4
     opsys=freebsd
5
     case "${canonical}" in
6
       alpha*-*-freebsd*)	machine=alpha ;;
7
+      ia64-*-freebsd*)		machine=ia64 ;;
8
+      sparc64-*-freebsd*)	machine=sparc ;;
9
+      powerpc-*-freebsd*)	machine=macppc ;;
10
       i[3456]86-*-freebsd*)	machine=intel386 ;;
11
       amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
12
     esac
(-)editors/emacs-devel/files/patch-lib-src-Makefile.in (-28 lines)
Removed Link Here
1
--- ./lib-src/Makefile.in.orig	Fri Jun  9 20:53:58 2006
2
+++ ./lib-src/Makefile.in	Fri Sep  1 21:10:08 2006
3
@@ -94,6 +94,7 @@
4
 INSTALL = @INSTALL@
5
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
6
 INSTALL_DATA = @INSTALL_DATA@
7
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
8
 # By default, we uphold the dignity of our programs.
9
 INSTALL_STRIP =
10
 
11
@@ -319,7 +320,7 @@
12
         if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
13
              != `(cd ${srcdir} && /bin/pwd)` ]; then \
14
 	  for file in ${SCRIPTS}; do \
15
-	    $(INSTALL_PROGRAM) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
16
+	    $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
17
 	  done ; \
18
 	fi
19
 
20
@@ -331,7 +332,7 @@
21
 	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
22
 	done
23
 	for file in ${INSTALLABLE_SCRIPTS} ; do \
24
-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
25
+	  $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
26
 	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
27
 	done
28
 
(-)editors/emacs-devel/files/patch-src__xmenu.c (-15 lines)
Removed Link Here
1
--- src/xmenu.c.orig	Sun Sep  3 01:35:27 2006
2
+++ src/xmenu.c	Sun Sep  3 01:37:02 2006
3
@@ -1391,9 +1391,10 @@
4
      Lisp_Object frame;
5
 {
6
   GtkWidget *menubar;
7
-  BLOCK_INPUT;
8
-  FRAME_PTR f = check_x_frame (frame);
9
+  FRAME_PTR f;
10
 
11
+  BLOCK_INPUT;
12
+  f = check_x_frame (frame);
13
   if (FRAME_EXTERNAL_MENU_BAR (f))
14
     set_frame_menubar (f, 0, 1);
15
 

Return to bug 108464