>Number:         16353
>Category:       pkg
>Synopsis:       Change use buildlink.mk for editers/xemacs and editers/xemacs-current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 14 12:57:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     OGATA
>Release:        NetBSD 1.5.2
>Organization:
>Environment:

System: NetBSD Leia2 1.5.2 NetBSD 1.5.2 (GENERIC_SCSI3-Leia2-1.5.2XCAST6) #0: Thu Oct 25 17:43:23 JST 2001 ogata@Kodiaka:/export/XCAST6/syssrc-xcast0.0.2/sys/arch/sparc/compile/GENERIC_SCSI3-Leia2-1.5.2XCAST6 sparc

>Description:
	If japanese/canna-lib support buildlink.mk, please change it.

	tech-pkg-ja@jp.netbsd ML posted it.
	http://www.jp.netbsd.org/ja/JP/ml/tech-pkg-ja/200204/msg00055.html

	I was try make japanese/canna-lib/buildlink.mk and posted ML.
	http://www.jp.netbsd.org/ja/JP/ml/tech-pkg-ja/200204/msg00005.html
	http://www.jp.netbsd.org/ja/JP/ml/tech-pkg-ja/200204/msg00006.html
	I got it which was fixed with the advice about a package from Sakamoto-san.

	thanks	

>How-To-Repeat:
	none.

>Fix:

editers/xemacs
--- Makefile.orig	Sat Apr  6 03:39:18 2002
+++ Makefile	Wed Apr 10 00:55:10 2002
@@ -15,10 +15,10 @@
 HOMEPAGE=	http://www.xemacs.org/
 COMMENT=	XEmacs text editor version 21
 
-DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
-DEPENDS+=	png>=1.2.1:../../graphics/png
-DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
-DEPENDS+=	jpeg-[0-9]*:../../graphics/jpeg
+.include "../../databases/gdbm/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
 
 NOT_FOR_PLATFORM=	*-*-mips*	#fails purespace dumping
 
@@ -45,21 +45,21 @@
 
 .if defined(USE_LDAP) && ${USE_LDAP} == YES
 WITH_LDAP=	--with-ldap=yes
-DEPENDS+=	openldap-[0-9]*:../../databases/openldap
+.include "../../databases/openldap/buildlink.mk"
 .else
 WITH_LDAP=	--with-ldap=no
 .endif
 
 .if defined(USE_XFACE) && ${USE_XFACE} == YES
 WITH_XFACE=	--with-xface=yes
-DEPENDS+=	faces>=1.6.1:../../mail/faces
+.include "../../mail/faces/buildlink.mk"
 .else
 WITH_XFACE=	--with-xface=no
 .endif
 
 .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES
 WITH_CANNA=	--with-canna=yes
-DEPENDS+=	Canna-lib-3*:../../japanese/canna-lib
+.include "../../japanese/canna-lib/buildlink.mk"
 .else
 WITH_CANNA=	--with-canna=no
 .endif


editers/xemacs-current
--- Makefile.orig	Sat Apr  6 03:44:01 2002
+++ Makefile	Wed Apr 10 00:58:15 2002
@@ -53,7 +53,7 @@
 
 .if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES
 WITH_CANNA=	--with-canna=yes
-DEPENDS+=	Canna-lib-3*:../../japanese/canna-lib
+.include "../../japanese/canna-lib/buildlink.mk"
 .else
 WITH_CANNA=	--with-canna=no
 .endif
>Release-Note:
>Audit-Trail:
>Unformatted: