pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang libXsharpSupport.la is always installed, but a st...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f210e2786a79
branches:  trunk
changeset: 511295:f210e2786a79
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Apr 12 20:50:56 2006 +0000

description:
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:

 lang/pnetlib-nox11/Makefile  |   5 ++---
 lang/pnetlib/Makefile        |   4 +---
 lang/pnetlib/Makefile.common |  10 ++--------
 lang/pnetlib/PLIST           |   4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)

diffs (79 lines):

diff -r 0ea41dac3607 -r f210e2786a79 lang/pnetlib-nox11/Makefile
--- a/lang/pnetlib-nox11/Makefile       Wed Apr 12 20:49:12 2006 +0000
+++ b/lang/pnetlib-nox11/Makefile       Wed Apr 12 20:50:56 2006 +0000
@@ -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 -r 0ea41dac3607 -r f210e2786a79 lang/pnetlib/Makefile
--- a/lang/pnetlib/Makefile     Wed Apr 12 20:49:12 2006 +0000
+++ b/lang/pnetlib/Makefile     Wed Apr 12 20:50:56 2006 +0000
@@ -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 @@
 #CONFIGURE_ARGS+=      --enable-xft
 CONFIGURE_ARGS+=       --with-x
 
-PLIST_SUBST+=          WITH_X11=
-
 CONFLICTS=             pnetlib-nox11-[0-9]*
 
 #.include "../../fonts/Xft2/buildlink3.mk"
diff -r 0ea41dac3607 -r f210e2786a79 lang/pnetlib/Makefile.common
--- a/lang/pnetlib/Makefile.common      Wed Apr 12 20:49:12 2006 +0000
+++ b/lang/pnetlib/Makefile.common      Wed Apr 12 20:50:56 2006 +0000
@@ -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 @@
 # 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 -r 0ea41dac3607 -r f210e2786a79 lang/pnetlib/PLIST
--- a/lang/pnetlib/PLIST        Wed Apr 12 20:49:12 2006 +0000
+++ b/lang/pnetlib/PLIST        Wed Apr 12 20:50:56 2006 +0000
@@ -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/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



Home | Main Index | Thread Index | Old Index