summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-22 17:38:56 +0000
committerjlam <jlam>2001-08-22 17:38:56 +0000
commit841e1103d3a3bead43a553fc507d7f53c7803f6b (patch)
treed0b4e9476524e9178356be77722a72c2fb2e781b
parentf10802c13ef9e8f4699f07266797b6b7fabc4b41 (diff)
downloadpkgsrc-841e1103d3a3bead43a553fc507d7f53c7803f6b.tar.gz
Packages that USE_IMAKE shouldn't set USE_BUILDLINK_ONLY, as they don't
satisfy the condition of being "strongly-buildlinked" (see http://mail-index.netbsd.org/tech-pkg/2001/08/20/0005.html for the definition). This is in response to the recent change to bsd.pkg.mk to not use buildlink-x11.
-rw-r--r--audio/nas/Makefile3
-rw-r--r--audio/wsoundprefs/Makefile7
-rw-r--r--audio/wsoundprefs/distinfo4
-rw-r--r--audio/wsoundprefs/patches/patch-ab14
-rw-r--r--audio/xcdplayer/Makefile5
-rw-r--r--audio/xmcd/Makefile11
-rw-r--r--audio/xmix/Makefile3
-rw-r--r--audio/xmmix/Makefile5
-rw-r--r--audio/xmradio/Makefile5
-rw-r--r--finance/xinvest/Makefile3
-rw-r--r--finance/xquote/Makefile3
-rw-r--r--games/xsoldier/Makefile3
-rw-r--r--graphics/magicpoint/Makefile3
-rw-r--r--graphics/tgif/Makefile3
-rw-r--r--graphics/xart/Makefile6
-rw-r--r--graphics/xli/Makefile7
-rw-r--r--graphics/xpm/Makefile3
-rw-r--r--misc/xrolodex/Makefile3
-rw-r--r--sysutils/xbattbar/Makefile7
-rw-r--r--time/asclock-xlib/Makefile7
-rw-r--r--time/asclock/Makefile7
-rw-r--r--wm/ctwm/Makefile5
-rw-r--r--wm/lwm/Makefile5
-rw-r--r--wm/tvtwm/Makefile8
24 files changed, 53 insertions, 77 deletions
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index af9734732e0..5267a4a9bf5 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/14 13:35:12 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/22 17:38:56 jlam Exp $
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
@@ -13,7 +13,6 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://radscan.com/nas.html
COMMENT= Network Audio System
-USE_BUILDLINK_ONLY= # defined
USE_IMAKE= # defined
USE_X11BASE= # defined
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 43ff4a609a8..9fa253805ff 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/24 11:04:20 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/22 17:38:56 jlam Exp $
DISTNAME= WSoundPrefs-1.1.1
PKGNAME= wsoundprefs-1.1.1
@@ -9,9 +9,8 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://shadowmere.student.utwente.nl/
COMMENT= WSoundServer configuration utility
-USE_BUILDLINK_ONLY= YES
-USE_X11BASE= YES
-USE_IMAKE= YES
+USE_X11BASE= YES
+USE_IMAKE= YES
.include "../../audio/wsoundserver/buildlink.mk"
.include "../../wm/windowmaker/buildlink.mk"
diff --git a/audio/wsoundprefs/distinfo b/audio/wsoundprefs/distinfo
index d35161ed2fd..bbe2ccbf75b 100644
--- a/audio/wsoundprefs/distinfo
+++ b/audio/wsoundprefs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/07/24 11:04:20 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/22 17:38:56 jlam Exp $
SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b
-SHA1 (patch-ab) = b5c2e7e41a1ad4508e91dfd98446be73805dda0c
+SHA1 (patch-ab) = 1c378cf46b5902fbc0a364de9b3648e16504a946
SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
diff --git a/audio/wsoundprefs/patches/patch-ab b/audio/wsoundprefs/patches/patch-ab
index 84f3e857265..71092683d8d 100644
--- a/audio/wsoundprefs/patches/patch-ab
+++ b/audio/wsoundprefs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2001/07/24 11:04:21 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/08/22 17:38:56 jlam Exp $
--- src/Imakefile.orig Mon Oct 18 01:35:58 1999
+++ src/Imakefile
@@ -12,12 +12,12 @@ $NetBSD: patch-ab,v 1.5 2001/07/24 11:04:21 jlam Exp $
-WRASTERCFLAGS = `get-wraster-flags --cflags`
-WRASTERLFLAGS = `get-wraster-flags --lflags`
-WRASTERLIBS = `get-wraster-flags --libs`
-+WSOUNDCFLAGS = `${BUILDLINK_DIR}/bin/get-wsound-flags --cflags`
-+WSOUNDLFLAGS = `${BUILDLINK_DIR}/bin/get-wsound-flags --lflags`
-+WSOUNDLIBS = `${BUILDLINK_DIR}/bin/get-wsound-flags --libs`
-+WRASTERCFLAGS = `${BUILDLINK_DIR}/bin/get-wraster-flags --cflags`
-+WRASTERLFLAGS = `${BUILDLINK_DIR}/bin/get-wraster-flags --lflags`
-+WRASTERLIBS = `${BUILDLINK_DIR}/bin/get-wraster-flags --libs`
++WSOUNDCFLAGS = `${GET_WSOUND_FLAGS} --cflags`
++WSOUNDLFLAGS = `${GET_WSOUND_FLAGS} --lflags`
++WSOUNDLIBS = `${GET_WSOUND_FLAGS} --libs`
++WRASTERCFLAGS = `${GET_WRASTER_FLAGS} --cflags`
++WRASTERLFLAGS = `${GET_WRASTER_FLAGS}} --lflags`
++WRASTERLIBS = `${GET_WRASTER_FLAGS} --libs`
WINGSLIBS = -lWINGs -lPropList
STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS)
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 562140b84ef..3baeeaecdaa 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/07/02 21:37:41 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/22 17:38:56 jlam Exp $
# FreeBSD Id: Makefile,v 1.8 1997/04/01 23:08:24 swallace Exp
#
@@ -11,7 +11,6 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= packages@netbsd.org
COMMENT= CD player for X
-USE_BUILDLINK_ONLY= yes
-USE_IMAKE= yes
+USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 409c45dffbe..cd78255e1e6 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/07/24 16:00:01 nra Exp $
+# $NetBSD: Makefile,v 1.27 2001/08/22 17:38:56 jlam Exp $
#
DISTNAME= xmcd-3.0.1
@@ -10,11 +10,10 @@ HOMEPAGE= http://www.ibiblio.org/tkan/xmcd/
COMMENT= Motif CD player
WRKSRC= ${WRKDIR}/xmcd-3.0
-USE_BUILDLINK_ONLY= yes
-USE_NCURSES= yes
-USE_IMAKE= yes
-IS_INTERACTIVE= yes # asks a lot of questions
-MAKE_ENV+= SHELL=${SH}
+USE_NCURSES= yes
+USE_IMAKE= yes
+IS_INTERACTIVE= yes # asks a lot of questions
+MAKE_ENV+= SHELL=${SH}
pre-install:
cd ${WRKSRC} && \
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 5164e379729..9d971fb136a 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/02 21:42:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/22 17:38:57 jlam Exp $
# FreeBSD Id: Makefile,v 1.5 1996/11/18 13:56:53 asami Exp
#
@@ -12,7 +12,6 @@ PATCHFILES= xmix-2.1.mixers.patch
MAINTAINER= packages@netbsd.org
COMMENT= Mixer for X Window System
-USE_BUILDLINK_ONLY= yes
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xmix
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index e9ee17559b0..98dc794d3fd 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/07/01 21:40:27 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/22 17:38:57 jlam Exp $
# FreeBSD ID: Makefile,v 1.5 1997/09/08 13:37:47 tg Exp
#
@@ -10,8 +10,7 @@ MAINTAINER= augustss@cs.chalmers.se
HOMEPAGE= http://sunsite.unc.edu/~cddb/xmmix/index.html
COMMENT= X interface to the audio mixer device
-USE_BUILDLINK_ONLY= yes
-USE_IMAKE= yes
+USE_IMAKE= yes
post-patch:
for file in ${WRKSRC}/XMmix.ad ${WRKSRC}/resource.h; do \
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 252d7436e36..69b3d1cb01d 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/02 08:17:10 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/22 17:38:57 jlam Exp $
DISTNAME= xmradio-1.0
CATEGORIES= audio
@@ -13,8 +13,7 @@ DEPENDS+= sox>=12.16:../sox
ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-i386 \
NetBSD-1.5_ALPHA-i386 NetBSD-1.[5-9]*-*
-USE_BUILDLINK_ONLY= YES
-USE_IMAKE= YES
+USE_IMAKE= YES
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmradio
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index af43f47d537..050c9985005 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/02 22:07:04 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/22 17:38:57 jlam Exp $
DISTNAME= xinvest-2.6
CATEGORIES= finance x11
@@ -9,7 +9,6 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://sunsite.dk/xinvest/xinvest.html
COMMENT= Personal finance tracking and performance tool
-USE_BUILDLINK_ONLY= YES
USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 4ba320863ee..3b32f1b12c0 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/02 22:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/22 17:38:57 jlam Exp $
DISTNAME= xquote-2.2
CATEGORIES= finance x11
@@ -9,7 +9,6 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://sunsite.dk/xinvest/xquote.html
COMMENT= WWW ticker symbol quote retrieval program
-USE_BUILDLINK_ONLY= YES
USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index d2e339a1203..e8ae800022d 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/30 11:56:20 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/22 17:38:58 jlam Exp $
#
DISTNAME= xsoldier-0.96
@@ -9,7 +9,6 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.surfline.ne.jp/hachi/xsoldier.html
COMMENT= Updated xgalaga type game with awesome graphics
-USE_BUILDLINK_ONLY= YES
USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index f78875c8fe0..e3451bb867f 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/07/31 05:27:30 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/08/22 17:38:58 jlam Exp $
DISTNAME= magicpoint-1.08a
CATEGORIES= x11 graphics
@@ -10,7 +10,6 @@ COMMENT= X11 based presentation tool
CONFLICTS= mgp-*
-USE_BUILDLINK_ONLY= yes
GNU_CONFIGURE= yes
USE_IMAKE= yes
CONFIGURE_ARGS+= --enable-freetype-charset16
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 194c6f6f66d..24830834a2a 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/07/18 20:26:21 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.33 2001/08/22 17:38:58 jlam Exp $
#
DISTNAME= tgif-4.1.40
@@ -11,7 +11,6 @@ MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://bourbon.cs.umd.edu:8001/tgif/tgif.html
COMMENT= Fully-featured X11 drawing program
-USE_BUILDLINK_ONLY= yes
USE_IMAKE= yes
USE_X11= yes
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index f82a0c48a09..5f64fb9f5a5 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2001/08/22 14:53:48 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/08/22 17:38:58 jlam Exp $
#
DISTNAME= xart19980415
PKGNAME= xart-19980415nb1
+WRKSRC= ${WRKDIR}/19980415
CATEGORIES= graphics x11
MASTER_SITES= http://linux01.gwdg.de/~rhohen/linux/
EXTRACT_SUFX= .tgz
@@ -11,11 +12,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://linux01.gwdg.de/~rhohen/linux.html
COMMENT= Paint program (enhanced xpaint)
-USE_BUILDLINK_ONLY=YES
USE_IMAKE= YES
-WRKSRC= ${WRKDIR}/19980415
-
post-extract:
${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
${FIND} ${WRKSRC} -type f -print | ${XARGS} ${CHMOD} 644
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 5386e0b5784..781dd69aaf6 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/08/09 01:40:53 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/22 17:38:58 jlam Exp $
DISTNAME= xli-1.16nb1
CATEGORIES= graphics x11
@@ -10,9 +10,8 @@ DISTFILES= xli.1.16.tar.gz \
MAINTAINER= packages@netbsd.org
COMMENT= Version of xloadimage, an X11 Image Loading Utility
-USE_BUILDLINK_ONLY= YES
-NO_WRKSUBDIR= YES
-USE_IMAKE= YES
+NO_WRKSUBDIR= YES
+USE_IMAKE= YES
pre-patch:
@${PATCH} -d ${WRKSRC} -s -p1 < ${WRKSRC}/png.patch
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index a084a633df0..62bc5e4e2d1 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/08/08 07:15:03 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/08/22 17:38:59 jlam Exp $
DISTNAME= xpm-3.4k
CATEGORIES= graphics x11
@@ -8,7 +8,6 @@ MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.inria.fr/koala/lehors/xpm.html
COMMENT= The X Pixmap library
-USE_BUILDLINK_ONLY= # defined
USE_IMAKE= # defined
CHECK_XPM= # defined
diff --git a/misc/xrolodex/Makefile b/misc/xrolodex/Makefile
index bcdc9e5ef2f..cc201ee0962 100644
--- a/misc/xrolodex/Makefile
+++ b/misc/xrolodex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/03 01:28:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/22 17:38:59 jlam Exp $
DISTNAME= xrolodex.1.5.motif
PKGNAME= xrolodex-1.5
@@ -11,7 +11,6 @@ COMMENT= Motif/X11 rolodex application
WRKSRC= ${WRKDIR}/xrolodex.15
MAKE_ENV+= XMLIB='-lXm'
-USE_BUILDLINK_ONLY= yes
USE_IMAKE= yes
.include "../../x11/lesstif/buildlink.mk"
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 28cc300d3f2..f584f621493 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/07/14 02:41:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/22 17:38:59 jlam Exp $
DISTNAME= ${PKGNAME:S/-/_/}
PKGNAME= xbattbar-1.4.2
@@ -10,9 +10,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://infonet.aist-nara.ac.jp/member/suguru/xbattbar.html
COMMENT= X11 battery graph for laptops
-USE_BUILDLINK_ONLY= # defined
-USE_X11BASE= # defined
-USE_IMAKE= # defined
+USE_X11BASE= # defined
+USE_IMAKE= # defined
.if !exists(/usr/include/machine/apmvar.h)
IGNORE+= "APM is not available for ${MACHINE_PLATFORM}"
diff --git a/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile
index 2a167e15790..bcd70bb24c0 100644
--- a/time/asclock-xlib/Makefile
+++ b/time/asclock-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/16 10:41:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/22 17:38:59 jlam Exp $
#
DISTNAME= asclock-xlib-2.0.11
@@ -12,9 +12,8 @@ COMMENT= dockable clock and calendar with themes for X11
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-USE_BUILDLINK_ONLY= YES
-USE_IMAKE= YES
-USE_X11BASE= YES
+USE_IMAKE= YES
+USE_X11BASE= YES
PLIST_SRC= ${PKGDIR}/PLIST \
${PKGDIR}/PLIST.themes
diff --git a/time/asclock/Makefile b/time/asclock/Makefile
index d3d4f91a813..b03006feacf 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/07/16 10:41:18 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/22 17:38:59 jlam Exp $
DISTNAME= asclock-classic-1.0
PKGNAME= asclock-1.0
@@ -10,9 +10,8 @@ COMMENT= NeXTstep-like clock and calendar
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-USE_BUILDLINK_ONLY= YES
-USE_IMAKE= YES
-USE_X11BASE= YES
+USE_IMAKE= YES
+USE_X11BASE= YES
LANGUAGES= en de pt nl no it sv es hu br fr cs ru uk sl id da
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index c820f38eb84..f655539ad7d 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/30 09:50:05 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/22 17:39:00 jlam Exp $
#
DISTNAME= ctwm-3.5
@@ -9,8 +9,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://woland.afti.nsu.ru/~reberger/xwinman/ctwm.html
COMMENT= Window manager with support for multiple virtual screens
-USE_BUILDLINK_ONLY= YES
-USE_IMAKE= YES
+USE_IMAKE= YES
.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/lwm/Makefile b/wm/lwm/Makefile
index e62cb105047..48fe42fd940 100644
--- a/wm/lwm/Makefile
+++ b/wm/lwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/30 10:07:08 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/22 17:39:00 jlam Exp $
#
DISTNAME= lwm
@@ -13,7 +13,6 @@ COMMENT= Lightweight Window Manager
DIST_SUBDIR= ${PKGNAME}
-USE_BUILDLINK_ONLY= YES
-USE_IMAKE= YES
+USE_IMAKE= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index e5bc9ab1668..15e45aeb27d 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2001/06/30 10:34:13 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/22 17:39:00 jlam Exp $
DISTNAME= tvtwm.pl11
PKGNAME= tvtwm-11
+WRKSRC= ${WRKDIR}/tvtwm
CATEGORIES= x11 wm
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=window_managers/}
MAINTAINER= packages@netbsd.org
COMMENT= Classic twm with virtual desktop support
-USE_BUILDLINK_ONLY= YES
-USE_IMAKE= YES
-
-WRKSRC= ${WRKDIR}/tvtwm
+USE_IMAKE= YES
.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/bsd.pkg.mk"