diff options
| author | marcus <marcus@FreeBSD.org> | 2011-12-20 00:14:56 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2011-12-20 00:14:56 +0000 |
| commit | 0795ffe18a4262f5a01c48163eadacb5f97de15a (patch) | |
| tree | f90a3412d686e4af8a1b258ded282c3ee7b73421 | |
| parent | 5a4ed6243ba901201ec8ed4ea339bf71d4ac5e28 (diff) | |
| download | FreeBSD-ports-0795ffe18a4262f5a01c48163eadacb5f97de15a.zip FreeBSD-ports-0795ffe18a4262f5a01c48163eadacb5f97de15a.tar.gz | |
Missed some PRs in the 1.6.4 update.
* Clean up Makefile by removing some errant spaces [1]
* Fix up the GnuTLS options [1] [2]
* Add a desktop entry for wireshark [3]
PR: 163146 [1]
162879 [2]
163045 [3]
Submitted by: rm [1]
Alfred Bartsch <bartsch@dssgmbh.de> [2]
Olivier Cochard-Labbé <olivier@cochard.me>[3]
| -rw-r--r-- | net/wireshark/Makefile | 21 | ||||
| -rw-r--r-- | net/wireshark/pkg-plist | 1 |
2 files changed, 17 insertions, 5 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index d9bb4ed..0a6b97b 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -7,6 +7,7 @@ PORTNAME?= wireshark PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://wireshark.osmirror.nl/download/src/ \ @@ -38,6 +39,10 @@ DATADIR= ${PREFIX}/share/${DATADIR_NAME} LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -funit-at-a-time +DESKTOP_ENTRIES= "Wireshark" "Network Protocol Analyzer" \ + "${DATADIR}/hi48-app-wireshark.png" \ + "wireshark" "System;Monitor;GTK;" true + WIRESHARK_LIBS= .for x in capinfos editcap idl2wrs mergecap rawshark text2pcap dftest randpkt @@ -146,13 +151,16 @@ CONFIGURE_ARGS+= --with-geoip=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-geoip=no .endif -.if exists(${LOCALBASE}/lib/libgnutls.so) || !defined(WITHOUT_GNUTLS) +.if !defined(WITHOUT_GNUTLS) LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls \ - gcrypt.18:${PORTSDIR}/security/libgcrypt -CONFIGURE_ARGS+=--with-libgnutls-prefix=${LOCALBASE} + gcrypt.18:${PORTSDIR}/security/libgcrypt +CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} \ + --with-gnutls=yes +.else +CONFIGURE_ARGS+=--with-gnutls=no .endif -.if exists(${LOCALBASE}/lib/libgcrypt.so) || !defined(WITHOUT_LIBGCRYPT) +.if !defined(WITHOUT_LIBGCRYPT) LIB_DEPENDS+= gcrypt.18:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} .endif @@ -162,7 +170,10 @@ MAN4+= wireshark-filter.4 post-patch: @${REINPLACE_CMD} -e 's|lua5\.1|lua${LUA_VER_STR}|g ; \ - s|-llua${LUA_VER_STR}|${LUA_LIBDIR}/liblua.a|g' \ + s|-llua${LUA_VER_STR}|${LUA_LIBDIR}/liblua.a|g' \ ${WRKSRC}/configure +post-install: + ${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png ${DATADIR} + .include <bsd.port.post.mk> diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index d9c8f03..c342761 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -105,6 +105,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so %%DATADIR%%/help/getting_started.txt %%DATADIR%%/help/overview.txt %%DATADIR%%/help/toc +%%DATADIR%%/hi48-app-wireshark.png %%DATADIR%%/idl2wrs.html %%DATADIR%%/ipmap.html %%DATADIR%%/manuf |
