summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/snd/Makefile14
-rw-r--r--audio/snd/distinfo4
-rw-r--r--audio/snd/patches/patch-ae6
-rw-r--r--audio/wmmp3/Makefile6
-rw-r--r--audio/xanalyser/Makefile13
-rw-r--r--devel/bison/Makefile8
-rw-r--r--misc/dialog/Makefile6
7 files changed, 30 insertions, 27 deletions
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 1d0de9e8572..6206d10d1a2 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/10/24 22:10:44 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2002/09/21 01:02:04 jlam Exp $
#
DISTNAME= snd
@@ -12,12 +12,14 @@ COMMENT= X based sound editor
NO_SRC_ON_FTP= Already on MASTER_SITE_LOCAL
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
+USE_X11BASE= YES
+
WRKSRC= ${WRKDIR}
MAKEFILE= makefile.netbsd
ALL_TARGET= snd
+
HTMLDIR= ${PREFIX}/share/doc/html/snd
-USE_X11BASE= YES
do-install:
cd ${WRKSRC} ; ${INSTALL_PROGRAM} snd ${PREFIX}/bin
@@ -25,7 +27,7 @@ do-install:
${INSTALL_DATA_DIR} ${HTMLDIR}
cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${HTMLDIR}
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index 3a26f7cfa5f..4f481e5aa11 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/08/29 22:41:01 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/09/21 01:02:04 jlam Exp $
SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65
Size (snd.tar.gz) = 735422 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 3aa0e5bcc54730628d220515919d8dbf11951c1a
SHA1 (patch-ab) = de7027da166eda24e9f19c8ffc86192027e7eee1
SHA1 (patch-ac) = d3073b7d102abcd05d7588b57eb8a053f20b74a7
SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17
-SHA1 (patch-ae) = 3366a8151ceab8a835e18417d61cb5d8a62d4bd0
+SHA1 (patch-ae) = f3968df5d034d5b3629aef8708cfff7e7a033fd9
SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161
SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1
SHA1 (patch-ah) = f744861a8736e4acf498a751b42708e0922d5ff2
diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae
index fbe7108bd83..07754910daf 100644
--- a/audio/snd/patches/patch-ae
+++ b/audio/snd/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.8 2001/08/29 22:41:01 jlam Exp $
+$NetBSD: patch-ae,v 1.9 2002/09/21 01:02:05 jlam Exp $
--- makefile.netbsd.orig Mon Aug 9 19:22:24 1999
+++ makefile.netbsd Mon Aug 9 19:25:36 1999
@@ -6,8 +6,8 @@ $NetBSD: patch-ae,v 1.8 2001/08/29 22:41:01 jlam Exp $
+# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out)
+
+#CC = gcc
-+#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
-+CFLAGS += -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
++#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include
++CFLAGS += -DXPM -DHAVE_OSS -I${X11BASE}/include
+CFLAGS += -g
+
+LIBS = ${LDFLAGS} -lMrm -lXm -lXpm -lXmu -lSM -lXt -lXext -lX11 -lm -lossaudio
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 68b8d06d8c4..ec68a5e8445 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 09:42:44 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 00:59:26 jlam Exp $
DISTNAME= wmmp3-0.12
CATEGORIES= audio
@@ -10,6 +10,7 @@ COMMENT= front-end for mpg123 in a Window Maker dockapp
DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
USE_X11BASE= yes
@@ -22,6 +23,5 @@ post-install:
@${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples"
${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index cd498dabef9..9b70bb1dad9 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/05/12 14:47:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 01:01:15 jlam Exp $
#
DISTNAME= xanalyser-1.21
@@ -11,11 +11,12 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.suse.de/~arvin/xanalyser/
COMMENT= Frequency spectrum analyser for X
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
+USE_X11= # defined
GNU_CONFIGURE= # defined
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index df850bcd694..d0f9eaceb4d 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/08/22 09:31:59 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2002/09/21 01:04:01 jlam Exp $
DISTNAME= bison-1.35
CATEGORIES= devel
@@ -11,11 +11,11 @@ COMMENT= GNU yacc(1) replacement
BUILD_USES_MSGFMT= yes
-USE_BUILDLINK_ONLY= # defined, though not really true
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --without-included-gettext
CONFIGURE_ARGS+= --without-libiconv-prefix
-CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext-lib}
# We set the timezone to "GMT" below to avoid rebuilds of the info files
# which fail under NetBSD 1.5.
@@ -25,6 +25,6 @@ CPPFLAGS+= -Dunix # for $TMPDIR parsing
INFO_FILES= bison.info
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index 678e4d0e4df..ef150835cd6 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/07 06:10:35 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/21 01:00:58 jlam Exp $
DISTNAME= dialog-0.6z
CATEGORIES= misc
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/shell/}
MAINTAINER= jlam@netbsd.org
COMMENT= Display dialog boxes from shell scripts
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
USE_GMAKE= # defined
INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-*
@@ -26,5 +26,5 @@ post-install:
${INSTALL_SCRIPT} $${file} ${EGDIR}; \
done
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 23:40:20 +0000