diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-23 04:58:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-23 04:58:04 +0000 |
| commit | 7a8d4629b855e55f49d7c3a067f297c0672946b4 (patch) | |
| tree | ea4f9abdb9c54a63cca6d8916a7344c0f97c396b | |
| parent | 10a1961ddfd745acdd5027b445b468829646dbac (diff) | |
| download | pkgsrc-7a8d4629b855e55f49d7c3a067f297c0672946b4.tar.gz | |
Really make this package USE_BUILDLINK_ONLY. Also avoid code duplication
by using a shell loop to do the PREFIX substitutions.
| -rw-r--r-- | x11/xteddy2/Makefile | 33 | ||||
| -rw-r--r-- | x11/xteddy2/distinfo | 3 | ||||
| -rw-r--r-- | x11/xteddy2/patches/patch-ad | 13 |
3 files changed, 30 insertions, 19 deletions
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index ce2a08ed211..402fd1d230f 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/07/09 15:49:07 zuntum Exp $ +# $NetBSD: Makefile,v 1.6 2001/08/23 04:58:04 jlam Exp $ DISTNAME= xteddy-2.0.1 CATEGORIES= x11 games @@ -10,26 +10,23 @@ COMMENT= Teddy bear for your desktop CONFLICT+= xteddy-1.* -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= yes -USE_X11= yes +USE_BUILDLINK_ONLY= yes +GNU_CONFIGURE= yes +USE_X11= yes -CPPFLAGS+= -I${X11BASE}/include +CPPFLAGS+= -I${X11BASE}/include pre-configure: - ${SED} \ - -e 's|@PREFIX@|${PREFIX}|' \ - ${WRKSRC}/configure >${WRKSRC}/configure.new - ${MV} ${WRKSRC}/configure.new ${WRKSRC}/configure - ${CHMOD} 755 ${WRKSRC}/configure - ${SED} \ - -e 's|@PREFIX@|${PREFIX}|' \ - ${WRKSRC}/xteddy_test >${WRKSRC}/xteddy_test.new - ${MV} ${WRKSRC}/xteddy_test.new ${WRKSRC}/xteddy_test - ${SED} \ - -e 's|@PREFIX@|${PREFIX}|' \ - ${WRKSRC}/xtoys >${WRKSRC}/xtoys.new - ${MV} ${WRKSRC}/xtoys.new ${WRKSRC}/xtoys + files="configure xteddy_test xtoys"; \ + cd ${WRKSRC}; for file in $${files}; do \ + ${MV} $${file} $${file}.fixme; \ + ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ + $${file}.fixme >> $${file}; \ + if [ -x $${file}.fixme ]; then \ + ${CHMOD} +x $${file}; \ + fi; \ + ${RM} -f $${file}.fixme; \ + done .include "../../graphics/imlib/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy2/distinfo b/x11/xteddy2/distinfo index 406e809bd7c..75c258cbfc9 100644 --- a/x11/xteddy2/distinfo +++ b/x11/xteddy2/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:08:00 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/08/23 04:58:04 jlam Exp $ SHA1 (xteddy-2.0.1.tar.gz) = 371810d7a509cbf6ffd3a4d94c87412ae68022d8 Size (xteddy-2.0.1.tar.gz) = 348055 bytes SHA1 (patch-aa) = 69425a7ccae41c7852c2ccfed7d029a7b93ada6c SHA1 (patch-ab) = af66f8f31baf8581b7b9a115eab6f513cd0c5e5e SHA1 (patch-ac) = e1e5f5e716f70355cb092e726b0400d15601fd96 +SHA1 (patch-ad) = 3e58077f548cfceecc673d45c8d4ae1fa1d9c171 diff --git a/x11/xteddy2/patches/patch-ad b/x11/xteddy2/patches/patch-ad new file mode 100644 index 00000000000..d8afaabaf3f --- /dev/null +++ b/x11/xteddy2/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2001/08/23 04:58:04 jlam Exp $ + +--- Makefile.in.orig Mon Aug 2 02:11:08 1999 ++++ Makefile.in +@@ -69,7 +69,7 @@ + bin_PROGRAMS = xteddy + + xteddy_SOURCES = xteddy.c +-LIBS = `imlib-config --libs` ++LIBS = `${IMLIB_CONFIG} --libs` + man_MANS = xteddy.1 + bin_SCRIPTS = xtoys xteddy_test + |