diff options
author | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
commit | b6b94f0c669b1ef2a824c69854900b68ec821681 (patch) | |
tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11/aterm | |
parent | ac9820da6cdeb5833fdaf2717a1633972572c5de (diff) | |
download | pkgsrc-b6b94f0c669b1ef2a824c69854900b68ec821681.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/aterm')
-rw-r--r-- | x11/aterm/Makefile | 24 | ||||
-rw-r--r-- | x11/aterm/distinfo | 2 | ||||
-rw-r--r-- | x11/aterm/patches/patch-ac | 2 | ||||
-rw-r--r-- | x11/aterm/patches/patch-ad | 2 | ||||
-rw-r--r-- | x11/aterm/patches/patch-ae | 2 |
5 files changed, 17 insertions, 15 deletions
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index edf76658970..d045f2876cf 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/08/03 13:00:28 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:52:30 jlam Exp $ # DISTNAME= aterm-0.4.2 @@ -10,7 +10,8 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://aterm.sourceforge.net/ COMMENT= aterm (Afterstep XVT) - a VT102 emulator for the X window system -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-background-image \ --enable-transparency \ @@ -21,18 +22,19 @@ CONFIGURE_ARGS+=--enable-background-image \ --enable-big5 \ --enable-greek \ --with-xpm \ - --with-xpm-includes=${BUILDLINK_DIR}/include \ - --with-xpm-library=${BUILDLINK_DIR}/lib \ + --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include \ + --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib \ --with-jpeg \ - --with-jpeg-includes=${BUILDLINK_DIR}/include \ - --with-jpeg-library=${BUILDLINK_DIR}/lib \ + --with-jpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \ + --with-jpeg-library=${BUILDLINK_PREFIX.jpeg}/lib \ --with-png \ - --with-png-library=${BUILDLINK_DIR}/lib \ - --with-png-includes=${BUILDLINK_DIR}/include \ + --with-png-library=${BUILDLINK_PREFIX.png}/lib \ + --with-png-includes=${BUILDLINK_PREFIX.png}/include \ --enable-utmp \ --enable-wtmp -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo index b791bc81a6c..2611c020359 100644 --- a/x11/aterm/distinfo +++ b/x11/aterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/03 13:00:29 hubertf Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:30 jlam Exp $ SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b Size (aterm-0.4.2.tar.gz) = 312730 bytes diff --git a/x11/aterm/patches/patch-ac b/x11/aterm/patches/patch-ac index 37433df93ac..56d9b1d1dfb 100644 --- a/x11/aterm/patches/patch-ac +++ b/x11/aterm/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2002/05/12 21:21:32 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2002/08/25 21:52:30 jlam Exp $ --- src/utmp.c.orig Sat May 4 08:40:45 2002 +++ src/utmp.c diff --git a/x11/aterm/patches/patch-ad b/x11/aterm/patches/patch-ad index 67addf493fa..a67602d4fc6 100644 --- a/x11/aterm/patches/patch-ad +++ b/x11/aterm/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/05/12 21:21:32 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 21:52:31 jlam Exp $ --- src/rxvt.h.orig Sat May 4 08:47:56 2002 +++ src/rxvt.h diff --git a/x11/aterm/patches/patch-ae b/x11/aterm/patches/patch-ae index 7ba1b0bf572..f4d91f2708e 100644 --- a/x11/aterm/patches/patch-ae +++ b/x11/aterm/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 2002/08/03 13:00:30 hubertf Exp $ +$NetBSD: patch-ae,v 1.2 2002/08/25 21:52:31 jlam Exp $ --- src/command.c.orig Thu Sep 6 18:38:07 2001 +++ src/command.c |