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
--- 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,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:57 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/12/17 12:45:17 marino Exp $
#
SQUEAK_VERSION= 3.11.3.2135
-DISTNAME= Squeak-$(SQUEAK_VERSION)-src
-PKGNAME= squeak-vm-$(SQUEAK_VERSION:C/-/./)
+DISTNAME= Squeak-${SQUEAK_VERSION}-src
+PKGNAME= squeak-vm-${SQUEAK_VERSION:C/-/./}
PKGREVISION= 6
CATEGORIES= lang
MASTER_SITES= http://ftp.squeak.org/3.10/unix-linux/ \
@@ -13,6 +13,7 @@
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://squeakvm.org/unix/
COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows
+LICENSE= 2-clause-bsd
PKG_DESTDIR_SUPPORT= user-destdir
@@ -23,13 +24,12 @@
USE_CMAKE= yes
USE_TOOLS= gzip
-CONFIGURE_DIRS= $(WRKSRC)/build
+CONFIGURE_DIRS= ${WRKSRC}/build
CMAKE_ARG_PATH= ../unix
#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE # debug
-CMAKE_ARGS+= -DPKGMANDIR=$(PKGMANDIR)
-CMAKE_ARGS+= -DVM_HOST=$(MACHINE_GNU_PLATFORM:Q) -DVM_VERSION=$(SQUEAK_VERSION)
-CMAKE_ARGS+= -DLIBOSSAUDIO=$(LIBOSSAUDIO) -DDEVOSSAUDIO=$(DEVOSSAUDIO)
-#CFLAGS= -g -fomit-frame-pointer
+CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
+CMAKE_ARGS+= -DVM_HOST=${MACHINE_GNU_PLATFORM:Q} -DVM_VERSION=${SQUEAK_VERSION}
+CMAKE_ARGS+= -DDEVOSSAUDIO=${DEVOSSAUDIO}
.include "../../mk/bsd.prefs.mk"
@@ -38,12 +38,19 @@
BUILDLINK_TRANSFORM+= rm:-luuid
.endif
-PLIST_SUBST= SQUEAK_VERSION=$(SQUEAK_VERSION)
+PLIST_SUBST= SQUEAK_VERSION=${SQUEAK_VERSION}
.include "options.mk"
+PLIST_VARS+= oss
+
+.if $(OPSYS) != "DragonFly"
+PLIST.oss= yes
+CMAKE_ARGS+= -DLIBOSSAUDIO=${LIBOSSAUDIO}
+.endif
+
pre-configure:
- $(MKDIR) $(CONFIGURE_DIRS)
+ ${MKDIR} ${CONFIGURE_DIRS}
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/speex/buildlink3.mk"
--- 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,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/06/01 21:55:32 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/12/17 12:45:17 marino Exp $
bin/squeak
bin/squeak.sh
lib/squeak/${PKGVERSION}/so.AioPlugin
@@ -23,7 +23,7 @@
lib/squeak/${PKGVERSION}/so.vm-display-custom
lib/squeak/${PKGVERSION}/so.vm-display-null
${PLIST.nas}lib/squeak/${PKGVERSION}/so.vm-sound-NAS
-lib/squeak/${PKGVERSION}/so.vm-sound-OSS
+${PLIST.oss}lib/squeak/${PKGVERSION}/so.vm-sound-OSS
lib/squeak/${PKGVERSION}/so.vm-sound-custom
lib/squeak/${PKGVERSION}/so.vm-sound-null
${PLIST.pulse}lib/squeak/${PKGVERSION}/so.vm-sound-pulse