summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--time/asclock-gtk/Makefile13
-rw-r--r--time/asclock-gtk/distinfo4
-rw-r--r--time/asclock-gtk/patches/patch-aa4
3 files changed, 10 insertions, 11 deletions
diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile
index 171c9d93eef..df2b3dda7b5 100644
--- a/time/asclock-gtk/Makefile
+++ b/time/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/16 00:36:33 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/07/16 00:52:51 jlam Exp $
#
DISTNAME= asclock-gtk-2.1.10beta
@@ -10,17 +10,15 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} # www.asclock.org is no more
MAINTAINER= jlam@netbsd.org
COMMENT= dockable clock and calendar with themes for GTK+
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
-
-USE_X11BASE= yes
+USE_BUILDLINK_ONLY= # defined
+USE_CONFIG_WRAPPER= # defined
+USE_X11BASE= # defined
PLIST_SRC= ${PKGDIR}/PLIST \
${PKGDIR}/PLIST.themes
ALL_TARGET= asclock
-
-EVAL_PREFIX+= GTKDIR=gtk+
-MAKE_ENV+= CONFIG_PATH="${GTKDIR}/bin/" # for gtk-config
+MAKE_ENV+= CONFIG_PATH="${BUILDLINK_DIR}/bin/" # for gtk-config
pre-configure:
cd ${WRKSRC}; ${LN} -sf themes/classic default_theme
@@ -37,4 +35,5 @@ do-install:
${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-gtk
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk
+.include "../../x11/gtk/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/asclock-gtk/distinfo b/time/asclock-gtk/distinfo
index e1bc11051d7..015a22c1db2 100644
--- a/time/asclock-gtk/distinfo
+++ b/time/asclock-gtk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/16 00:52:51 jlam Exp $
SHA1 (asclock-gtk-2.1.10beta.tar.gz) = 07b5f570842bf734ec5aff4d4f64fa075e9c1823
Size (asclock-gtk-2.1.10beta.tar.gz) = 146621 bytes
-SHA1 (patch-aa) = 9add6e7862a9cf61be94221fea3c44e6bd630c9b
+SHA1 (patch-aa) = 6a708158cbee89c57d520c7e609ee5535f64e10f
diff --git a/time/asclock-gtk/patches/patch-aa b/time/asclock-gtk/patches/patch-aa
index 81f5d13b557..183fa255333 100644
--- a/time/asclock-gtk/patches/patch-aa
+++ b/time/asclock-gtk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:13 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/16 00:52:52 jlam Exp $
--- ./Makefile.orig Fri Mar 26 02:08:33 1999
+++ ./Makefile Thu Oct 7 04:41:07 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:13 wiz Exp $
MKDIR=mkdir -p
-CFLAGS = -Wall -g
-+CFLAGS = -Wall
++CFLAGS += -Wall
-GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
+GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock-gtk/"\" \