diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/Makefile | 3 | ||||
| -rw-r--r-- | net/freeswitch/Makefile | 2 | ||||
| -rw-r--r-- | net/lualdap-51/Makefile | 9 | ||||
| -rw-r--r-- | net/lualdap/Makefile | 6 | ||||
| -rw-r--r-- | net/luasocket-51/Makefile | 13 | ||||
| -rw-r--r-- | net/luasocket-53/Makefile | 13 | ||||
| -rw-r--r-- | net/luasocket/Makefile | 6 | ||||
| -rw-r--r-- | net/wireshark/Makefile | 2 |
8 files changed, 10 insertions, 44 deletions
diff --git a/net/Makefile b/net/Makefile index 23fa086792d5..fa2d4a4e663c 100644 --- a/net/Makefile +++ b/net/Makefile @@ -430,10 +430,7 @@ SUBDIR += lla SUBDIR += ltm SUBDIR += lualdap - SUBDIR += lualdap-51 SUBDIR += luasocket - SUBDIR += luasocket-51 - SUBDIR += luasocket-53 SUBDIR += lvwimax SUBDIR += mDNSResponder SUBDIR += macchanger diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 12b1ad52bade..f32433f35388 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -29,7 +29,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff -USES= gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz +USES= gmake iconv jpeg libedit libtool lua:51-52 perl5 pkgconfig shebangfix ssl tar:xz USE_LDCONFIG= yes USE_RC_SUBR= freeswitch diff --git a/net/lualdap-51/Makefile b/net/lualdap-51/Makefile deleted file mode 100644 index 68e74a0e0ee6..000000000000 --- a/net/lualdap-51/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -USES= gmake lua:51 - -MASTERDIR= ${.CURDIR}/../lualdap - -.include "${MASTERDIR}/Makefile" - -COMMENT+= (version 5.1) diff --git a/net/lualdap/Makefile b/net/lualdap/Makefile index 99f995a087cf..45169564c410 100644 --- a/net/lualdap/Makefile +++ b/net/lualdap/Makefile @@ -3,7 +3,7 @@ PORTNAME= lualdap PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/LuaLDAP${PORTVERSION}/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} MAINTAINER= pf@itwf.pl COMMENT= LDAP support for the Lua language -USES?= gmake lua +USES= gmake lua:-52,module USE_OPENLDAP= yes # the CPPFLAGS fixes builds where PREFIX != LOCALBASE @@ -26,6 +26,8 @@ ALL_TARGET= OPTIONS_DEFINE= DOCS +DOCSDIR= ${LUA_DOCSDIR} + do-install: @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/lualdap.so.${PORTVERSION} ${STAGEDIR}${LUA_MODLIBDIR}/${PORTNAME}.so diff --git a/net/luasocket-51/Makefile b/net/luasocket-51/Makefile deleted file mode 100644 index 90974322502f..000000000000 --- a/net/luasocket-51/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Jan Hornyak <pav@oook.cz> -# $FreeBSD$ - -SLAVE_PORT= luasocket - -USES= gmake lua:51 pkgconfig - -MASTERDIR= ${.CURDIR}/../luasocket -PLIST= ${MASTERDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" - -COMMENT+= (version 5.1) diff --git a/net/luasocket-53/Makefile b/net/luasocket-53/Makefile deleted file mode 100644 index 6024bee98ef2..000000000000 --- a/net/luasocket-53/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Jan Hornyak <pav@oook.cz> -# $FreeBSD$ - -SLAVE_PORT= luasocket - -USES= gmake lua:53 pkgconfig - -MASTERDIR= ${.CURDIR}/../luasocket -PLIST= ${MASTERDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" - -COMMENT+= (version 5.3) diff --git a/net/luasocket/Makefile b/net/luasocket/Makefile index 8c24a0c54a27..9a6e3a9ebc0c 100644 --- a/net/luasocket/Makefile +++ b/net/luasocket/Makefile @@ -4,7 +4,7 @@ PORTNAME= luasocket DISTVERSIONPREFIX= v DISTVERSION= 3.0-rc1 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= net PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -19,7 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= diegonehab MAKE_ARGS= LUAV=${LUA_VER} -USES?= gmake lua pkgconfig +USES= gmake lua:module pkgconfig INSTALL_TARGET= install-unix CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` \ @@ -28,6 +28,8 @@ LDFLAGS+= -shared `pkgconf --libs lua-${LUA_VER}` OPTIONS_DEFINE= DOCS +DOCSDIR= ${LUA_DOCSDIR} + post-extract: @${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile @${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/Makefile diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 6946227e4096..24cf15ed24a2 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -84,7 +84,7 @@ CISCODUMP_DESC= Build ciscodump extcap tool GUI_USES= qt:5 GUI_USE= qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build -LUA_USES= lua:5[1-2] +LUA_USES= lua:51-52 GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit |