diff options
author | dholland <dholland@pkgsrc.org> | 2011-10-02 23:50:56 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2011-10-02 23:50:56 +0000 |
commit | 0f3df082bb8694af7714ef9be11280a9fc8d38ae (patch) | |
tree | d9d84ef1a6e795c5eab7b5f89728d857956cbe26 /devel/elfsh/Makefile | |
parent | 36a55abee4b68b62c5e6bc73a34ebfbf850de4f0 (diff) | |
download | pkgsrc-0f3df082bb8694af7714ef9be11280a9fc8d38ae.tar.gz |
- Work around symbol name conflict with dprintf in current.
- The makefile's substitution of PREFIX and SH accidentally got rolled
into patch-ac at some point and thereby hardcoded. Since all patch-ac
was doing was setting these, make the substitution work without a
patch and remove patch-ac entirely.
- Commit some LP64 fixes I've had sitting in my tree since 2008 for
some reason.
- Fix some pkglint.
- PKGREVISION -> 4.
Diffstat (limited to 'devel/elfsh/Makefile')
-rw-r--r-- | devel/elfsh/Makefile | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile index e08f010b771..fdf7c19bd2a 100644 --- a/devel/elfsh/Makefile +++ b/devel/elfsh/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2010/03/17 15:32:18 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2011/10/02 23:50:56 dholland Exp $ # VERS= 0.51b3 DISTNAME= elfsh-${VERS}-portable PKGNAME= elfsh-${VERS} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= http://elfsh.asgardlabs.org/files/ EXTRACT_SUFX= .tgz @@ -22,26 +22,33 @@ USE_GNU_READLINE= yes SUBST_CLASSES+= elfsh SUBST_STAGE.elfsh= post-patch -SUBST_MESSAGE.elfsh= Filling placeholders. +SUBST_MESSAGE.elfsh= Fixing hardcoded paths. SUBST_FILES.elfsh= vm/include/elfsh.h -SUBST_SED.elfsh= -e s,@@SH@@,${SH}, -SUBST_SED.elfsh+= -e s,@@PREFIX@@,${PREFIX}, +SUBST_SED.elfsh= -e '/ELFSH_SHELL/s,/bin/bash,${SH},' +SUBST_SED.elfsh+= -e '/ELFSH_MODPATH/s,/usr/share/,${PREFIX}/lib/,' # XXX This package should be converted to use libtool INSTALLATION_DIRS= bin include lib do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vm/elfsh ${DESTDIR:Q}${PREFIX:Q}/bin/elfsh - ${INSTALL_DATA} ${WRKSRC}/libelfsh/libelfsh.a ${DESTDIR:Q}${PREFIX:Q}/lib/libelfsh.a - ${INSTALL_DATA} ${WRKSRC}/libelfsh/libelfsh.so ${DESTDIR:Q}${PREFIX:Q}/lib/libelfsh.so - ${INSTALL_DATA} ${WRKSRC}/libelfsh/include/libelfsh.h ${DESTDIR:Q}${PREFIX:Q}/include/libelfsh.h - ${INSTALL_DATA_DIR} ${DESTDIR:Q}${PREFIX:Q}/lib/elfsh - ${INSTALL_DATA} ${WRKSRC}/modules/modremap.so ${DESTDIR:Q}${PREFIX:Q}/lib/elfsh - ${INSTALL_DATA} ${WRKSRC}/modules/modtest.so ${DESTDIR:Q}${PREFIX:Q}/lib/elfsh - ${INSTALL_DATA_DIR} ${DESTDIR:Q}${PREFIX:Q}/share/doc/elfsh - ${INSTALL_DATA} ${WRKSRC}/doc/elfsh-ref.txt ${DESTDIR:Q}${PREFIX:Q}/share/doc/elfsh/elfsh-ref.txt - ${INSTALL_DATA} ${WRKSRC}/doc/libelfsh-ref.txt ${DESTDIR:Q}${PREFIX:Q}/share/doc/elfsh/libelfsh-ref.txt + ${INSTALL_PROGRAM} ${WRKSRC}/vm/elfsh ${DESTDIR}${PREFIX}/bin/elfsh + ${INSTALL_DATA} ${WRKSRC}/libelfsh/libelfsh.a \ + ${DESTDIR}${PREFIX}/lib/libelfsh.a + ${INSTALL_DATA} ${WRKSRC}/libelfsh/libelfsh.so \ + ${DESTDIR}${PREFIX}/lib/libelfsh.so + ${INSTALL_DATA} ${WRKSRC}/libelfsh/include/libelfsh.h \ + ${DESTDIR}${PREFIX}/include/libelfsh.h + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/elfsh + ${INSTALL_DATA} ${WRKSRC}/modules/modremap.so \ + ${DESTDIR}${PREFIX}/lib/elfsh + ${INSTALL_DATA} ${WRKSRC}/modules/modtest.so \ + ${DESTDIR}${PREFIX}/lib/elfsh + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/elfsh + ${INSTALL_DATA} ${WRKSRC}/doc/elfsh-ref.txt \ + ${DESTDIR}${PREFIX}/share/doc/elfsh/elfsh-ref.txt + ${INSTALL_DATA} ${WRKSRC}/doc/libelfsh-ref.txt \ + ${DESTDIR}${PREFIX}/share/doc/elfsh/libelfsh-ref.txt .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |