diff options
| author | bapt <bapt@FreeBSD.org> | 2014-05-26 15:28:28 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-05-26 15:28:28 +0000 |
| commit | e6b8ed87b5e99e0ddfa7f575594f03f1992cf201 (patch) | |
| tree | 1485083919fd5b153bf056ea17ac895ea758a8a9 | |
| parent | 729d5d5ddb37fd2035af319a95b99466360a2e7e (diff) | |
| download | FreeBSD-ports-e6b8ed87b5e99e0ddfa7f575594f03f1992cf201.zip FreeBSD-ports-e6b8ed87b5e99e0ddfa7f575594f03f1992cf201.tar.gz | |
Replace lang/lua with the new lang/lua51
lang/lua51 is working the same way lang/lua52, chase ports using lua 5.1
Make the default lua lua52
Make all lua ports using USES=lua
Approved by: portmgr (implicit)
83 files changed, 231 insertions, 976 deletions
@@ -6110,3 +6110,4 @@ devel/msp430-gcc3||2014-05-18|Version obsolete, use devel/msp430-gcc graphics/GraphicsMagick12|graphics/GraphicsMagick13|2014-05-20|Has expired: Unmaintained upstream, no ports depending on it. Use graphics/GraphicsMagick13 instead net-im/tkabber-devel|net-im/tkabber|2014-05-23|Has expired: Unfetchable, outdated by net-im/tkabber devel/libglade-java||2014-05-26|Has expired: Unmaintained, outdated not depend on +lang/lua|lang/lua51|2014-05-26|Rename to allow multiple version of lua to coexist diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 01a4c69..b747e2f 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -3,6 +3,7 @@ PORTNAME= rpm PORTVERSION= 4.11.2 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://rpm.org/releases/rpm-${PORTVERSION:R}.x/ \ ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/ @@ -22,11 +23,9 @@ PYTHON_CONFIGURE_ENABLE=python PYTHON_USE= PYTHON=yes NLS_CONFIGURE_ENABLE=nls NLS_USES= gettext +PORTDOCS= * -USES= gmake shebangfix -USE_AUTOTOOLS= libtool -USE_BZIP2= yes -USE_LUA= 5.1+ +USES= gmake shebangfix lua:51 libtool tar:bzip2 USE_BDB= 46+ INVALID_BDB_VER=51 GNU_CONFIGURE= yes @@ -52,8 +51,8 @@ CONFIGURE_ARGS+=--with-external-db \ --with-popt-prefix="${LOCALBASE}" \ --sysconfdir=${PREFIX}/etc \ --localstatedir=/var \ - --without-javaglue \ - LUA_CFLAGS=-I${LUA_INCDIR} \ + --without-javaglue +CONFIGURE_ENV+= LUA_CFLAGS=-I${LUA_INCDIR} \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm" PLIST_SUB+= VERSION=${PORTVERSION} diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index de7059e..4eabb9e 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -44,22 +44,18 @@ include/rpm/rpmsign.h include/rpm/rpmbuild.h include/rpm/rpmfc.h include/rpm/rpmspec.h -lib/librpm.a -lib/librpm.la lib/librpm.so -lib/librpm.so.5 -lib/librpmbuild.a -lib/librpmbuild.la +lib/librpm.so.3 +lib/librpm.so.3.2.1 lib/librpmbuild.so -lib/librpmbuild.so.5 -lib/librpmio.a -lib/librpmio.la +lib/librpmbuild.so.3 +lib/librpmbuild.so.3.2.1 lib/librpmio.so -lib/librpmio.so.5 -lib/librpmsign.a -lib/librpmsign.la +lib/librpmio.so.3 +lib/librpmio.so.3.2.1 lib/librpmsign.so -lib/librpmsign.so.3 +lib/librpmsign.so.1 +lib/librpmsign.so.1.2.1 lib/rpm/rpm.daily lib/rpm/rpm.log lib/rpm/macros.perl @@ -170,7 +166,6 @@ lib/rpm/platform/sh3-freebsd/macros lib/rpm/platform/sh4-freebsd/macros lib/rpm/platform/sh4a-freebsd/macros lib/rpm-plugins/exec.so -lib/rpm-plugins/exec.la man/fr/man8/rpm.8.gz man/ja/man8/rpm.8.gz man/ja/man8/rpm2cpio.8.gz @@ -197,564 +192,6 @@ man/pl/man8/rpmgraph.8.gz man/ru/man8/rpm.8.gz man/ru/man8/rpm2cpio.8.gz man/sk/man8/rpm.8.gz -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/Doxyheader.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/Doxyheader_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/annotated.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/argv_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/argv_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/argv_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/argv_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/argv_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/bc_s.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/bdwn.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/classes.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h__dep__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h__dep__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h__dep__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/cliutils_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/closed.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/config_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/config_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h__dep__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h__dep__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h__dep__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/debug_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/deprecated.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_%%LUA_VER_SH%%4c93%%LUA_VER_SH%%ba4d22b4eaaf008543ee4d933%%LUA_VER_SH%%.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_%%LUA_VER_SH%%4c93%%LUA_VER_SH%%ba4d22b4eaaf008543ee4d933%%LUA_VER_SH%%_dep.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_%%LUA_VER_SH%%4c93%%LUA_VER_SH%%ba4d22b4eaaf008543ee4d933%%LUA_VER_SH%%_dep.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_%%LUA_VER_SH%%4c93%%LUA_VER_SH%%ba4d22b4eaaf008543ee4d933%%LUA_VER_SH%%_dep.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_2503802bcd3dd83f42a5bde505c8d26d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_2503802bcd3dd83f42a5bde505c8d26d_dep.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_2503802bcd3dd83f42a5bde505c8d26d_dep.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_2503802bcd3dd83f42a5bde505c8d26d_dep.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_4fef79e7%%LUA_VER_SH%%77ba769987a8da36c892c5f.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_4fef79e7%%LUA_VER_SH%%77ba769987a8da36c892c5f_dep.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_4fef79e7%%LUA_VER_SH%%77ba769987a8da36c892c5f_dep.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_4fef79e7%%LUA_VER_SH%%77ba769987a8da36c892c5f_dep.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_959d93502%%LUA_VER_SH%%%%LUA_VER_SH%%3df0e445cda6a766692ae.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_959d93502%%LUA_VER_SH%%%%LUA_VER_SH%%3df0e445cda6a766692ae_dep.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_959d93502%%LUA_VER_SH%%%%LUA_VER_SH%%3df0e445cda6a766692ae_dep.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_959d93502%%LUA_VER_SH%%%%LUA_VER_SH%%3df0e445cda6a766692ae_dep.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_97aefd0d527b934f%%LUA_VER_SH%%d99a682da8fe6a9.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_97aefd0d527b934f%%LUA_VER_SH%%d99a682da8fe6a9_dep.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_97aefd0d527b934f%%LUA_VER_SH%%d99a682da8fe6a9_dep.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_97aefd0d527b934f%%LUA_VER_SH%%d99a682da8fe6a9_dep.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_e68e8%%LUA_VER_SH%%5774%%LUA_VER_SH%%866f444e%%LUA_VER_SH%%7edd764ebbae.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_e68e8%%LUA_VER_SH%%5774%%LUA_VER_SH%%866f444e%%LUA_VER_SH%%7edd764ebbae_dep.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_e68e8%%LUA_VER_SH%%5774%%LUA_VER_SH%%866f444e%%LUA_VER_SH%%7edd764ebbae_dep.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dir_e68e8%%LUA_VER_SH%%5774%%LUA_VER_SH%%866f444e%%LUA_VER_SH%%7edd764ebbae_dep.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/doxygen.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/dynsections.js -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/files.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2blank.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2cl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2doc.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2folderclosed.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2folderopen.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2lastnode.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2link.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2mlastnode.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2mnode.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2mo.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2node.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2ns.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2plastnode.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2pnode.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2splitbar.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/ftv2vertline.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/functions.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/functions_vars.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x6%%LUA_VER_SH%%.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x62.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x63.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x64.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x65.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x66.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x67.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x68.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x69.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x6b.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x6c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x6d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x6e.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x6f.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x70.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x7%%LUA_VER_SH%%.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x72.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x73.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x74.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x75.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x76.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x77.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_0x78.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_a.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_b.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x62.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x64.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x65.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x66.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x68.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x69.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x6c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x6d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x6e.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x70.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x72.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x73.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x75.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x76.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x77.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_0x78.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_b.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_e.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_f.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_i.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_l.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_m.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_n.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_p.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_r.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_u.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_v.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_w.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_defs_x.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_e.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_enum.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x62.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x63.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x66.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x68.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x69.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x6c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x6d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x70.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x7%%LUA_VER_SH%%.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x72.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x73.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x74.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x75.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x76.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_0x78.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_b.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_f.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_i.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_l.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_m.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_p.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_q.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_r.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_t.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_u.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_v.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_eval_x.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_f.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x62.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x63.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x64.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x65.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x66.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x67.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x68.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x69.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x6d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x70.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x72.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x73.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_0x75.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_b.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_d.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_e.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_f.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_g.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_i.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_m.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_p.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_r.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_func_u.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_g.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_i.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_k.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_l.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_m.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_n.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_o.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_p.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_q.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_r.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_t.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_type.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_u.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_v.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_vars.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_w.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/globals_x.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/graph_legend.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/graph_legend.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/graph_legend.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__header.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__header.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__header.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__header.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmargv.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmbuild.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmbuild.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmbuild.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmbuild.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmcli.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmcli.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmcli.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmcli.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmdb.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmdb.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmdb.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmdb.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmds.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfc.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfc.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfc.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfc.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfi.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfileutil.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfileutil.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfileutil.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmfileutil.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmio.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmio.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmio.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmio.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmkeyring.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmlog.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmmacro.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmpgp.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmprob.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmps.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmrc.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmrc.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmrc.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmrc.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmsq.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmstring.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmstrpool.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmsw.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmtag.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmtd.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmte.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmte.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmte.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmte.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmts.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmts.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmts.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmts.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmtypes.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__rpmurl.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__signature.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__signature.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__signature.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/group__signature.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/header_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/header_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/header_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/header_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/header_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/modules.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/nav_f.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/nav_g.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/nav_h.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/open.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/pages.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpm2cpio_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpm2cpio_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpm2cpio_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpm2cpio_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpm2cpio_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbase64_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbase64_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbase64_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbase64_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbase64_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmbuild_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcallback_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcallback_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcallback_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcallback_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcallback_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcli_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcli_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcli_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcli_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmcli_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmdb_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmds_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmds_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmds_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmds_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmds_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfc_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfc_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfc_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfc_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfc_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfi_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfi_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfi_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfi_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfi_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfileutil_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfileutil_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfileutil_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfileutil_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmfileutil_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmio_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmio_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmio_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmio_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmio_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeyring_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeyring_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeyring_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeyring_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeyring_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeys_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeys_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeys_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeys_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmkeys_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlegacy_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlegacy_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlegacy_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlegacy_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlegacy_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlib_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlib_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlib_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlib_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlib_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlog_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlog_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlog_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlog_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmlog_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmmacro_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmmacro_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmmacro_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmmacro_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmmacro_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpgp_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpgp_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpgp_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpgp_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpgp_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpol_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpol_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpol_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpol_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmpol_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmprob_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmprob_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmprob_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmprob_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmprob_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmps_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmps_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmps_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmps_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmps_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmqv_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmqv_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmqv_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmqv_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmqv_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsign_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8c.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8c__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8c__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8c__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8c_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmspec_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsq_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsq_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsq_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsq_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsq_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstring_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstring_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstring_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstring_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstring_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstrpool_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstrpool_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstrpool_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstrpool_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmstrpool_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsw_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsw_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsw_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsw_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmsw_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtag_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtag_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtag_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtag_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtag_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtd_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtd_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtd_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtd_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtd_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmte_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmte_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmte_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmte_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmte_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmts_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmts_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmts_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmts_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmts_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtypes_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtypes_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtypes_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtypes_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmtypes_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmurl_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmurl_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h__dep__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h__dep__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h__dep__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmutil_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmvf_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmvf_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmvf_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmvf_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/rpmvf_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structARGI__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktCdata__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktEdata__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktKeyV3__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktKeyV4__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktLdata__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktOnepass__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktPubkey__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktSigV3__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktSigV4__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktSymkey__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktTrust__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structpgpPktUid__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmBuildArguments__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmInstallArguments__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmInstallArguments__s__coll__graph.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmInstallArguments__s__coll__graph.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmInstallArguments__s__coll__graph.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmQVKArguments__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmQVKArguments__s__coll__graph.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmQVKArguments__s__coll__graph.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmQVKArguments__s__coll__graph.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmRelocation__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmSignArgs.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmop__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmop__s__coll__graph.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmop__s__coll__graph.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmop__s__coll__graph.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmsw__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/structrpmtd__s.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/sync_off.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/sync_on.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h__dep__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h__dep__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h__dep__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h__incl.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h__incl.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h__incl.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/system_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/tab_a.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/tab_b.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/tab_h.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/tab_s.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/tabs.css -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/todo.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktKey__u.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktKey__u__coll__graph.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktKey__u__coll__graph.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktKey__u__coll__graph.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktPre__u.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktPre__u__coll__graph.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktPre__u__coll__graph.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktPre__u__coll__graph.png -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktSig__u.html -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktSig__u__coll__graph.map -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktSig__u__coll__graph.md5 -%%PORTDOCS%%%%DOCSDIR%%/librpm/html/unionpgpPktSig__u__coll__graph.png %%NLS%%share/locale/br/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ca/LC_MESSAGES/rpm.mo %%NLS%%share/locale/cs/LC_MESSAGES/rpm.mo @@ -787,11 +224,8 @@ man/sk/man8/rpm.8.gz %%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.la %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmbmodule.la %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmbmodule.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmsmodule.la %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmsmodule.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py libdata/pkgconfig/rpm.pc @@ -861,9 +295,6 @@ libdata/pkgconfig/rpm.pc @dirrmtry man/ko @dirrmtry man/fr/man8 @dirrmtry man/fr -%%PORTDOCS%%@dirrm %%DOCSDIR%%/librpm/html -%%PORTDOCS%%@dirrm %%DOCSDIR%%/librpm -%%PORTDOCS%%@dirrm %%DOCSDIR%% %%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES %%NLS%%@dirrmtry share/locale/sr@latin %%NLS%%@dirrmtry share/locale/te/LC_MESSAGES diff --git a/audio/lua51-mpd/Makefile b/audio/lua51-mpd/Makefile index 6f2e6ff..7c8eb69 100644 --- a/audio/lua51-mpd/Makefile +++ b/audio/lua51-mpd/Makefile @@ -6,7 +6,7 @@ CATEGORIES= audio PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} MAINTAINER= demelier.david@gmail.com -COMMENT= A Lua library for musicpd +COMMENT= Lua library for musicpd RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket @@ -17,14 +17,12 @@ GH_ACCOUNT= silentbicycle GH_PROJECT= lua-mpd GH_TAGNAME= v0.1 +USES= lua:51 USE_GITHUB= yes -USE_LUA= 5.1 +NO_BUILD= yes WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-lua-${PORTNAME}-ca32f43 -do-build: - @${DO_NADA} - do-install: @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR} ${INSTALL_DATA} ${WRKSRC}/mpd.lua ${STAGEDIR}${LUA_MODSHAREDIR} diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile index 7a8a4da..347e2ba 100644 --- a/databases/luadbi/Makefile +++ b/databases/luadbi/Makefile @@ -14,8 +14,7 @@ LICENSE= MIT NO_WRKSUBDIR= yes -USE_LUA= 5.1 -USES= gmake +USES= lua:51 gmake CFLAGS+= -fpic -I${LOCALBASE}/include -I${LUA_INCDIR} -I. \ -I${LOCALBASE}/include/postgresql/server diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile index bad4c42..6c915b2 100644 --- a/databases/mysql-proxy/Makefile +++ b/databases/mysql-proxy/Makefile @@ -15,14 +15,13 @@ LICENSE= GPLv2 LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent \ libglib-2.0.so:${PORTSDIR}/devel/glib20 -CONFIGURE_ARGS+= --with-lua=lua-5.1 --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained +CONFIGURE_ARGS+= --with-lua=lua-${LUA_VER} --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc" LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} GNU_CONFIGURE= yes -USES= pkgconfig iconv +USES= pkgconfig lua:51 iconv USE_LDCONFIG= yes -USE_LUA= 5.1+ USE_MYSQL= yes USE_RC_SUBR= mysql-proxy diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile index 3df34d23..cd2e615 100644 --- a/databases/mysql-workbench51/Makefile +++ b/databases/mysql-workbench51/Makefile @@ -14,7 +14,8 @@ COMMENT= The MySQL Workbench LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ - libzip.so:${PORTSDIR}/archivers/libzip + libzip.so:${PORTSDIR}/archivers/libzip \ + libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++ MAKE_JOBS_UNSAFE= yes @@ -27,12 +28,10 @@ LIBTOOLIZE_ARGS=-i -c -f USE_LDCONFIG= ${PREFIX}/lib/mysql-workbench SUBDIRS= ext/yassl/taocrypt ext/yassl ext/ctemplate/ctemplate-src . -USES= dos2unix libtool +USES= dos2unix libtool lua:51 DOS2UNIX_REGEX= .*ext/yassl/.*(Makefile.am|configure.in) USE_GL= gl USE_GNOME= cairo gtkmm24 libglade2 libgnome libsigc++20 libxml2 -USE_LUA= 5.1 -LUA_COMPS= lua CONFLICTS= mysql-workbench-gpl* DATADIR= ${PREFIX}/share/mysql-workbench @@ -40,7 +39,7 @@ DATADIR= ${PREFIX}/share/mysql-workbench CXXFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} GNU_CONFIGURE= yes -CONFIGURE_ENV= GNOME2_DIR="${LOCALBASE}" LUA_LIBS="-llua" +CONFIGURE_ENV= GNOME2_DIR="${LOCALBASE}" LUA_LIBS="-llua-${LUA_VER}" USE_MYSQL= client DEFAULT_MYSQL_VER= 51 diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile index e5c15b2..916b930 100644 --- a/databases/mysql-workbench52/Makefile +++ b/databases/mysql-workbench52/Makefile @@ -33,7 +33,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \ OPTIONS_DEFINE= PYTHON_UTILS UNIXODBC PYTHON_UTILS_DESC= Python scripts useful for administering MySQL -USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \ +USES= desktop-file-utils gettext gmake libtool lua:51 pathfix pkgconfig \ shebangfix shared-mime-info SHEBANG_FILES= ext/ctemplate/ctemplate-src/src/htmlparser/*.py \ ext/mysql-utilities/*.py \ @@ -50,8 +50,6 @@ USE_GCC= any USE_GL= gl USE_GNOME= gnomehier gtk20 libxml2 USE_PYTHON= 2 -USE_LUA= 5.1 -LUA_COMPS= lua USE_MYSQL= client USE_SQLITE= 3 USE_AUTOTOOLS= libtoolize aclocal automake autoheader autoconf diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 712d200..a0e8942 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -30,7 +30,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLUA} -USE_LUA?= 5.1 +USES+= lua:51 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua CFLAGS+= -fPIC LDFLAGS+= -Wl,-E diff --git a/devel/geany-plugin-lua/Makefile b/devel/geany-plugin-lua/Makefile index 43ab4ed..e029340 100644 --- a/devel/geany-plugin-lua/Makefile +++ b/devel/geany-plugin-lua/Makefile @@ -8,7 +8,7 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -USE_LUA= 5.1 +USES= lua:51 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/love/Makefile b/devel/love/Makefile index 0481be6..102992b 100644 --- a/devel/love/Makefile +++ b/devel/love/Makefile @@ -20,10 +20,9 @@ LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil \ libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -USES= gmake openal dos2unix +USES= gmake openal dos2unix lua:51 USE_SDL= sdl mixer USE_GL= gl glu -USE_LUA= 5.1+ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` diff --git a/devel/love07/Makefile b/devel/love07/Makefile index 634ffd2..5c15043 100644 --- a/devel/love07/Makefile +++ b/devel/love07/Makefile @@ -23,10 +23,9 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost PORTSCOUT= limit:^0\.7\. -USES= gmake openal dos2unix +USES= gmake openal dos2unix lua:41 USE_SDL= sdl mixer USE_GL= gl glu -USE_LUA= 5.1+ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` diff --git a/devel/love5/Makefile b/devel/love5/Makefile index bcd3ca7..89a5e18 100644 --- a/devel/love5/Makefile +++ b/devel/love5/Makefile @@ -16,10 +16,9 @@ LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil \ libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -USES= tar:bzip2 gmake dos2unix +USES= tar:bzip2 gmake dos2unix lua:51 USE_SDL= sdl mixer USE_GL= gl glu -USE_LUA= 5.1+ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` diff --git a/devel/lua-cjson/Makefile b/devel/lua-cjson/Makefile index ab318ff..ba01b0b 100644 --- a/devel/lua-cjson/Makefile +++ b/devel/lua-cjson/Makefile @@ -11,17 +11,15 @@ DISTNAME= lua-cjson-${PORTVERSION} MAINTAINER= osa@FreeBSD.org COMMENT= Fast JSON parsing and encoding support for Lua -USE_LUA?= 5.1 +USES= lua:51 + +MAKE_ARGS= LUA_VERSION=${LUA_VER} PLIST_FILES= %%LUA_MODLIBDIR%%/cjson.so -NO_STAGE= yes post-patch: @${REINPLACE_CMD} '16,18d; \ - 21s|^\(LUA_INCLUDE.*\)\(PREFIX\)\(.*\)|\1LOCALBASE\3/lua51|' \ + 21s|^\(LUA_INCLUDE.*\)\(PREFIX\)\(.*\)|\1LOCALBASE\3/lua${LUA_VER_STR}|' \ ${WRKSRC}/Makefile -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cjson.so ${LUA_MODLIBDIR} - .include <bsd.port.mk> diff --git a/devel/lua-gettext/Makefile b/devel/lua-gettext/Makefile index 6a7d98e..103f87b 100644 --- a/devel/lua-gettext/Makefile +++ b/devel/lua-gettext/Makefile @@ -13,8 +13,7 @@ DISTFILES= lua_gettext.c?rev=${CVER} gettext.lua?rev=${LVER} MAINTAINER= ports@FreeBSD.org COMMENT= Gettext binding for Lua 5 -USE_LUA?= 5.1 -USES= gettext +USES= gettext lua:51 CVER= 1.15 LVER= ${PORTVERSION} diff --git a/devel/lua-pty/Makefile b/devel/lua-pty/Makefile index 9d1d562..b3e0ec8 100644 --- a/devel/lua-pty/Makefile +++ b/devel/lua-pty/Makefile @@ -13,7 +13,7 @@ DISTFILES= pty.lua?rev=1.2 pty.c?rev=1.25 MAINTAINER= ports@FreeBSD.org COMMENT= Pty (pseudo-terminal) bindings for Lua 5 -USE_LUA= 5.1 +USES= lua:51 PLIST_FILES= %%LUA_MODSHAREDIR%%/pty.lua \ %%LUA_MODLIBDIR%%/lpty.so diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile index ab18252..ae6b073 100644 --- a/devel/luabind/Makefile +++ b/devel/luabind/Makefile @@ -12,7 +12,7 @@ COMMENT= Library that helps you create bindings between C++ and Lua LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs -USE_LUA= 5.1+ +USES= lua USE_LDCONFIG= yes CPPFLAGS+= -I.. -I${LUA_INCDIR} -I${LOCALBASE}/include diff --git a/devel/luafilesystem/Makefile b/devel/luafilesystem/Makefile index 1fa1256..8a94348 100644 --- a/devel/luafilesystem/Makefile +++ b/devel/luafilesystem/Makefile @@ -12,7 +12,7 @@ COMMENT= Library to access directory structure and file attributes LICENSE= MIT -USE_LUA= 5.1 +USES= lua:51 USE_GITHUB= yes GH_ACCOUNT= keplerproject diff --git a/devel/luajava/Makefile b/devel/luajava/Makefile index f1b631e..a9f57b5 100644 --- a/devel/luajava/Makefile +++ b/devel/luajava/Makefile @@ -10,12 +10,8 @@ MASTER_SITES= http://luaforge.net/frs/download.php/2105/ MAINTAINER= sunghyuk@gmail.com COMMENT= Lua scripting tool for Java -USES= gmake dos2unix -USE_LUA= 5.1 +USES= gmake dos2unix lua:51 LUA_COMPS= lua -.if ${USE_LUA} == 5.0 -LUA_COMPS+= compat51 -.endif USE_JAVA= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index afa6dfe..3f56746 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -19,10 +19,8 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libbotan-1.10.so:${PORTSDIR}/security/botan110 SUB_FILES= pkg-message -USE_BZIP2= yes -USES= iconv pkgconfig gmake perl5 +USES= iconv pkgconfig gmake perl5 lua:51 tar:bzip2 USE_PERL5= build -USE_LUA= 5.1+ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile index 318e856..bed0fba 100644 --- a/devel/swig13/Makefile +++ b/devel/swig13/Makefile @@ -36,8 +36,7 @@ LUA_DESC= Enable Lua support .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.0+ -LUA_COMPS= lua:build +USES+= lua:51 CONFIGURE_ARGS+=--with-lua=${LUA_BINDIR}/lua \ --with-luaincl=${LUA_INCDIR} \ --with-lualib=${LUA_LIBDIR} diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile index 8432f54..7dffe89 100644 --- a/devel/swig20/Makefile +++ b/devel/swig20/Makefile @@ -14,32 +14,28 @@ LICENSE= GPLv3 LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -USES= gmake -USE_AUTOTOOLS= autoconf:env libtool +USES= gmake libtool lua:51 +USE_AUTOTOOLS= autoconf:env VER= ${PORTVERSION:R} PLIST_SUB+= PORTVERSION=${PORTVERSION} VER="${VER}" +GNU_CONFIGURE= yes CFLAGS+= -fPIC -DPIC ALL_TARGET= # none -WANT_LUA= yes -WANT_LUA_VER= 5.0+ - CONFIGURE_ARGS+=--program-suffix=${VER} -.include <bsd.port.pre.mk> - -.if ${HAVE_LUA:Mlua-5.*} != "" USE_LUA= yes LUA_COMPS= lua:build CONFIGURE_ARGS+=--with-lua=${LUA_BINDIR}/lua \ --with-luaincl=${LUA_INCDIR} \ --with-lualib=${LUA_LIBDIR} -.endif OCTAVE_VER_CMD= ${LOCALBASE}/bin/octave-config -v 2>/dev/null || ${TRUE} +.include <bsd.port.pre.mk> + post-patch: ${SETENV} OCTAVE_VER=$$(${OCTAVE_VER_CMD}) \ ${REINPLACE_CMD} -e 's|$$RUBY |${RUBY} |; \ diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index 16c25d9..0276378 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -42,11 +42,11 @@ GROUPS= pdns .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA=5.1 +USES+= lua:51 LUA_COMPS=lua MAKE_ENV+=LUA=1 MAKE_ENV+=LUA_CPPFLAGS_CONFIG=-I${PREFIX}/include/lua51 -MAKE_ENV+="LUA_LIBS_CONFIG=-L${PREFIX}/lib/lua51/ -llua" +MAKE_ENV+="LUA_LIBS_CONFIG=-L${PREFIX}/lib/lua51/ -llua-${LUA_VER}" .endif .if ${PORT_OPTIONS:MSTATIC} diff --git a/editors/fxite/Makefile b/editors/fxite/Makefile index 47108f9..af4e102 100644 --- a/editors/fxite/Makefile +++ b/editors/fxite/Makefile @@ -3,6 +3,7 @@ PORTNAME= fxite PORTVERSION= 0.92 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= gahr@FreeBSD.org @@ -21,12 +22,11 @@ GH_ACCOUNT= yetanothergeek GH_TAGNAME= FXITE-0_91 GH_COMMIT= c2ecac3 -USES= gmake pkgconfig -USE_LUA= yes +USES= gmake pkgconfig lua:51 desktop-file-utils USE_AUTOTOOLS= aclocal autoconf automake ACLOCAL_ARGS= --force -I m4 AUTOMAKE_ARGS= --gnu --add-missing --copy -CXXFLAGS+= -fPIC +CXXFLAGS+= -fPIC -Wno-invalid-source-encoding -Wno-format LDFLAGS+= -L${LOCALBASE}/lib -lintl CONFIGURE_ARGS+=--with-system-lua \ --with-lua-pkg=lua-${LUA_VER} diff --git a/editors/wordgrinder/Makefile b/editors/wordgrinder/Makefile index 00e90d0..1857024 100644 --- a/editors/wordgrinder/Makefile +++ b/editors/wordgrinder/Makefile @@ -13,9 +13,7 @@ LICENSE= MIT RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem -USE_LUA= 5.1+ - -USE_BZIP2= yes +USES= lua:51 tar:bzip2 MAN1= wordgrinder.1 diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile index 344775a..cfb4032 100644 --- a/editors/yzis/Makefile +++ b/editors/yzis/Makefile @@ -15,10 +15,8 @@ COMMENT= Vi-like editor LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -USES= tar:bzip2 cmake gettext perl5 +USES= tar:bzip2 cmake gettext perl5 lua:51 USE_XORG= x11 xext ice -USE_LUA= 5.1 -LUA_COMPS= lua USE_QT4= qtestlib qmake_build rcc_build uic_build moc_build gui xml CMAKE_ARGS+= -DLOCALBASE:STRING="${LOCALBASE}" \ -DLUA_INCDIR:STRING="${LUA_INCDIR}" \ diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index 2cced49..2978e4d 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gettext gmake openal:al -USE_LUA= 5.1 +USES= gettext gmake openal:al lua:51 USE_SDL= sdl ttf net USE_GL= yes USE_GCC= any # problems in luabind @@ -58,7 +57,8 @@ post-patch: @${REINPLACE_CMD} -e '/^LIBS =/ s|$$| @INTLLIBS@|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/^bindir = / s|games|bin|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/qt4_incdirs/ s|".*"|"${QT_INCDIR}"|; \ - /qt4_libdirs/ s|".*"|"${QT_LIBDIR}"|; /test/ s|==|=|' \ + /qt4_libdirs/ s|".*"|"${QT_LIBDIR}"|; /test/ s|==|=| ; \ + s/-llua /-llua-${LUA_VER} /g;' \ ${WRKSRC}/configure .if ${PORT_OPTIONS:MEDITOR} @${REINPLACE_CMD} -e '/^INCLUDES = / s|=|= -I${QT_INCDIR}/QtGui \ diff --git a/games/asc/Makefile b/games/asc/Makefile index f8a64ff..bc9d41e 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -27,13 +27,11 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= MUSIC XVID MUSIC_DESC= Install extra music files -USES= gmake libtool perl5 pkgconfig tar:bzip2 +USES= gmake libtool lua:51 perl5 pkgconfig tar:bzip2 USE_SDL= image mixer sound sdl USE_WX= 3.0 WX_UNICODE= yes WX_CONF_ARGS= absolute -USE_LUA= 5.1 -LUA_COMPS= lua USE_PERL5= build GNU_CONFIGURE= yes diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index aca966c..ffc9fa1 100644 --- a/games/battletanks/Makefile +++ b/games/battletanks/Makefile @@ -16,10 +16,8 @@ LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ libsmpeg.so:${PORTSDIR}/multimedia/smpeg -USES= openal:al pkgconfig -USE_BZIP2= yes +USES= openal:al pkgconfig lua:51 tar:bzip2 USE_LDCONFIG= yes -USE_LUA= 5.0+ USE_SDL= image sdl USE_SCONS= yes USE_PYTHON_BUILD= yes diff --git a/games/boswars/Makefile b/games/boswars/Makefile index a451321..04270cc 100644 --- a/games/boswars/Makefile +++ b/games/boswars/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ theora:${PORTSDIR}/multimedia/libtheora \ vorbis:${PORTSDIR}/audio/libvorbis -USE_LUA= 5.1 +USES= lua:51 USE_SDL= sdl USE_GL= yes USE_SCONS= yes diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile index 2ae94af..9d08b45 100644 --- a/games/corsix-th/Makefile +++ b/games/corsix-th/Makefile @@ -13,8 +13,7 @@ LICENSE= MIT LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 -USES= cmake compiler:c++11-lang dos2unix pkgconfig -USE_LUA= yes +USES= cmake compiler:c++11-lang dos2unix lua:51 pkgconfig USE_SDL= mixer DOS2UNIX_FILES= CMake/FindFFmpeg.cmake \ CorsixTH/CMakeLists.txt \ diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 560c01f..6387c3a 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -12,12 +12,11 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Enigma is a reimplementation of Oxyd, a puzzle game LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c2 \ - libpng.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png \ + libtoluaxx-${LUA_VER}.so:${PORTSDIR}/lang/tolua++ BUILD_DEPENDS= ${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet -USES= gettext gmake -USE_LUA= 5.1 -LUA_COMPS= lua toluaxx +USES= gettext gmake lua:51 USE_SDL= image mixer sdl ttf GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-cxxlua \ diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile index b33433a..dec5788 100644 --- a/games/fillets-ng/Makefile +++ b/games/fillets-ng/Makefile @@ -14,8 +14,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A wonderful puzzle game USE_SDL= sdl mixer image ttf -USE_LUA= 5.1 -USES= gmake +USES= gmake lua GNU_CONFIGURE= yes CPPFLAGS+= -I${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile index a1350232..8128a8a 100644 --- a/games/freedroidrpg/Makefile +++ b/games/freedroidrpg/Makefile @@ -11,10 +11,9 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Modification of the classical Freedroid engine into an RPG GNU_CONFIGURE= yes -USES= gmake +USES= gmake lua:51 USE_SDL= sdl image mixer gfx -USE_LUA= 5.1+ -CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua" +CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" USE_GCC= any # doesn't build with clang PORTDATA= * diff --git a/games/glest/Makefile b/games/glest/Makefile index c7cda97..3788c93 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -17,9 +17,8 @@ LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data -USES= dos2unix openal:al,alut pkgconfig zip:infozip +USES= dos2unix openal:al,alut pkgconfig zip:infozip lua:51 USE_AUTOTOOLS= automake:env autoconf:env -USE_LUA= 5.1 USE_SDL= yes USE_GL= yes GNU_CONFIGURE= yes diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index 559c8b3..19f6f21 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -18,10 +18,9 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= depends on fpc which is only available for i386 and amd64 -USES= tar:bzip2 cmake +USES= tar:bzip2 cmake lua:51 USE_SDL= sdl mixer image ttf net USE_FPC= opengl libpng -USE_LUA= 5.1+ USE_QT4= corelib gui moc_build network \ qmake_build rcc_build svg xml \ uic_build linguist_build diff --git a/games/instead/Makefile b/games/instead/Makefile index 387e851..657e476 100644 --- a/games/instead/Makefile +++ b/games/instead/Makefile @@ -12,9 +12,8 @@ COMMENT= Simple Text Adventure, The Interpreter LICENSE= MIT -USES= cmake:outsource pkgconfig iconv +USES= cmake:outsource pkgconfig iconv lua:51 CMAKE_ARGS= -DMANDIR=man -USE_LUA= 5.1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile index 4e8e712..9ab28ca 100644 --- a/games/irrlamb/Makefile +++ b/games/irrlamb/Makefile @@ -15,9 +15,8 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 BUILD_DEPENDS= ${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht RUN_DEPENDS= ${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht -USE_LUA= 5.1+ USE_SCONS= yes -USES= scons dos2unix +USES= scons dos2unix lua:51 DOS2UNIX_FILES= src/engine/save.h src/objects/orb.cpp src/objects/player.cpp CPPPATH= ${LOCALBASE}/include ${LUA_INCDIR} diff --git a/games/jvgs/Makefile b/games/jvgs/Makefile index 3d48d7a..7334982 100644 --- a/games/jvgs/Makefile +++ b/games/jvgs/Makefile @@ -11,13 +11,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= A minimalistic platform game -BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 +BUILD_DEPENDS= libswig.so:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 -USES= cmake +USES= cmake lua:51 USE_SDL= sdl mixer USE_GL= gl glu -USE_LUA= 5.1+ SUB_FILES= ${PORTNAME} diff --git a/games/nlarn/Makefile b/games/nlarn/Makefile index 3a06201..2e7d1be 100644 --- a/games/nlarn/Makefile +++ b/games/nlarn/Makefile @@ -11,19 +11,16 @@ COMMENT= Roguelike game and as such a remake of the classic game Larn LICENSE= GPLv3 -USES= pkgconfig -USE_LUA= 5.1 +USES= gmake lua pkgconfig USE_GNOME= glib20 -USE_GMAKE= yes -NO_STAGE= yes post-configure: @${REINPLACE_CMD} 's|/usr/share/nlarn|${DATADIR}|' \ ${WRKSRC}/src/game.c do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/nlarn ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/nlarn.ini-sample ${WRKSRC}/lib/* ${DATADIR}/ + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/nlarn ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/nlarn.ini-sample ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}/ .include <bsd.port.mk> diff --git a/games/palomino/Makefile b/games/palomino/Makefile index af2e231..d2e7346 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -18,10 +18,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libosg.so:${PORTSDIR}/graphics/osg -USES= cmake tar:xz +USES= cmake tar:xz lua:51 USE_GL= gl -USE_LUA= 5.1 -LUA_COMPS= lua:build MISC_VER= 20091027 MODELS_VER= 20090615 diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index 3674f3c..ff41f8d 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -14,8 +14,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt USE_SQLITE= yes -USES= bison compiler gmake perl5 pkgconfig tar:xz -USE_LUA= 5.1 +USES= bison compiler gmake perl5 pkgconfig tar:xz lua:51 USE_PERL5= build SAVEDIR= \~/.stonesoup diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index c11a6a3..dc82caf 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -12,7 +12,8 @@ COMMENT= Free cross-platform real-time strategy gaming engine LICENSE= GPLv2 -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++ OPTIONS_DEFINE= MIKMOD MNG THEORA VORBIS DOCS OPTIONS_DEFAULT= VORBIS @@ -20,8 +21,7 @@ OPTIONS_DEFAULT= VORBIS USE_GL= glu USE_SDL= sdl USE_SQLITE= 3 -USE_LUA= 5.0+ -LUA_COMPS= toluaxx +USES= lua:51 USES= cmake:outsource pkgconfig CMAKE_ARGS= -DGAMEDIR:STRING="bin" \ -DTOLUA++_APP:STRING="${TOLUAXX_CMD}" \ diff --git a/games/sumwars/Makefile b/games/sumwars/Makefile index 877e1b4..daff82a 100644 --- a/games/sumwars/Makefile +++ b/games/sumwars/Makefile @@ -24,11 +24,9 @@ LIB_DEPENDS= CEGUIBase-0.so:${PORTSDIR}/graphics/cegui \ PocoNet.12:${PORTSDIR}/devel/poco \ physfs.1:${PORTSDIR}/devel/physfs -USES= cmake gettext gmake openal:al,alut pkgconfig +USES= cmake gettext gmake openal:al,alut pkgconfig lua:51 tar:bzip2 USE_GL= gl glu -USE_BZIP2= yes INSTALLS_ICONS= yes -USE_LUA= 5.1 CMAKE_ARGS+= -DGETTEXT_SEARCH_PATH=${LOCALBASE}/lib diff --git a/games/valyriatear/Makefile b/games/valyriatear/Makefile index 53b37ca..d52247d 100644 --- a/games/valyriatear/Makefile +++ b/games/valyriatear/Makefile @@ -23,11 +23,10 @@ GH_ACCOUNT= Bertram25 GH_PROJECT= ValyriaTear GH_COMMIT= a324297 -USES= cmake iconv openal +USES= cmake iconv openal lua:51 CMAKE_ARGS= -DUSE_PCH_COMPILATION=OFF USE_SDL= sdl image ttf USE_GL= gl -USE_LUA= 5.1 INSTALLS_ICONS= yes LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} -lintl diff --git a/games/widelands/Makefile b/games/widelands/Makefile index 463f8e8..125f36d 100644 --- a/games/widelands/Makefile +++ b/games/widelands/Makefile @@ -17,13 +17,12 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -USES= tar:bzip2 cmake:outsource gettext compiler:c++11-lib +USES= tar:bzip2 cmake:outsource gettext compiler:c++11-lib lua:51 CMAKE_ARGS= -DWL_INSTALL_PREFIX="${PREFIX}" \ -DWL_INSTALL_DATADIR="share/widelands" \ -DWL_INSTALL_BINDIR="bin" \ -DWL_VERSION="${DISTVERSION}" \ -DWL_COMPILERFLAG_OPTIMIZATIONS="" -USE_LUA= 5.1 USE_SDL= sdl mixer image net ttf gfx USE_PYTHON_BUILD=yes diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 30fb01a..556cdae 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -20,9 +20,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gmake dos2unix +USES= gmake dos2unix lua:51 USE_GNOME= libxml2 -USE_LUA= 5.1 USE_SQLITE= 3 USE_SDL= sdl mixer ttf net USE_GL= gl glu diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile index b6ba738..6f3dfa9a 100644 --- a/graphics/grafx2/Makefile +++ b/graphics/grafx2/Makefile @@ -33,8 +33,7 @@ MAKE_ARGS+= NOTTF=1 .endif .if ${PORT_OPTIONS:MLUA} -USES+= pkgconfig -USE_LUA= 5.1 +USES+= lua:51 pkgconfig .else MAKE_ARGS+= NOLUA=1 .endif diff --git a/graphics/lua-gd/Makefile b/graphics/lua-gd/Makefile index e049d64..6aa1230 100644 --- a/graphics/lua-gd/Makefile +++ b/graphics/lua-gd/Makefile @@ -16,10 +16,9 @@ LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd OPTIONS_DEFINE= DOCS EXAMPLES -USE_LUA= 5.1 - +USES= lua:51 CFLAGS+= -I${LUA_INCDIR} -I${LOCALBASE}/include -LDFLAGS+= -shared -L${LOCALBASE}/lib -lgd -L${LUA_LIBDIR} -llua -lm +LDFLAGS+= -shared -L${LOCALBASE}/lib -lgd -L${LUA_LIBDIR} -llua-${LUA_VER} -lm GDFEATURES= `gdlib-config --features |sed -e "s/GD_/-DGD_/g"` .include <bsd.port.options.mk> diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index 8c316e5..de19e6e9 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -43,10 +43,6 @@ PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png TIFF_CMAKE_ON= -DWANT_TIFF:BOOL=TRUE TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MIMPOSE} -USE_LUA= 5.1 -.endif +IMPOSE_USES= lua:51 .include <bsd.port.mk> diff --git a/irc/dxirc/Makefile b/irc/dxirc/Makefile index 1150b84..382432d 100644 --- a/irc/dxirc/Makefile +++ b/irc/dxirc/Makefile @@ -55,9 +55,8 @@ CONFIGURE_ARGS+= --disable-ssl .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1+ -WANT_LUA_VER= 5.1 -CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua" +USES+= lua:51 +CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" CONFIGURE_ARGS+= --enable-lua .else CONFIGURE_ARGS+= --disable-lua diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile index 62e2790..d13b419 100644 --- a/irc/weechat-devel/Makefile +++ b/irc/weechat-devel/Makefile @@ -122,7 +122,7 @@ PLIST_SUB+= TCL="@comment " .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1+ +USES+= lua:51 CMAKE_ARGS+= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \ -DBSD_LUA_INCDIR=${LUA_INCDIR} PLIST_SUB+= LUA="" diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index 6a9d3f7e..708a74b 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -112,7 +112,7 @@ PLIST_SUB+= TCL="@comment " .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1+ +USES+= lua:51 CMAKE_ARGS+= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \ -DBSD_LUA_INCDIR=${LUA_INCDIR} PLIST_SUB+= LUA="" diff --git a/lang/Makefile b/lang/Makefile index 20d384f..d05d92a 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -145,8 +145,8 @@ SUBDIR += linux-f10-libg2c SUBDIR += linux-f10-tcl85 SUBDIR += linux-j - SUBDIR += lua SUBDIR += lua-mode.el + SUBDIR += lua51 SUBDIR += lua52 SUBDIR += luajit SUBDIR += lush diff --git a/lang/lua/Makefile b/lang/lua/Makefile deleted file mode 100644 index 7adf49b..0000000 --- a/lang/lua/Makefile +++ /dev/null @@ -1,127 +0,0 @@ -# Created by: Richard Kiss -# $FreeBSD$ - -PORTNAME= lua -PORTVERSION= 5.1.5 -PORTREVISION= 6 -CATEGORIES= lang -MASTER_SITES= http://www.lua.org/ftp/ \ - ftp://ftp.ntua.gr/pub/lang/lua/ \ - ftp://ftp.gwdg.de/pub/languages/lua/ - -MAINTAINER= lua@FreeBSD.org -COMMENT= Small, compilable scripting language providing easy access to C code - -LICENSE= MIT - -PORTSCOUT= limit:^5\.1 - -PATCH_WRKSRC= ${WRKSRC}/src -USE_LUA= 5.1 -LUA_COMPS= # only define variables -ALL_TARGET= freebsd -USES= pkgconfig -USE_LDCONFIG= yes -MAKE_ENV= LUA_SONAME="liblua-${LUA_VER}.so.${LUA_VER_SH}" -# Overriding __MAKE_CONF makes sure that we don't re-parse -# /etc/make.conf during do-build, which would jeopardize the build -# if, for instance, the user set CFLAGS=mumble -# NOTE: /etc/make.conf is read BEFORE Makefile, so we already -# have its settings when we get here. -# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt -MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} -# liblua.so requires libm, so make sure it has an explicit dependency -# so that applications need not second-guess lua's dependencies. -LDFLAGS+= -lm -pthread - -MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1 -DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR} -PORTDOCS= * -LATEST_LINK= ${LUA_SUBDIR} - -LUA_BIN= lua luac -LUA_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp -LUA_ETC= Makefile README all.c lua.ico luavs.bat min.c \ - noparser.c strict.lua -LUA_TEST= README bisect.lua cf.lua echo.lua env.lua factorial.lua \ - fib.lua fibfor.lua globals.lua hello.lua life.lua luac.lua \ - printf.lua readonly.lua sieve.lua sort.lua table.lua \ - trace-calls.lua trace-globals.lua xd.lua - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" || ${ARCH} == "powerpc" -CFLAGS+= -fPIC -.endif - -post-patch: - @${REINPLACE_CMD} -Ee \ - '/^INSTALL_.*=/s/INSTALL_TOP/prefix/ ; \ - s|^(CC\|AR\|RANLIB)=|\1?=| ; \ - /^CFLAGS=/ { s/=/+=/; s/-O2//; } ; \ - s|/usr/local|${PREFIX}|' \ - ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile - @${REINPLACE_CMD} -i '' -Ee \ - 's|^(prefix=).*|\1 ${PREFIX}| ; \ - s|^(libdir=).*|\1 ${LUA_LIBDIR}| ; \ - s|^(includedir=).*|\1 ${LUA_INCDIR}| ; \ - s|^(INSTALL_BIN=).*|\1 ${LUA_BINDIR}| ; \ - s|^(INSTALL_INC=).*|\1 ${LUA_INCDIR}| ; \ - s|^(INSTALL_LIB=).*|\1 ${LUA_LIBDIR}| ; \ - s|^(INSTALL_CMOD=).*|\1 ${LUA_MODLIBDIR}| ; \ - s|^(INSTALL_LMOD=).*|\1 ${LUA_MODSHAREDIR}|' \ - ${WRKSRC}/etc/lua.pc - @${REINPLACE_CMD} -e 's,rand *(,random(,g' \ - ${WRKSRC}/src/lmathlib.c - @${REINPLACE_CMD} -e '/LUA_ROOT/s|/usr/local|${PREFIX}|' \ - ${WRKSRC}/src/luaconf.h - -post-build: - @${RM} -f ${WRKSRC}/test/lua ${WRKSRC}/test/luac - -do-install: -# Programs. - ${MKDIR} ${STAGEDIR}${LUA_BINDIR} -.for f in ${LUA_BIN} - ${INSTALL_PROGRAM} ${WRKSRC}/src/${f} ${STAGEDIR}${LUA_BINDIR} - ${LN} -sf ${LUA_SUBDIR}/${f} ${STAGEDIR}${PREFIX}/bin/${f}-${LUA_VER} -.endfor -# Include files. - ${MKDIR} ${STAGEDIR}${LUA_INCDIR} -.for f in ${LUA_INC} - ${INSTALL_DATA} ${WRKSRC}/src/${f} ${STAGEDIR}${LUA_INCDIR} -.endfor -# Libraries. - ${MKDIR} ${STAGEDIR}${LUA_LIBDIR} - ${INSTALL_DATA} ${WRKSRC}/src/liblua.a ${STAGEDIR}${LUA_LIBDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/src/liblua.so \ - ${STAGEDIR}${LUA_LIBDIR}/liblua-${LUA_VER}.so.${LUA_VER_SH} - @${LN} -sf liblua-${LUA_VER}.so.${LUA_VER_SH} ${STAGEDIR}${LUA_LIBDIR}/liblua.so - @${LN} -sf ${LUA_SUBDIR}/liblua-${LUA_VER}.so.${LUA_VER_SH} \ - ${STAGEDIR}${PREFIX}/lib - @${LN} -sf liblua-${LUA_VER}.so.${LUA_VER_SH} \ - ${STAGEDIR}${PREFIX}/lib/liblua-${LUA_VER}.so -# Manual pages. -.for f in ${LUA_MAN} - ${INSTALL_MAN} ${WRKSRC}/doc/${f} \ - ${STAGEDIR}${PREFIX}/man/man1/${f:C/.1$//}-${LUA_VER}.1 -.endfor -# Documentation. - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/etc - ${MKDIR} ${STAGEDIR}${DOCSDIR}/test - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif ${STAGEDIR}${DOCSDIR} -.for f in ${LUA_ETC} - ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${DOCSDIR}/etc -.endfor -.for f in ${LUA_TEST} - ${INSTALL_DATA} ${WRKSRC}/test/${f} ${STAGEDIR}${DOCSDIR}/test -.endfor -# lua.pc - ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lua-${LUA_VER}.pc -# Module directories. - ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} - ${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR} - -.include <bsd.port.post.mk> diff --git a/lang/lua/files/patch-src-Makefile b/lang/lua/files/patch-src-Makefile deleted file mode 100644 index 87b1423..0000000 --- a/lang/lua/files/patch-src-Makefile +++ /dev/null @@ -1,44 +0,0 @@ ---- Makefile.orig 2012-02-13 22:41:22.000000000 +0200 -+++ Makefile 2013-08-05 15:56:32.000000000 +0300 -@@ -9,10 +9,11 @@ - - CC= gcc - CFLAGS= -O2 -Wall $(MYCFLAGS) --AR= ar rcu -+ARFLAGS= rcu -+AR= ar - RANLIB= ranlib - RM= rm -f --LIBS= -lm $(MYLIBS) -+LIBS= -lm -pthread $(MYLIBS) - - MYCFLAGS= - MYLDFLAGS= -@@ -31,12 +32,13 @@ - - LUA_T= lua - LUA_O= lua.o -+LUA_SO= liblua.so - - LUAC_T= luac - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - default: $(PLAT) -@@ -47,8 +49,11 @@ - - a: $(ALL_A) - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $? -+ - $(LUA_A): $(CORE_O) $(LIB_O) -- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files -+ $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - - $(LUA_T): $(LUA_O) $(LUA_A) diff --git a/lang/lua/pkg-plist b/lang/lua/pkg-plist deleted file mode 100644 index f893df0..0000000 --- a/lang/lua/pkg-plist +++ /dev/null @@ -1,24 +0,0 @@ -bin/lua-%%LUA_VER%% -%%LUA_BINDIR%%/lua -%%LUA_BINDIR%%/luac -bin/luac-%%LUA_VER%% -%%LUA_INCDIR%%/lauxlib.h -%%LUA_INCDIR%%/lua.h -%%LUA_INCDIR%%/lua.hpp -%%LUA_INCDIR%%/luaconf.h -%%LUA_INCDIR%%/lualib.h -lib/liblua-%%LUA_VER%%.so -lib/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%% -%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%% -%%LUA_LIBDIR%%/liblua.a -%%LUA_LIBDIR%%/liblua.so -libdata/pkgconfig/lua-%%LUA_VER%%.pc -@dirrmtry %%DATADIR%%/%%LUA_VER%% -@dirrmtry %%DATADIR%% -@dirrm %%LUA_LIBDIR%% -@dirrmtry lib/lua/%%LUA_VER%% -@dirrmtry lib/lua -@dirrm %%LUA_INCDIR%% -@dirrm %%LUA_BINDIR%% -@exec mkdir -p %D/%%DATADIR%%/%%LUA_VER%% -@exec mkdir -p %D/lib/lua/%%LUA_VER%% diff --git a/lang/lua51/Makefile b/lang/lua51/Makefile new file mode 100644 index 0000000..32e0759 --- /dev/null +++ b/lang/lua51/Makefile @@ -0,0 +1,82 @@ +# Created by: GreenDog <fiziologus@gmail.com> +# $FreeBSD$ + +PORTNAME= lua +PORTVERSION= 5.1.5 +PORTREVISION= 7 +CATEGORIES= lang +MASTER_SITES= http://www.lua.org/ftp/ +PKGNAMESUFFIX= 51 + +MAINTAINER= lua@FreeBSD.org +COMMENT= Small, compilable scripting language providing easy access to C code + +LICENSE= MIT + +LUA_VER= 5.1 +USES= readline +USE_LDCONFIG= yes + +# Overriding __MAKE_CONF makes sure that we don't re-parse +# /etc/make.conf during do-build, which would jeopardize the build +# if, for instance, the user set CFLAGS=mumble +# NOTE: /etc/make.conf is read BEFORE Makefile, so we already +# have its settings when we get here. +# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt +MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} +# liblua.so requires libm, so make sure it has an explicit dependency +# so that applications need not second-guess lua's dependencies. +LDFLAGS+= -lm -pthread +BUILD_WRKSRC= ${WRKSRC}/src +MAKE_ARGS+= MYCFLAGS="${CFLAGS} -DLUA_USE_LINUX" \ + MYLDFLAGS="${LDFLAGS} -Wl,-E -lreadline" \ + CC="${CC}" \ + LUA_T=lua51 \ + LUAC_T=luac51 \ + LUA_A=liblua-${LUA_VER}.a \ + LUA_SO=liblua-${LUA_VER}.so \ + LUA_SONAME=liblua-${LUA_VER}.so \ + TO_BIN="lua51 luac51" \ + TO_LIB="liblua-${LUA_VER}.a liblua-${LUA_VER}.so" \ + INSTALL_TOP=${STAGEDIR}${PREFIX} \ + INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua51 \ + INSTALL_EXEC="${INSTALL_PROGRAM}" + +# Cope with the lack of support for Lua 5.2 in bsd.lua.mk. These +# overrides, which are required below, should be removed once bsd.lua.mk +# understands this lua version. +LUA_PREFIX?= ${PREFIX} +LUA_SUBDIR?= lua${PKGNAMESUFFIX} +LUA_INCDIR?= ${LUA_PREFIX}/include/${LUA_SUBDIR} +LUA_LIBDIR?= ${LUA_PREFIX}/lib + +CFLAGS_amd64= -fPIC +CFLAGS_powerpc= -fPIC + +post-patch: + @${REINPLACE_CMD} -e 's,rand *(,random(,g' \ + ${WRKSRC}/src/lmathlib.c + @${REINPLACE_CMD} -e "/LUA_ROOT/s|/usr/local|${LUA_PREFIX}|" \ + ${WRKSRC}/src/luaconf.h + @${REINPLACE_CMD} -i '' -Ee \ + 's|^(prefix=).*|\1 ${PREFIX}| ; \ + s|^(libdir=).*|\1 ${LUA_LIBDIR}| ; \ + s|^(includedir=).*|\1 ${LUA_INCDIR}| ; \ + s|^(INSTALL_BIN=).*|\1 ${LUA_BINDIR}| ; \ + s|^(INSTALL_INC=).*|\1 ${LUA_INCDIR}| ; \ + s|^(INSTALL_LIB=).*|\1 ${LUA_LIBDIR}| ; \ + s|^(INSTALL_CMOD=).*|\1 ${LUA_MODLIBDIR}| ; \ + s|^(INSTALL_LMOD=).*|\1 ${LUA_MODSHAREDIR}| ; \ + s|llua|llua-${LUA_VER}|' \ + ${WRKSRC}/etc/lua.pc + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblua-${LUA_VER}.so + @${MV} ${STAGEDIR}${PREFIX}/man/man1/lua.1 \ + ${STAGEDIR}${PREFIX}/man/man1/lua51.1 + @${MV} ${STAGEDIR}${PREFIX}/man/man1/luac.1 \ + ${STAGEDIR}${PREFIX}/man/man1/luac51.1 + ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lua-${LUA_VER}.pc + +.include <bsd.port.mk> diff --git a/lang/lua/distinfo b/lang/lua51/distinfo index 702e643..702e643 100644 --- a/lang/lua/distinfo +++ b/lang/lua51/distinfo diff --git a/lang/lua/pkg-descr b/lang/lua51/pkg-descr index d0ed8af..d0ed8af 100644 --- a/lang/lua/pkg-descr +++ b/lang/lua51/pkg-descr diff --git a/lang/lua51/pkg-plist b/lang/lua51/pkg-plist new file mode 100644 index 0000000..85fb544 --- /dev/null +++ b/lang/lua51/pkg-plist @@ -0,0 +1,17 @@ +bin/lua51 +bin/luac51 +include/lua51/lauxlib.h +include/lua51/lua.h +include/lua51/lua.hpp +include/lua51/luaconf.h +include/lua51/lualib.h +lib/liblua-5.1.a +lib/liblua-5.1.so +libdata/pkgconfig/lua-5.1.pc +man/man1/lua51.1.gz +man/man1/luac51.1.gz +@dirrmtry %%DATADIR%%/5.1 +@dirrmtry %%DATADIR%% +@dirrmtry lib/lua/5.1 +@dirrmtry lib/lua +@dirrmtry include/lua51 diff --git a/lang/tolua++/Makefile b/lang/tolua++/Makefile index 55625d3..9d66083 100644 --- a/lang/tolua++/Makefile +++ b/lang/tolua++/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://www.codenix.com/~tolua/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= An extended version of tolua, a tool to integrate C/C++ code with Lua -USES= tar:bzip2 -USE_LUA= 5.1 +USES= lua:51 tar:bzip2 USE_SCONS= yes SCONS_ARGS= prefix=${PREFIX} SONAME="libtolua++-${LUA_VER}.so" @@ -29,7 +28,7 @@ BROKEN= Does not install on sparc64-9 .endif post-patch: - @${REINPLACE_CMD} -e "s|'lualib',||" ${WRKSRC}/config_posix.py + @${REINPLACE_CMD} -e "s|'lualib',||; s|lua|lua-${LUA_VER}|g" ${WRKSRC}/config_posix.py do-install: ${MKDIR} ${STAGEDIR}${TGT_BINDIR} ${STAGEDIR}${TGT_INCDIR} ${STAGEDIR}${TGT_LIBDIR} diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile index 1657c732..1d3dceb 100644 --- a/mail/mailfront/Makefile +++ b/mail/mailfront/Makefile @@ -37,7 +37,7 @@ DOCS= NEWS README TODO *.html .if ${PORT_OPTIONS:MLUA} ALL_TARGET+= lua -USE_LUA= yes +USES= lua CFLAGS+= -I${LUA_INCDIR} CFLAGS_SO+= -L${LUA_LIBDIR} LDFLAGS+= -L${LUA_LIBDIR} diff --git a/mail/osbf-lua/Makefile b/mail/osbf-lua/Makefile index 9ac3aa0..de3ece2 100644 --- a/mail/osbf-lua/Makefile +++ b/mail/osbf-lua/Makefile @@ -9,9 +9,8 @@ MASTER_SITES= http://luaforge.net/frs/download.php/2094/ MAINTAINER= ricardo.katz@gmail.com COMMENT= This tool is used as classifier for mails, primarily as Anti Spam -USE_GMAKE= YES +USES= gmake lua:51 USE_LDCONFIG= YES -USE_LUA= 5.1+ ALL_TARGET= INSTALL_TARGET= install diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 56604a8..6f6fc4d 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -60,7 +60,7 @@ PLIST_SUB+= GD="@comment " .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= yes +USES= lua:51 CMAKE_ARGS+= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" PLIST_SUB+= LUA="" LUA_MODLIBDIR="${LUA_MODLIBDIR:S,${LUA_PREFIX}/,,}" .else diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile index 2c2dfc0..2698d7c 100644 --- a/multimedia/aegisub/Makefile +++ b/multimedia/aegisub/Makefile @@ -2,12 +2,9 @@ # $FreeBSD$ PORTNAME= aegisub -PORTVERSION= 2.1.9 -PORTREVISION= 2 +PORTVERSION= 3.1.3 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/:aegisub \ - ftp://ftp.aegisub.org/pub/archives/releases/source/:aegisub \ - ftp://ftp2.aegisub.org/pub/archives/releases/source/:aegisub \ GH DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:aegisub ${FFMS_DISTFILE} @@ -34,14 +31,12 @@ GH_COMMIT= ec0ef9c WRKSRC= ${WRKDIR}/${DISTNAME} -USES= desktop-file-utils gettext gmake pkgconfig +USES= desktop-file-utils gettext gmake pkgconfig tar:xz USE_GNOME= intltool -USE_WX= 2.8 -WX_COMPS= wx contrib +USE_WX= 3.0 WX_UNICODE= yes WX_CONF_ARGS= absolute USE_GL= glu -USE_GCC= any GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gcc-prec --without-lua50 INSTALLS_ICONS= yes @@ -132,9 +127,9 @@ CONFIGURE_ARGS+= --without-hunspell .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1+ +USES+= lua CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" \ - LUA_LDFLAGS="-L${LUA_LIBDIR} -llua" + LUA_LDFLAGS="-L${LUA_LIBDIR} -llua-${LUA_VER}" CPPFLAGS+= -I${LUA_INCDIR} .else CONFIGURE_ARGS+= --without-lua diff --git a/multimedia/aegisub/distinfo b/multimedia/aegisub/distinfo index 93802ba..c1d6cab 100644 --- a/multimedia/aegisub/distinfo +++ b/multimedia/aegisub/distinfo @@ -1,4 +1,4 @@ -SHA256 (aegisub-2.1.9.tar.gz) = ac1f20751f3d2732d7e11627ea4cc30b53cb905d11422925b7f881785d373706 -SIZE (aegisub-2.1.9.tar.gz) = 2538256 +SHA256 (aegisub-3.1.3.tar.xz) = efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58 +SIZE (aegisub-3.1.3.tar.xz) = 4215196 SHA256 (ffms2-2.19.tar.gz) = 12611778f9f0083af5627067db0b163c48a0c32a43a0b4145da612f43afa69f2 SIZE (ffms2-2.19.tar.gz) = 512114 diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 60ae779..2db524c 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -308,10 +308,9 @@ USE_QT4= gui corelib moc_build rcc_build uic_build # This may become mandantory in the future .if ${PORT_OPTIONS:MLUA} -USE_LUA=5.1+ -WANT_LUA_VER=5.1 -CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua" -CONFIGURE_ARGS+=--enable-lua LUAC=luac-${WANT_LUA_VER} +USES+= lua:51 +CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" +CONFIGURE_ARGS+=--enable-lua LUAC=luac-${LUA_VER} .else CONFIGURE_ARGS+=--disable-lua .endif diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile index 24d731a..08e1f9c 100644 --- a/net-im/prosody/Makefile +++ b/net-im/prosody/Makefile @@ -25,9 +25,7 @@ GROUPS= ${USERS} USE_RC_SUBR= prosody MANCOMPRESSED= no -USES= gmake shebangfix -USE_LUA= 5.1 -WANT_LUA_VER= 5.1 +USES= gmake lua:51 shebangfix SHEBANG_LANG= lua SHEBANG_FILES= prosody prosodyctl lua_OLD_CMD= ${SETENV} lua diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile index e9c63fa..140759d 100644 --- a/net-p2p/eiskaltdcpp-lib/Makefile +++ b/net-p2p/eiskaltdcpp-lib/Makefile @@ -18,9 +18,7 @@ BUILD_DEPENDS+= chrpath:${PORTSDIR}/devel/chrpath PROJECTHOST= eiskaltdc -USE_XZ= yes -USE_GCC= yes -USES= cmake gettext +USES= cmake gettext tar:xz compiler:gcc-c++11-lib USE_OPENSSL= yes USE_LDCONFIG= yes @@ -38,9 +36,9 @@ CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1 +USES+= lua CMAKE_ARGS+= -DLUA_SCRIPT:BOOL=ON -IGNORE= crashes on connect attempt if built with Lua support +#IGNORE= crashes on connect attempt if built with Lua support .else CMAKE_ARGS+= -DLUA_SCRIPT:BOOL=OFF .endif diff --git a/net-p2p/verlihub-plugins-luascript/Makefile b/net-p2p/verlihub-plugins-luascript/Makefile index 680adfe..3f77fc6 100644 --- a/net-p2p/verlihub-plugins-luascript/Makefile +++ b/net-p2p/verlihub-plugins-luascript/Makefile @@ -12,6 +12,7 @@ MAINTAINER= me@skylord.ru PLUGIN_NAME= lua PLUGIN_DESC= LuaScript +USES= lua:51 USE_LUA= 5.1 WRKSRC= ${WRKDIR}/${DISTNAME} @@ -31,7 +32,8 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSOCKET} -LUA_COMPS+= socket:lib +BUILD_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket +RUN_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket CONFIGURE_ARGS+= --with-luasocket post-patch:: diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 638ceab..8864041 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -242,7 +242,7 @@ CONFIGURE_ARGS+= --without-srtp .if ${PORT_OPTIONS:MLUA} CONFIGURE_ARGS+= --with-lua CFLAGS+= -I${LUA_INCDIR} -USE_LUA= yes +USES+= lua:51 LDFLAGS+= -L${LUA_LIBDIR} PLIST_SUB+= WITH_LUA="" .else diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile index 3172a63..3d73f7e 100644 --- a/net/asterisk11/Makefile +++ b/net/asterisk11/Makefile @@ -236,7 +236,7 @@ CONFIGURE_ARGS+= --without-srtp .if ${PORT_OPTIONS:MLUA} CONFIGURE_ARGS+= --with-lua CFLAGS+= -I${LUA_INCDIR} -USE_LUA= yes +USES+= lua:51 LDFLAGS+= -L${LUA_LIBDIR} PLIST_SUB+= WITH_LUA="" .else diff --git a/net/luasocket/Makefile b/net/luasocket/Makefile index 3917b4a..f08d81d 100644 --- a/net/luasocket/Makefile +++ b/net/luasocket/Makefile @@ -17,12 +17,10 @@ GH_PROJECT= ${PORTNAME} GH_TAGNAME= v3.0-rc1 GH_COMMIT= 22cd583 -USE_GMAKE= yes -USE_LUA?= 5.1 -LUA_COMPS= lua +USES= lua:51 gmake pkgconfig -CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` -I${LUA_INCDIR} -LDFLAGS+= -shared -L${LOCALBASE}/lib -L${LUA_LIBDIR} +CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` +LDFLAGS+= -shared `pkgconf --libs lua-${LUA_VER}` post-extract: @${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index d34136b..e2593b6 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -103,7 +103,7 @@ CONFIGURE_ARGS+= --with-pcre=no .endif .if ${PORT_OPTIONS:MLUA} && !defined(LITE) -USE_LUA= 5.1 +USES+= lua:51 CONFIGURE_ARGS+=--with-lua=${LUA_PREFIX} PLIST_SUB+= LUA="" .else diff --git a/security/luasec/Makefile b/security/luasec/Makefile index 580ddfc..aa468b7 100644 --- a/security/luasec/Makefile +++ b/security/luasec/Makefile @@ -17,8 +17,7 @@ ALL_TARGET= bsd LIBDIR= -L${LUA_LIBDIR} -L${WRKSRC}/src/luasocket MAKE_ENV+= INCDIR="-I${LUA_INCDIR} -I${WRKSRC}/src" LUAPATH=${LUA_MODSHAREDIR} \ CPATH=${LUA_MODLIBDIR} -USE_LUA= 5.1 -WANT_LUA_VER= 5.1 +USES= lua:51 USE_OPENSSL= yes .include <bsd.port.options.mk> diff --git a/sysutils/syslog-ng-incubator/Makefile b/sysutils/syslog-ng-incubator/Makefile index 378e26a..a60a927 100644 --- a/sysutils/syslog-ng-incubator/Makefile +++ b/sysutils/syslog-ng-incubator/Makefile @@ -25,8 +25,4 @@ USE_AUTOTOOLS= autoconf:env CONFIGURE_ARGS= --datadir=${PREFIX}/share/syslog-ng/ -.include <bsd.port.pre.mk> - -USE_LUA= 5.1+ - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 36e1c3f..0ed702b 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -113,8 +113,7 @@ MAKE_ENV+= EXPR_COMPAT=yes \ # here we do only OPTIONS fixups .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1+ -LUA_COMPS= lua +USES+= lua:51 .endif .if ${PORT_OPTIONS:MPROXY_HTML} || ${PORT_OPTIONS:MXML2ENC} diff --git a/www/elinks/Makefile b/www/elinks/Makefile index ce3e814..06b76bf 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --without-guile .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.0 +USES= lua:51 CONFIGURE_ARGS+= --with-lua CPPFLAGS+= -I${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index cef0da7..70865ef 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -113,9 +113,9 @@ LIB_DEPENDS+= libev.so:${PORTSDIR}/devel/libev .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1 +USES= lua:51 CONFIGURE_ARGS+= --with-lua -CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua" +CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" .endif .if ${PORT_OPTIONS:MMEMCACHE} diff --git a/www/luakit/Makefile b/www/luakit/Makefile index d16ded0..119a1a8 100644 --- a/www/luakit/Makefile +++ b/www/luakit/Makefile @@ -24,9 +24,8 @@ GH_PROGECT= ${PORTNAME} GH_TAGNAME= ${PORTVERSION:C/r/-r/} GH_COMMIT= 0d5f4ab -USES= pkgconfig gmake +USES= pkgconfig gmake lua:51 USE_GNOME= glib20 gtk20 -USE_LUA= 5.1 MAKE_ARGS+= USE_UNIQUE=1 NO_JAVASCRIPTCORE=1 MAN1= luakit.1 diff --git a/x11-toolkits/elementary/Makefile b/x11-toolkits/elementary/Makefile index 1515f17..7125e42 100644 --- a/x11-toolkits/elementary/Makefile +++ b/x11-toolkits/elementary/Makefile @@ -13,12 +13,10 @@ COMMENT= Simple widget toolkit using EFL LICENSE= LGPL21 DIST_SUBDIR= e17 -USE_BZIP2= yes GNU_CONFIGURE= yes -USES= pathfix pkgconfig +USES= lua pathfix pkgconfig tar:bzip2 USE_EFL= ecore eio edbus efreet embryo edje emotion ethumb \ libtool_hack librt_hack modarch_hack -USE_LUA= 5.1+ USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile index 89c4a4a..5fd45eb 100644 --- a/x11/keybinder/Makefile +++ b/x11/keybinder/Makefile @@ -2,7 +2,7 @@ PORTNAME= keybinder PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= GENTOO/distfiles @@ -35,7 +35,7 @@ PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= 5.1 +USES+= lua:51 CONFIGURE_ARGS+= --with-lua-includes=${LUA_INCDIR} PLIST_SUB+= LUA="" .else |
