Sat Dec 17 12:45:18 2011 UTC ()
lang/squeak-vm: delint, add license, fix oss plugin for DragonFly

DragonFly doesn't have the ossaudio library, so it won't build the oss
plugin.  The PLIST was adjusted accordingly.  Pkglint hated the Makefile
so it was cleaned up and a license entry (2-clause-bsd) was added.


(marino)
diff -r1.8 -r1.9 pkgsrc/lang/squeak-vm/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/squeak-vm/PLIST
cvs diff -r1.8 -r1.9 pkgsrc/lang/squeak-vm/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/squeak-vm/Makefile 2011/11/01 06:01:57 1.8
+++ pkgsrc/lang/squeak-vm/Makefile 2011/12/17 12:45:17 1.9
@@ -1,59 +1,66 @@ @@ -1,59 +1,66 @@
1# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:57 sbd Exp $ 1# $NetBSD: Makefile,v 1.9 2011/12/17 12:45:17 marino Exp $
2# 2#
3 3
4SQUEAK_VERSION= 3.11.3.2135 4SQUEAK_VERSION= 3.11.3.2135
5 5
6DISTNAME= Squeak-$(SQUEAK_VERSION)-src 6DISTNAME= Squeak-${SQUEAK_VERSION}-src
7PKGNAME= squeak-vm-$(SQUEAK_VERSION:C/-/./) 7PKGNAME= squeak-vm-${SQUEAK_VERSION:C/-/./}
8PKGREVISION= 6 8PKGREVISION= 6
9CATEGORIES= lang 9CATEGORIES= lang
10MASTER_SITES= http://ftp.squeak.org/3.10/unix-linux/ \ 10MASTER_SITES= http://ftp.squeak.org/3.10/unix-linux/ \
11 http://squeakvm.org/unix/release/ 11 http://squeakvm.org/unix/release/
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://squeakvm.org/unix/ 14HOMEPAGE= http://squeakvm.org/unix/
15COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows 15COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 16LICENSE= 2-clause-bsd
16 17
17PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
18 19
19DIST_SUBDIR= squeak 20DIST_SUBDIR= squeak
20CHECK_PORTABILITY_SKIP= unix/config/configure # not used anymore 21CHECK_PORTABILITY_SKIP= unix/config/configure # not used anymore
21 22
22USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
23USE_CMAKE= yes 24USE_CMAKE= yes
24USE_TOOLS= gzip 25USE_TOOLS= gzip
25 26
26CONFIGURE_DIRS= $(WRKSRC)/build 27CONFIGURE_DIRS= ${WRKSRC}/build
27CMAKE_ARG_PATH= ../unix 28CMAKE_ARG_PATH= ../unix
28#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE # debug 29#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE # debug
29CMAKE_ARGS+= -DPKGMANDIR=$(PKGMANDIR) 30CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
30CMAKE_ARGS+= -DVM_HOST=$(MACHINE_GNU_PLATFORM:Q) -DVM_VERSION=$(SQUEAK_VERSION) 31CMAKE_ARGS+= -DVM_HOST=${MACHINE_GNU_PLATFORM:Q} -DVM_VERSION=${SQUEAK_VERSION}
31CMAKE_ARGS+= -DLIBOSSAUDIO=$(LIBOSSAUDIO) -DDEVOSSAUDIO=$(DEVOSSAUDIO) 32CMAKE_ARGS+= -DDEVOSSAUDIO=${DEVOSSAUDIO}
32#CFLAGS= -g -fomit-frame-pointer 
33 33
34.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
35 35
36.if $(OPSYS) == "NetBSD" 36.if $(OPSYS) == "NetBSD"
37# UUID routines are in libc: 37# UUID routines are in libc:
38BUILDLINK_TRANSFORM+= rm:-luuid 38BUILDLINK_TRANSFORM+= rm:-luuid
39.endif 39.endif
40 40
41PLIST_SUBST= SQUEAK_VERSION=$(SQUEAK_VERSION) 41PLIST_SUBST= SQUEAK_VERSION=${SQUEAK_VERSION}
42 42
43.include "options.mk" 43.include "options.mk"
44 44
 45PLIST_VARS+= oss
 46
 47.if $(OPSYS) != "DragonFly"
 48PLIST.oss= yes
 49CMAKE_ARGS+= -DLIBOSSAUDIO=${LIBOSSAUDIO}
 50.endif
 51
45pre-configure: 52pre-configure:
46 $(MKDIR) $(CONFIGURE_DIRS) 53 ${MKDIR} ${CONFIGURE_DIRS}
47 54
48.include "../../audio/libvorbis/buildlink3.mk" 55.include "../../audio/libvorbis/buildlink3.mk"
49.include "../../audio/speex/buildlink3.mk" 56.include "../../audio/speex/buildlink3.mk"
50.include "../../converters/libiconv/buildlink3.mk" 57.include "../../converters/libiconv/buildlink3.mk"
51.include "../../devel/gettext-lib/buildlink3.mk" 58.include "../../devel/gettext-lib/buildlink3.mk"
52.include "../../devel/libffi/buildlink3.mk" 59.include "../../devel/libffi/buildlink3.mk"
53.include "../../graphics/cairo/buildlink3.mk" 60.include "../../graphics/cairo/buildlink3.mk"
54.include "../../graphics/freetype2/buildlink3.mk" 61.include "../../graphics/freetype2/buildlink3.mk"
55.include "../../graphics/MesaLib/buildlink3.mk" 62.include "../../graphics/MesaLib/buildlink3.mk"
56.include "../../graphics/glu/buildlink3.mk" 63.include "../../graphics/glu/buildlink3.mk"
57.include "../../x11/libXt/buildlink3.mk" 64.include "../../x11/libXt/buildlink3.mk"
58.include "../../x11/libXext/buildlink3.mk" 65.include "../../x11/libXext/buildlink3.mk"
59.include "../../x11/xextproto/buildlink3.mk" 66.include "../../x11/xextproto/buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/lang/squeak-vm/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/squeak-vm/PLIST 2010/06/01 21:55:32 1.2
+++ pkgsrc/lang/squeak-vm/PLIST 2011/12/17 12:45:17 1.3
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1@comment $NetBSD: PLIST,v 1.2 2010/06/01 21:55:32 markd Exp $ 1@comment $NetBSD: PLIST,v 1.3 2011/12/17 12:45:17 marino Exp $
2bin/squeak 2bin/squeak
3bin/squeak.sh 3bin/squeak.sh
4lib/squeak/${PKGVERSION}/so.AioPlugin 4lib/squeak/${PKGVERSION}/so.AioPlugin
5lib/squeak/${PKGVERSION}/so.B3DAcceleratorPlugin 5lib/squeak/${PKGVERSION}/so.B3DAcceleratorPlugin
6lib/squeak/${PKGVERSION}/so.ClipboardExtendedPlugin 6lib/squeak/${PKGVERSION}/so.ClipboardExtendedPlugin
7${PLIST.pulse}lib/squeak/${PKGVERSION}/so.DBusPlugin 7${PLIST.pulse}lib/squeak/${PKGVERSION}/so.DBusPlugin
8lib/squeak/${PKGVERSION}/so.FileCopyPlugin 8lib/squeak/${PKGVERSION}/so.FileCopyPlugin
9lib/squeak/${PKGVERSION}/so.HostWindowPlugin 9lib/squeak/${PKGVERSION}/so.HostWindowPlugin
10lib/squeak/${PKGVERSION}/so.ImmX11Plugin 10lib/squeak/${PKGVERSION}/so.ImmX11Plugin
11lib/squeak/${PKGVERSION}/so.KedamaPlugin 11lib/squeak/${PKGVERSION}/so.KedamaPlugin
12lib/squeak/${PKGVERSION}/so.KedamaPlugin2 12lib/squeak/${PKGVERSION}/so.KedamaPlugin2
13lib/squeak/${PKGVERSION}/so.MIDIPlugin 13lib/squeak/${PKGVERSION}/so.MIDIPlugin
14lib/squeak/${PKGVERSION}/so.Mpeg3Plugin 14lib/squeak/${PKGVERSION}/so.Mpeg3Plugin
15lib/squeak/${PKGVERSION}/so.OggPlugin 15lib/squeak/${PKGVERSION}/so.OggPlugin
16lib/squeak/${PKGVERSION}/so.PseudoTTYPlugin 16lib/squeak/${PKGVERSION}/so.PseudoTTYPlugin
17lib/squeak/${PKGVERSION}/so.Squeak3D 17lib/squeak/${PKGVERSION}/so.Squeak3D
18lib/squeak/${PKGVERSION}/so.SqueakFFIPrims 18lib/squeak/${PKGVERSION}/so.SqueakFFIPrims
19lib/squeak/${PKGVERSION}/so.UUIDPlugin 19lib/squeak/${PKGVERSION}/so.UUIDPlugin
20lib/squeak/${PKGVERSION}/so.UnixOSProcessPlugin 20lib/squeak/${PKGVERSION}/so.UnixOSProcessPlugin
21lib/squeak/${PKGVERSION}/so.XDisplayControlPlugin 21lib/squeak/${PKGVERSION}/so.XDisplayControlPlugin
22lib/squeak/${PKGVERSION}/so.vm-display-X11 22lib/squeak/${PKGVERSION}/so.vm-display-X11
23lib/squeak/${PKGVERSION}/so.vm-display-custom 23lib/squeak/${PKGVERSION}/so.vm-display-custom
24lib/squeak/${PKGVERSION}/so.vm-display-null 24lib/squeak/${PKGVERSION}/so.vm-display-null
25${PLIST.nas}lib/squeak/${PKGVERSION}/so.vm-sound-NAS 25${PLIST.nas}lib/squeak/${PKGVERSION}/so.vm-sound-NAS
26lib/squeak/${PKGVERSION}/so.vm-sound-OSS 26${PLIST.oss}lib/squeak/${PKGVERSION}/so.vm-sound-OSS
27lib/squeak/${PKGVERSION}/so.vm-sound-custom 27lib/squeak/${PKGVERSION}/so.vm-sound-custom
28lib/squeak/${PKGVERSION}/so.vm-sound-null 28lib/squeak/${PKGVERSION}/so.vm-sound-null
29${PLIST.pulse}lib/squeak/${PKGVERSION}/so.vm-sound-pulse 29${PLIST.pulse}lib/squeak/${PKGVERSION}/so.vm-sound-pulse
30lib/squeak/${PKGVERSION}/squeakvm 30lib/squeak/${PKGVERSION}/squeakvm
31man/man1/squeak.1 31man/man1/squeak.1