diff options
| -rw-r--r-- | lang/lua/Makefile | 21 | ||||
| -rw-r--r-- | lang/lua/distinfo | 4 | ||||
| -rw-r--r-- | lang/lua/patches/patch-aa | 20 | ||||
| -rw-r--r-- | multimedia/libdvdcss/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/libogg/Makefile | 3 |
5 files changed, 29 insertions, 23 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile index 9ebe2f13c98..d5ea0737ed3 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/09/06 14:58:00 abs Exp $ +# $NetBSD: Makefile,v 1.32 2006/11/03 06:46:21 joerg Exp $ DISTNAME= lua-5.1.1 PKGREVISION= 1 @@ -21,6 +21,7 @@ HOMEPAGE= http://www.lua.org/ COMMENT= Powerful light-weight language for extending applications PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes USE_TOOLS+= gmake @@ -49,27 +50,27 @@ SUBST_SED.pc-prefix+= -e "s,/usr/local,${PREFIX}," SUBST_STAGE.pc-prefix+= post-build post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} set -e; \ cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do \ - ${INSTALL_DATA} "$$f" ${DOCDIR}; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \ done set -e; \ cd ${WRKSRC}/doc; for f in *.html *.gif; do \ - ${INSTALL_DATA} "$$f" ${DOCDIR}; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \ done - ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} set -e; \ cd ${WRKSRC}/test; for f in README *.lua; do \ - ${INSTALL_DATA} "$$f" ${EGDIR}; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}; \ done - ${INSTALL_DATA_DIR} ${EGDIR}/etc + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc set -e; \ cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \ - ${INSTALL_DATA} "$$f" ${EGDIR}/etc; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/lib/pkgconfig + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" diff --git a/lang/lua/distinfo b/lang/lua/distinfo index a18356dc16b..bbc7f422af9 100644 --- a/lang/lua/distinfo +++ b/lang/lua/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.17 2006/09/06 14:58:00 abs Exp $ +$NetBSD: distinfo,v 1.18 2006/11/03 06:46:21 joerg Exp $ SHA1 (lua-5.1.1.tar.gz) = be13878ceef8e1ee7a4201261f0adf09f89f1005 RMD160 (lua-5.1.1.tar.gz) = 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c Size (lua-5.1.1.tar.gz) = 207810 bytes -SHA1 (patch-aa) = 089b2f33ec8263a18ec823fd8d75d6e734003b06 +SHA1 (patch-aa) = 9440cceaf69d0db3883b08c857879631a915e93e SHA1 (patch-ab) = 2ea6ab36420c886b73ce3ad7494b34a2100eee4d diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa index eff59483ff0..fcfa9a3fa7b 100644 --- a/lang/lua/patches/patch-aa +++ b/lang/lua/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.13 2006/09/02 19:22:32 rillig Exp $ +$NetBSD: patch-aa,v 1.14 2006/11/03 06:46:21 joerg Exp $ ---- Makefile.orig 2006-06-02 12:53:38.000000000 +0200 -+++ Makefile 2006-09-02 21:07:17.000000000 +0200 +--- Makefile.orig 2006-06-02 10:53:38.000000000 +0000 ++++ Makefile @@ -11,11 +11,11 @@ PLAT= none # if INSTALL_TOP is not an absolute path. (Man pages are installed from the # doc directory.) @@ -25,18 +25,20 @@ $NetBSD: patch-aa,v 1.13 2006/09/02 19:22:32 rillig Exp $ TO_MAN= lua.1 luac.1 # Lua version and release. -@@ -59,10 +59,10 @@ test: dummy +@@ -58,11 +58,11 @@ test: dummy + src/lua test/hello.lua install: dummy - cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) +- cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) - cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -+ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(INSTALL_BIN) -+ cd src && $(BSD_INSTALL_DATA) $(TO_INC) $(INSTALL_INC) -+ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(INSTALL_LIB) -+ cd doc && $(BSD_INSTALL_MAN) $(TO_MAN) $(INSTALL_MAN) ++ cd src && $(MKDIR) -p ${DESTDIR}$(INSTALL_BIN) ${DESTDIR}$(INSTALL_INC) ${DESTDIR}$(INSTALL_LIB) ${DESTDIR}$(INSTALL_MAN) ${DESTDIR}$(INSTALL_LMOD) ${DESTDIR}$(INSTALL_CMOD) ++ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) ${DESTDIR}$(INSTALL_BIN) ++ cd src && $(BSD_INSTALL_DATA) $(TO_INC) ${DESTDIR}$(INSTALL_INC) ++ cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) ${DESTDIR}$(INSTALL_LIB) ++ cd doc && $(BSD_INSTALL_MAN) $(TO_MAN) ${DESTDIR}$(INSTALL_MAN) # $(RANLIB) $(INSTALL_LIB)/$(TO_LIB) local: diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile index 4f215d941ec..36ca9bc2b26 100644 --- a/multimedia/libdvdcss/Makefile +++ b/multimedia/libdvdcss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/10/11 16:47:44 dillo Exp $ +# $NetBSD: Makefile,v 1.15 2006/11/03 06:55:40 joerg Exp $ # # In order to ensure compliance with U.S. and international law, please # do not modify this file to provide pointers to the source or homepage @@ -14,6 +14,8 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= ${LIBDVDCSS_HOMEPAGE} COMMENT= Simple library designed for accessing DVDs +PKG_DESTDIR_SUPPORT= user-destdir + RESTRICTED= Legal problems due to CSS code # no source because of the CSS source code in it diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile index 09823632d49..ffeb86d6291 100644 --- a/multimedia/libogg/Makefile +++ b/multimedia/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/06/15 13:38:51 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2006/11/03 06:55:40 joerg Exp $ # DISTNAME= libogg-1.1.3 @@ -10,6 +10,7 @@ HOMEPAGE= http://www.xiph.org/ogg/ COMMENT= Ogg project codecs library PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= pkg-config GNU_CONFIGURE= YES |