summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/pnetlib/Makefile7
-rw-r--r--lang/pnetlib/Makefile.common8
-rw-r--r--lang/pnetlib/PLIST6
-rw-r--r--lang/pnetlib/buildlink3.mk5
-rw-r--r--lang/pnetlib/distinfo6
5 files changed, 20 insertions, 12 deletions
diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile
index c0f55d7cf7b..906a568e56f 100644
--- a/lang/pnetlib/Makefile
+++ b/lang/pnetlib/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2004/02/27 07:37:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/14 08:03:59 xtraeme Exp $
#
.include "Makefile.common"
USE_X11= yes
-CONFIGURE_ARGS+= --enable-xft
+# Disable xft support for now, it's broken.
+#CONFIGURE_ARGS+= --enable-xft
CONFIGURE_ARGS+= --with-x
PLIST_SUBST+= WITH_X11=
CONFLICTS= pnetlib-nox11-[0-9]*
-.include "../../fonts/Xft2/buildlink3.mk"
+#.include "../../fonts/Xft2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/pnetlib/Makefile.common b/lang/pnetlib/Makefile.common
index 9b5dea1edb7..a1385e00a30 100644
--- a/lang/pnetlib/Makefile.common
+++ b/lang/pnetlib/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.3 2004/02/27 07:37:04 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/05/14 08:03:59 xtraeme Exp $
#
-DISTNAME= pnetlib-0.6.2
+DISTNAME= pnetlib-0.6.4
CATEGORIES= lang
MASTER_SITES= http://www.southern-storm.com.au/download/
@@ -11,6 +11,7 @@ COMMENT= DotGNU Portable .NET C SHARP class libraries
GNU_CONFIGURE= yes
USE_GNU_TOOLS+= make
+USE_LIBTOOL= yes
USE_BUILDLINK3= yes
DESCR_SRC= ${.CURDIR}/../pnetlib/DESCR
@@ -18,6 +19,9 @@ DISTINFO_FILE= ${.CURDIR}/../pnetlib/distinfo
PATCHDIR= ${.CURDIR}/../pnetlib/patches
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"
diff --git a/lang/pnetlib/PLIST b/lang/pnetlib/PLIST
index 34fa678059e..5feec7da963 100644
--- a/lang/pnetlib/PLIST
+++ b/lang/pnetlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/12 17:15:28 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/14 08:03:59 xtraeme Exp $
bin/csunit
bin/ilinstall
bin/jsrun
@@ -15,6 +15,7 @@ lib/cscc/lib/1.2.3400.0/I18N.West.dll
lib/cscc/lib/1.2.3400.0/I18N.dll
lib/cscc/lib/1.2.3400.0/ISymWrapper.dll
lib/cscc/lib/1.2.3400.0/OpenSystem.C.dll
+lib/cscc/lib/1.2.3400.0/OpenSystem.Platform.dll
lib/cscc/lib/1.2.3400.0/System.Configuration.Install.dll
lib/cscc/lib/1.2.3400.0/System.Design.dll
lib/cscc/lib/1.2.3400.0/System.Drawing.Postscript.dll
@@ -49,6 +50,7 @@ lib/cscc/lib/1.2.3400.0/de/Xsharp.resources.dll
lib/cscc/lib/1.2.3400.0/de/mscorlib.resources.dll
lib/cscc/lib/1.2.3400.0/ilinstall.exe
lib/cscc/lib/1.2.3400.0/mscorlib.dll
+lib/cscc/lib/1.2.3400.0/pinvoke.map
lib/cscc/lib/8.0.1000.0/Microsoft.JScript.dll
lib/cscc/lib/8.0.1000.0/Microsoft.VisualBasic.dll
lib/cscc/lib/8.0.1000.0/Microsoft.VisualC.dll
@@ -74,6 +76,7 @@ lib/cscc/lib/Microsoft.VisualBasic.dll
lib/cscc/lib/Microsoft.VisualC.dll
lib/cscc/lib/Microsoft.Vsa.dll
lib/cscc/lib/OpenSystem.C.dll
+lib/cscc/lib/OpenSystem.Platform.dll
lib/cscc/lib/System.Configuration.Install.dll
lib/cscc/lib/System.Design.dll
lib/cscc/lib/System.Drawing.Postscript.dll
@@ -117,6 +120,7 @@ ${WITH_X11}lib/cscc/lib/libXsharpSupport.so
${WITH_X11}lib/cscc/lib/libXsharpSupport.so.0
${LIBXSHARP}${WITH_X11}lib/cscc/lib/libXsharpSupport.so.0.0
lib/cscc/lib/mscorlib.dll
+lib/cscc/lib/pinvoke.map
share/cscc/config/machine.default
@dirrm share/cscc/config
@dirrm share/cscc
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index 0a1be727dc9..6114b53b247 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/05/14 08:03:59 xtraeme Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNETLIB_BUILDLINK3_MK:= ${PNETLIB_BUILDLINK3_MK}+
@@ -11,11 +11,10 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npnetlib}
BUILDLINK_PACKAGES+= pnetlib
.if !empty(PNETLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pnetlib+= pnetlib>=0.6.2
+BUILDLINK_DEPENDS.pnetlib+= pnetlib>=0.6.4
BUILDLINK_PKGSRCDIR.pnetlib?= ../../lang/pnetlib
.endif # PNETLIB_BUILDLINK3_MK
-.include "../../fonts/Xft2/buildlink3.mk"
.include "../../lang/pnet/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnetlib/distinfo b/lang/pnetlib/distinfo
index f2fed4974e5..f28666ed952 100644
--- a/lang/pnetlib/distinfo
+++ b/lang/pnetlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/12 17:15:27 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/05/14 08:03:59 xtraeme Exp $
-SHA1 (pnetlib-0.6.2.tar.gz) = 36a861395831e37209cc0cf6acd1062e5239c827
-Size (pnetlib-0.6.2.tar.gz) = 3473746 bytes
+SHA1 (pnetlib-0.6.4.tar.gz) = 54db0b11148cff79a5d8fc01d0bd939a13e3b9fa
+Size (pnetlib-0.6.4.tar.gz) = 3546420 bytes