summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>1999-07-06 07:54:35 +0000
committerjlam <jlam@pkgsrc.org>1999-07-06 07:54:35 +0000
commitfd659cc6233e75fd213a5688c37ccc125fe1ba1b (patch)
treed897b264acd5cb19fb3a343d42ad5a78af83865f
parent6462de2c86cf0d27f8108072cac71bd9c3ff127b (diff)
downloadpkgsrc-fd659cc6233e75fd213a5688c37ccc125fe1ba1b.tar.gz
* Update ncurses dependency.
* Pass correct linker options to make this ELF-aware. XXX Compiles, but doesn't run on my i386 system. I'm not sure if it's XXX because I've misconfigured my audio or not.
-rw-r--r--audio/mikmod/Makefile8
-rw-r--r--audio/mikmod/patches/patch-bd8
2 files changed, 8 insertions, 8 deletions
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index d784e75da13..1aba920e756 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/04/15 20:39:39 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/07/06 07:54:35 jlam Exp $
#
DISTNAME= mikmod-3.0.3
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.freenet.tlh.fl.us/~amstpi/ \
MAINTAINER= mycroft@NetBSD.ORG
HOMEPAGE= http://www.freenet.tlh.fl.us/~amstpi/mikmod.html
-DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+= ncurses-4.2:../../devel/ncurses
USE_GMAKE= yes
@@ -17,12 +17,12 @@ post-patch:
chmod a+x ${WRKSRC}/build-mikmod.netbsd.sh
do-build:
- @(cd ${WRKSRC}; ${SETENV} PREFIX=${PREFIX} ./build-mikmod.netbsd.sh)
+ @( cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build-mikmod.netbsd.sh )
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/usercode/mikmod ${PREFIX}/bin
#${INSTALL_MAN} ${WRKSRC}/docs/mikmod.1 ${PREFIX}/man/man1
- ${MKDIR} ${PREFIX}/share/doc/mikmod
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mikmod
.for f in bugs.txt changes.txt future.txt mikmod.doc mikmod.txt tips.txt
${INSTALL_DATA} ${WRKSRC}/docs/$f ${PREFIX}/share/doc/mikmod
.endfor
diff --git a/audio/mikmod/patches/patch-bd b/audio/mikmod/patches/patch-bd
index 6ce13ed7b71..e9dd247adc6 100644
--- a/audio/mikmod/patches/patch-bd
+++ b/audio/mikmod/patches/patch-bd
@@ -1,7 +1,7 @@
-$NetBSD: patch-bd,v 1.2 1998/08/07 10:35:59 agc Exp $
+$NetBSD: patch-bd,v 1.3 1999/07/06 07:54:35 jlam Exp $
---- /dev/null Sat Jul 4 02:20:57 1998
-+++ usercode/makefile.netbsd Sat Jul 4 02:29:45 1998
+--- /dev/null Tue Jul 6 03:03:17 1999
++++ usercode/makefile.netbsd Tue Jul 6 03:05:03 1999
@@ -0,0 +1,13 @@
+# MikMod User Code Makefile for NetBSD
+
@@ -12,7 +12,7 @@ $NetBSD: patch-bd,v 1.2 1998/08/07 10:35:59 agc Exp $
+CFLAGS = -O6 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -pipe -I$(INCLUDEDIR) -I$(PREFIX)/include -DSOLARIS -DUSE_ZIP
+
+mikmod: $(OBJS) $(LIBDIR)/libmikmod.a $(LIBDIR)/libmmio.a
-+ cc -o mikmod $(OBJS) ../playercode/munitrk.o ../playercode/virtch.o ../playercode/npertab.o -L$(LIBDIR) -L$(PREFIX)/lib -lmikmod -lmmio -lncurses
++ cc -o mikmod $(OBJS) ../playercode/munitrk.o ../playercode/virtch.o ../playercode/npertab.o ${LDFLAGS} -L$(LIBDIR) -lmikmod -lmmio -lncurses
+
+clean:
+ rm -f $(OBJS) mikmod