diff options
| author | joerg <joerg@pkgsrc.org> | 2006-04-12 20:50:56 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-04-12 20:50:56 +0000 |
| commit | 537974e157ce90b7cc660ae2c7d53243d099597e (patch) | |
| tree | 4e565c4429b1cc91ebb82b65ab30f27949c64a52 /lang | |
| parent | 694478afb83ce4e38b99df1ea480e65f5e969ee2 (diff) | |
| download | pkgsrc-537974e157ce90b7cc660ae2c7d53243d099597e.tar.gz | |
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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/pnetlib-nox11/Makefile | 5 | ||||
| -rw-r--r-- | lang/pnetlib/Makefile | 4 | ||||
| -rw-r--r-- | lang/pnetlib/Makefile.common | 10 | ||||
| -rw-r--r-- | lang/pnetlib/PLIST | 4 |
4 files changed, 7 insertions, 16 deletions
diff --git a/lang/pnetlib-nox11/Makefile b/lang/pnetlib-nox11/Makefile index cdcb494c6a1..10cc60a51c0 100644 --- a/lang/pnetlib-nox11/Makefile +++ b/lang/pnetlib-nox11/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:47 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/04/12 20:50:56 joerg Exp $ # .include "${.CURDIR}/../pnetlib/Makefile.common" PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGREVISION= 1 +PKGREVISION= 2 CONFIGURE_ARGS+= --without-x -PLIST_SUBST+= WITH_X11="@comment " CONFLICTS= pnetlib-[0-9]* .include "../../mk/bsd.pkg.mk" 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 |