summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-23 04:26:51 +0000
committerjlam <jlam>2001-08-23 04:26:51 +0000
commit3da39f02782d99195f49d4edb3348780a024f4fa (patch)
tree4bfa8b36ce531fe4f0f7472d5fdff888abf4b533 /time
parent2b3a25f294c80ee47c2837b7690b8b49227dd6ad (diff)
downloadpkgsrc-3da39f02782d99195f49d4edb3348780a024f4fa.tar.gz
Move per-package default XAW_TYPE setting above the inclusion of
bsd.prefs.mk so that it is actually used. Where possible, include xaw.buildlink.mk instead of setting USE_XAW, and use LIBXAW where needed.
Diffstat (limited to 'time')
-rw-r--r--time/emiclock/Makefile4
-rw-r--r--time/emiclock/distinfo4
-rw-r--r--time/emiclock/patches/patch-ad17
3 files changed, 17 insertions, 8 deletions
diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index a6cc1cc666c..9a28c45a904 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/04 18:40:57 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/23 04:26:54 jlam Exp $
#
DISTNAME= emiclock-2.0.2
@@ -17,7 +17,6 @@ NO_BIN_ON_CDROM=${RESTRICTED}
USE_X11BASE= yes
USE_IMAKE= yes
-USE_XAW= yes
.include "../../mk/bsd.prefs.mk"
@@ -34,4 +33,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \
${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
+.include "../../mk/xaw.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo
index d9e75e7c0d5..9acae24fdb6 100644
--- a/time/emiclock/distinfo
+++ b/time/emiclock/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:12 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/23 04:26:54 jlam Exp $
SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1
Size (emiclock-2.0.2.tar.gz) = 308682 bytes
SHA1 (patch-aa) = 082873291d05709ecc392a3e6295078065aa1d30
SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b
SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690
-SHA1 (patch-ad) = 619c24b92346dad1b5bf6e23c3d02153aa972694
+SHA1 (patch-ad) = 21ddc7456641bf5a4c50b8d6f04b2874378cd868
SHA1 (patch-ae) = 75250a553700eeacd5fcc6f71ed4477541cab6c0
diff --git a/time/emiclock/patches/patch-ad b/time/emiclock/patches/patch-ad
index c35034d96d6..d2f0fd222da 100644
--- a/time/emiclock/patches/patch-ad
+++ b/time/emiclock/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/17 23:32:18 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2001/08/23 04:26:55 jlam Exp $
---- Imakefile.orig Sat Jan 11 11:35:42 1997
-+++ Imakefile Sun May 23 10:21:04 1999
-@@ -108,6 +108,11 @@
+--- Imakefile.orig Thu Sep 2 10:33:47 1999
++++ Imakefile
+@@ -106,6 +106,11 @@
#define StartupSound myu.au
#endif /* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */
@@ -14,3 +14,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/17 23:32:18 wiz Exp $
#else /* USE_NETAUDIO */
/* netaudio (NCDaudio) */
+@@ -143,7 +148,7 @@
+ LOCAL_LIBRARIES = XawClientLibs
+ # ifdef USE_XAW3D
+ DEPXAWLIB = $(USRLIBDIR)/libXaw3d.a
+- XAWLIB = -lXaw3d
++ XAWLIB = ${LIBXAW}
+ # endif /* USE_XAW3D */
+
+ SYS_LIBRARIES = SoundLibrary -lm