From 537974e157ce90b7cc660ae2c7d53243d099597e Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 12 Apr 2006 20:50:56 +0000 Subject: libXsharpSupport.la is always installed, but a stub lib in the -nox11 case. Remove PLIST_SUBST code now unused. Add build dependency on treecc. Bump revision of pnetlib-nox11, since the PLIST changed. --- lang/pnetlib/Makefile | 4 +--- lang/pnetlib/Makefile.common | 10 ++-------- lang/pnetlib/PLIST | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'lang/pnetlib') diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile index d1fd1062624..64fe96c5fa7 100644 --- a/lang/pnetlib/Makefile +++ b/lang/pnetlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/18 22:59:38 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2006/04/12 20:50:56 joerg Exp $ # PKGREVISION= 3 @@ -9,8 +9,6 @@ PKGREVISION= 3 #CONFIGURE_ARGS+= --enable-xft CONFIGURE_ARGS+= --with-x -PLIST_SUBST+= WITH_X11= - CONFLICTS= pnetlib-nox11-[0-9]* #.include "../../fonts/Xft2/buildlink3.mk" diff --git a/lang/pnetlib/Makefile.common b/lang/pnetlib/Makefile.common index 682008737a1..f78eadfac41 100644 --- a/lang/pnetlib/Makefile.common +++ b/lang/pnetlib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2005/05/22 20:08:10 jlam Exp $ +# $NetBSD: Makefile.common,v 1.8 2006/04/12 20:50:56 joerg Exp $ # DISTNAME= pnetlib-0.6.6 @@ -21,12 +21,6 @@ PLIST_SRC= ${.CURDIR}/../pnetlib/PLIST # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "FreeBSD" -PLIST_SUBST+= LIBXSHARP="@comment " -.else -PLIST_SUBST+= LIBXSHARP= -.endif +BUILD_DEPENDS+= treecc>=0.2.6:../../devel/treecc .include "../../lang/pnet/buildlink3.mk" diff --git a/lang/pnetlib/PLIST b/lang/pnetlib/PLIST index 5e068a45f75..adeb6322464 100644 --- a/lang/pnetlib/PLIST +++ b/lang/pnetlib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/02/18 22:59:38 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/04/12 20:50:56 joerg Exp $ bin/csunit bin/ilinstall bin/jsrun @@ -116,7 +116,7 @@ lib/cscc/lib/de/Xsharp.resources.dll lib/cscc/lib/de/mscorlib.resources.dll lib/cscc/lib/ilinstall.exe lib/cscc/lib/jsrun.exe -${WITH_X11}lib/cscc/lib/libXsharpSupport.la +lib/cscc/lib/libXsharpSupport.la lib/cscc/lib/mscorlib.dll lib/cscc/lib/pinvoke.map share/cscc/config/machine.default -- cgit v1.2.3