diff options
| author | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
| commit | f1323b234ca20824755b76198612200030970f1a (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /x11/xteddy | |
| parent | be19eefa6c1513ef751e213c6afbe76404f3ced2 (diff) | |
| download | pkgsrc-f1323b234ca20824755b76198612200030970f1a.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'x11/xteddy')
| -rw-r--r-- | x11/xteddy/Makefile | 6 | ||||
| -rw-r--r-- | x11/xteddy/distinfo | 4 | ||||
| -rw-r--r-- | x11/xteddy/patches/patch-aa | 13 |
3 files changed, 14 insertions, 9 deletions
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile index 95812e32efc..56568ad88a2 100644 --- a/x11/xteddy/Makefile +++ b/x11/xteddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/07/09 15:43:14 zuntum Exp $ +# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:32 jlam Exp $ DISTNAME= xteddy-1.1 CATEGORIES= x11 games @@ -9,12 +9,12 @@ HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy COMMENT= Xteddy is a cuddly teddy bear for your X Windows desktop USE_BUILDLINK_ONLY= YES -USE_X11= YES -GNU_CONFIGURE= 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 "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy/distinfo b/x11/xteddy/distinfo index fb0c257fd92..6c29fe8263c 100644 --- a/x11/xteddy/distinfo +++ b/x11/xteddy/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:08:00 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/08/29 22:41:32 jlam Exp $ SHA1 (xteddy-1.1.tar.gz) = a681923333a4e2b2112290d601c167fd7e8e1302 Size (xteddy-1.1.tar.gz) = 117141 bytes -SHA1 (patch-aa) = 335b204442c48616121e6d7d82ffa0ae5b6f9199 +SHA1 (patch-aa) = d90f5121cfdbb28f8a1eb960c405c460de163430 SHA1 (patch-ab) = 260f836f4aab651c72caebac821e497b54d72cbd diff --git a/x11/xteddy/patches/patch-aa b/x11/xteddy/patches/patch-aa index aa4e702d0b8..ae1789c3dc7 100644 --- a/x11/xteddy/patches/patch-aa +++ b/x11/xteddy/patches/patch-aa @@ -1,8 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/10/15 01:01:46 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $ ---- Makefile.in.orig Fri Oct 15 02:30:18 1999 -+++ Makefile.in Fri Oct 15 02:31:37 1999 -@@ -74,7 +74,7 @@ +--- Makefile.in.orig Thu Oct 29 03:01:17 1998 ++++ Makefile.in +@@ -70,11 +70,11 @@ + xteddy_SOURCES = xteddy.c + 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} LIBS = -lX11 -lXext -lXpm man_MANS = xteddy.1 |