diff options
| author | zuntum <zuntum@pkgsrc.org> | 2001-06-29 13:58:52 +0000 |
|---|---|---|
| committer | zuntum <zuntum@pkgsrc.org> | 2001-06-29 13:58:52 +0000 |
| commit | 2ff54f8a7236c279c7e4d45c41f673421792eca0 (patch) | |
| tree | de08532308a332cef933482be7a73b46a6778ceb | |
| parent | d64d7b4ed56208f0ac6299d9696d140fb7bb2eb7 (diff) | |
| download | pkgsrc-2ff54f8a7236c279c7e4d45c41f673421792eca0.tar.gz | |
Converted to use buildlink.mk
| -rw-r--r-- | devel/libdockapp/Makefile | 5 | ||||
| -rw-r--r-- | x11/xpmroot/Makefile | 8 | ||||
| -rw-r--r-- | x11/xpmroot/distinfo | 5 | ||||
| -rw-r--r-- | x11/xpmroot/patches/patch-ab | 8 |
4 files changed, 12 insertions, 14 deletions
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile index 4a3de9d62a3..39bcaabff5d 100644 --- a/devel/libdockapp/Makefile +++ b/devel/libdockapp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/12 17:10:35 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/29 14:04:30 zuntum Exp $ # DISTNAME= libdockapp-0.4.0 @@ -9,14 +9,15 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://shadowmere.student.utwente.nl/ COMMENT= simple library to create dockapps for WindowMaker +USE_BULDLINK_ONLY= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_X11= YES -USE_XPM= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp +.include "../../graphics/xpm/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index 63d906db1c9..e1adc1c1550 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/05/31 09:11:00 dent Exp $ +# $NetBSD: Makefile,v 1.16 2001/06/29 13:58:52 zuntum Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -15,15 +15,13 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.fvwm.org/generated/manpages/xpmroot.html COMMENT= Sets the root window to an Xpm pixmap +USE_BUILDLINK_ONLY= YES USE_X11BASE= YES -USE_XPM= YES WRKSRC= ${WRKDIR}/${DISTNAME}/utils -EVAL_PREFIX= XPMDIR=xpm - MAKE_ENV+= INSTALL_PROGRAM='${INSTALL_PROGRAM}' MAKE_ENV+= INSTALL_MAN='${INSTALL_MAN}' MAKE_ENV+= VERSION=${PKG_VERSION} -MAKE_ENV+= XPMDIR=${XPMDIR} +.include "../../graphics/xpm/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo index 27c944f28e3..a23cb9ab1af 100644 --- a/x11/xpmroot/distinfo +++ b/x11/xpmroot/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2001/04/17 12:16:16 agc Exp $ +$NetBSD: distinfo,v 1.2 2001/06/29 13:58:52 zuntum Exp $ SHA1 (fvwm-2.2.5.tar.gz) = 2cb0c6dbd1a361987a301956315d9f3b9a68f78b +Size (fvwm-2.2.5.tar.gz) = 1080046 bytes SHA1 (patch-aa) = 0942aa827c56def48c44e71f81f7678db6ff8192 -SHA1 (patch-ab) = 593f24232ab61531ac8797e79a672ae8bdc12632 +SHA1 (patch-ab) = bc7424b13dbe85e2fa4949280e4242dba86af4b1 diff --git a/x11/xpmroot/patches/patch-ab b/x11/xpmroot/patches/patch-ab index a3910822211..b55ed3af72e 100644 --- a/x11/xpmroot/patches/patch-ab +++ b/x11/xpmroot/patches/patch-ab @@ -1,13 +1,11 @@ -$NetBSD: patch-ab,v 1.3 2000/07/22 10:05:48 jlam Exp $ - ---- /dev/null Sat Jul 22 05:53:21 2000 -+++ Makefile Sat Jul 22 05:53:02 2000 +--- /dev/null Fri Jun 29 12:54:37 2001 ++++ Makefile Fri Jun 29 12:55:05 2001 @@ -0,0 +1,15 @@ +#CFLAGS+= -ggdb +CFLAGS+= -O2 + +CPPFLAGS+= -DVERSION=\"${VERSION}\" -+CPPFLAGS+= -I${X11BASE}/include -I${XPMDIR}/include ++CPPFLAGS+= -I${X11BASE}/include + +LDFLAGS+= -L${X11BASE}/lib + |