Sat May 30 16:08:58 2009 UTC ()
Unbreak shared library loading for cases when mk.conf explicitly sets
CFLAGS. Bump revision.


(joerg)
diff -r1.41 -r1.42 pkgsrc/lang/lua/Makefile
cvs diff -r1.41 -r1.42 pkgsrc/lang/lua/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/lua/Attic/Makefile 2009/05/20 00:58:19 1.41
+++ pkgsrc/lang/lua/Attic/Makefile 2009/05/30 16:08:58 1.42
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1# $NetBSD: Makefile,v 1.41 2009/05/20 00:58:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.42 2009/05/30 16:08:58 joerg Exp $
2 2
3DISTNAME= lua-${LUA_VERSION} 3DISTNAME= lua-${LUA_VERSION}
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ 6MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
7 ftp://ftp.gwdg.de/pub/languages/lua/ \ 7 ftp://ftp.gwdg.de/pub/languages/lua/ \
8 ftp://ftp.u-aizu.ac.jp/pub/lang/lua/ \ 8 ftp://ftp.u-aizu.ac.jp/pub/lang/lua/ \
9 ftp://ftp.chg.ru/pub/lang/lua/ \ 9 ftp://ftp.chg.ru/pub/lang/lua/ \
10 http://www.lua.org/ftp/ \ 10 http://www.lua.org/ftp/ \
11 http://www.tecgraf.puc-rio.br/lua/ftp/ \ 11 http://www.tecgraf.puc-rio.br/lua/ftp/ \
12 http://ftp.gwdg.de/pub/languages/lua/ \ 12 http://ftp.gwdg.de/pub/languages/lua/ \
13 http://mirrors.sunsite.dk/lua/ \ 13 http://mirrors.sunsite.dk/lua/ \
14 http://ftp.chg.ru/pub/lang/lua/ 14 http://ftp.chg.ru/pub/lang/lua/
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://www.lua.org/ 17HOMEPAGE= http://www.lua.org/
18COMMENT= Powerful light-weight language for extending applications 18COMMENT= Powerful light-weight language for extending applications
19 19
20.include "../../lang/lua/version.mk" 20.include "../../lang/lua/version.mk"
21 21
22PKG_INSTALLATION_TYPES= overwrite pkgviews 22PKG_INSTALLATION_TYPES= overwrite pkgviews
23PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
24 24
 25.include "../../mk/bsd.prefs.mk"
 26
25USE_LIBTOOL= yes 27USE_LIBTOOL= yes
26USE_TOOLS+= gmake 28USE_TOOLS+= gmake
27MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q} 29MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
28MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} 30MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
29CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\" 31CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\"
30 32
31DOCDIR= ${PREFIX}/share/doc/lua 33DOCDIR= ${PREFIX}/share/doc/lua
32EGDIR= ${PREFIX}/share/examples/lua 34EGDIR= ${PREFIX}/share/examples/lua
33 35
34.include "../../mk/bsd.prefs.mk" 
35 
36.if ${OPSYS} == "FreeBSD" 36.if ${OPSYS} == "FreeBSD"
37BUILD_TARGET= freebsd 37BUILD_TARGET= freebsd
38.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" 38.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly"
39BUILD_TARGET= bsd 39BUILD_TARGET= bsd
40.elif ${OPSYS} == "Linux" 40.elif ${OPSYS} == "Linux"
41BUILD_TARGET= linux 41BUILD_TARGET= linux
42.elif ${OPSYS} == "Darwin" 42.elif ${OPSYS} == "Darwin"
43BUILD_TARGET= macosx 43BUILD_TARGET= macosx
44.elif ${OPSYS} == "SunOS" 44.elif ${OPSYS} == "SunOS"
45BUILD_TARGET= solaris 45BUILD_TARGET= solaris
46.elif ${OPSYS} == "AIX" 46.elif ${OPSYS} == "AIX"
47BUILD_TARGET= aix 47BUILD_TARGET= aix
48.else 48.else