From d0320f04d6625f30c0e479e6c529ea6c2767221d Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 21 Sep 2002 06:30:45 +0000 Subject: buildlink1 -> buildlink2 --- print/cjk-lyx/Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'print/cjk-lyx') diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index b74df64bfac..923ef3f7569 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 06:30:45 jlam Exp $ DISTNAME= lyx-${LYX_VERS} PKGNAME= cjk-${DISTNAME} @@ -17,7 +17,7 @@ COMMENT= multibyte version of LyX LYX_VERS= 1.2.0 -CONFLICTS= lyx-* +CONFLICTS= lyx-[0-9]* DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base DEPENDS+= teTeX-bin>=1.0.7nb1:../../print/teTeX-bin @@ -28,17 +28,16 @@ GCC_VERSION!= gcc --version .include "../../lang/gcc/Makefile.gcc" .endif -USE_PERL5= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltmain.sh -GNU_CONFIGURE= yes +USE_BUILDLINK2= yes +USE_PERL5= yes +GNU_CONFIGURE= yes -post-configure: - # this pkg generates libtool script from configure file - cd ${WRKSRC} && config/ltmain.sh +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/sigc++/libtool + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/xforms/buildlink2.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../x11/xforms/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3