diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11/xteddy | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/xteddy')
| -rw-r--r-- | x11/xteddy/Makefile | 11 | ||||
| -rw-r--r-- | x11/xteddy/distinfo | 4 | ||||
| -rw-r--r-- | x11/xteddy/patches/patch-aa | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile index 4a383276cde..10aed358f6a 100644 --- a/x11/xteddy/Makefile +++ b/x11/xteddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:52:57 jlam Exp $ DISTNAME= xteddy-1.1 CATEGORIES= x11 games @@ -8,13 +8,14 @@ MAINTAINER= johnam@mail.kemper.org HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy COMMENT= Xteddy is a cuddly teddy bear for your X Windows desktop -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES +GNU_CONFIGURE= YES pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy/distinfo b/x11/xteddy/distinfo index 6c29fe8263c..625448aa464 100644 --- a/x11/xteddy/distinfo +++ b/x11/xteddy/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/08/29 22:41:32 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:52:57 jlam Exp $ SHA1 (xteddy-1.1.tar.gz) = a681923333a4e2b2112290d601c167fd7e8e1302 Size (xteddy-1.1.tar.gz) = 117141 bytes -SHA1 (patch-aa) = d90f5121cfdbb28f8a1eb960c405c460de163430 +SHA1 (patch-aa) = b77f0b43a999f54b28602ab1fb66ed320a5632c1 SHA1 (patch-ab) = 260f836f4aab651c72caebac821e497b54d72cbd diff --git a/x11/xteddy/patches/patch-aa b/x11/xteddy/patches/patch-aa index ae1789c3dc7..fcaac15e8c1 100644 --- a/x11/xteddy/patches/patch-aa +++ b/x11/xteddy/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/08/25 21:52:58 jlam Exp $ --- Makefile.in.orig Thu Oct 29 03:01:17 1998 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $ HTML_DOC = html/xteddy.html html/xteddy_info.html \ html/images/noise.jpg html/images/xteddy.gif html/images/xteddy.xbm -xteddy_LDADD = -L/usr/X11R6/lib -+xteddy_LDADD = -L${BUILDLINK_X11_DIR} ++xteddy_LDADD = -L${X11BASE}/lib LIBS = -lX11 -lXext -lXpm man_MANS = xteddy.1 |