Re: emacs22

2007-07-26 Thread Yoichi NAKAYAMA
Hi,

At Wed, 25 Jul 2007 01:56:01 +0900,
Hajimu UMEMOTO wrote:
 Perhaps, the following patch fixes your problem.  This patch changes
 to obey default EMACS_PORT_NAME defined in bsd.emacs.mk, as well.
 
 Index: databases/lsdb/Makefile
 diff -u databases/lsdb/Makefile.orig databases/lsdb/Makefile
 --- databases/lsdb/Makefile.orig  Mon May 21 05:03:59 2007
 +++ databases/lsdb/Makefile   Wed Jul 25 01:48:39 2007
 @@ -18,11 +18,13 @@
  BUILD_DEPENDS=   
 ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
  
  USE_EMACS=   yes
 -EMACS_PORT_NAME?=emacs21
 -.if (${EMACS_PORT_NAME} == emacs21)
 -DEPPORT_SUFFIX=
 -.else
 +
 +.include bsd.port.pre.mk
 +
 +.if ${EMACS_PORT_NAME} == emacs20
  DEPPORT_SUFFIX=  -${EMACS_PORT_NAME}
 +.else
 +DEPPORT_SUFFIX=
  .endif
  
  SFJP_RELEASE_ID= 1494
 @@ -40,4 +42,4 @@
   ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
  .endif
  
 -.include bsd.port.mk
 +.include bsd.port.post.mk

Seems fine. I've installed it into ports tree.
Best regards,
-- 
Yoichi NAKAYAMA
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: emacs22

2007-07-24 Thread Hajimu UMEMOTO
Hi,

 On Tue, 24 Jul 2007 10:43:33 -0400
 Duane Winner [EMAIL PROTECTED] said:

dwinner Please confirm that I'm doing the right thing:

dwinner I followed /usr/ports/UPDATING to upgrade emacs21 to emacs 22 by 
adding 
dwinner EMACS_PORT_NAME=emacs22 to make.conf

dwinner After that, any time I do a portsdb -Uu to follow-up on my cvsup, I 
dwinner would get a dependency list incomplete error (lsdb-emacs22-0.10_1: 
dwinner /usr/ports/editors/flim-emacs22 non-existent).

dwinner Even though /usr/ports/UPDATING doesn't say anything about removing 
dwinner EMACS_PORT_NAME=emacs22 from make.conf after the upgrade, I tried 
dwinner taking it out and running portsdb -Uu again.

dwinner Now it works.

dwinner Is this the correct thing to do?

Perhaps, the following patch fixes your problem.  This patch changes
to obey default EMACS_PORT_NAME defined in bsd.emacs.mk, as well.

Index: databases/lsdb/Makefile
diff -u databases/lsdb/Makefile.orig databases/lsdb/Makefile
--- databases/lsdb/Makefile.origMon May 21 05:03:59 2007
+++ databases/lsdb/Makefile Wed Jul 25 01:48:39 2007
@@ -18,11 +18,13 @@
 BUILD_DEPENDS= 
${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
 
 USE_EMACS= yes
-EMACS_PORT_NAME?=  emacs21
-.if (${EMACS_PORT_NAME} == emacs21)
-DEPPORT_SUFFIX=
-.else
+
+.include bsd.port.pre.mk
+
+.if ${EMACS_PORT_NAME} == emacs20
 DEPPORT_SUFFIX=-${EMACS_PORT_NAME}
+.else
+DEPPORT_SUFFIX=
 .endif
 
 SFJP_RELEASE_ID=   1494
@@ -40,4 +42,4 @@
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include bsd.port.mk
+.include bsd.port.post.mk


Sincerely,

--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
[EMAIL PROTECTED]  [EMAIL PROTECTED],jp.}FreeBSD.org
http://www.imasy.org/~ume/
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]