svn commit: r323946 - in head/net/wpa_gui: . files

[Jason Helfman]

Author: jgh
Date: Tue Jul 30 07:40:14 2013
New Revision: 323946
URL: http://svnweb.freebsd.org/changeset/ports/323946

Log:
  - Update to 0.7.3
  - Add a distfile that includes the wpa_gui's icons in PNG format
  - Remove dependency on qt3support (this is "wpa_gui-qt4")
  - Switch to included desktop icon instead of DESKTOP_ENTRIES
  - Replace tab with space in pkg-decr on the WWW line
  - while here drop MAKE_JOBS_SAFE, as it is now the default
  
  PR:		180333
  Submitted by:	kevinz5000 at gmail.com
  Approved by:	maintainer timeout 14 days ( webmaster at kibab.com )

Added:
  head/net/wpa_gui/files/
  head/net/wpa_gui/files/patch-wpa_gui.pro   (contents, props changed)
Modified:
  head/net/wpa_gui/Makefile
  head/net/wpa_gui/distinfo   (contents, props changed)
  head/net/wpa_gui/pkg-descr   (contents, props changed)

Modified: head/net/wpa_gui/Makefile
==============================================================================
--- head/net/wpa_gui/Makefile	Tue Jul 30 06:59:59 2013	(r323945)
+++ head/net/wpa_gui/Makefile	Tue Jul 30 07:40:14 2013	(r323946)
@@ -2,29 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	wpa_gui
-PORTVERSION=	0.5.11
-PORTREVISION=	3
+PORTVERSION=	0.7.3
 CATEGORIES=	net
-MASTER_SITES=	http://hostap.epitest.fi/releases/
+MASTER_SITES=	http://hostap.epitest.fi/releases/ \
+		http://quasarp.dyndns.org/dist/freebsd/:icons \
+		LOCAL/jgh/net/${PORTNAME}/:icons
 DISTNAME=	wpa_supplicant-${PORTVERSION}
+DISTFILES=	${DISTNAME}.tar.gz \
+		wpa-gui-icons.tar.gz:icons
 
 MAINTAINER=	webmaster at kibab.com
 COMMENT=	Qt-based frontend for wpa_supplicant
 
-PLIST_FILES=	sbin/${PORTNAME}
-WRKSRC=		${WRKDIR}/${DISTNAME}/wpa_gui-qt4
-USE_QT4=	gui qt3support qmake_build moc_build uic_build
-QMAKE_ARGS+=	PREFIX=${PREFIX}
+PLIST_FILES=	sbin/wpa_gui \
+		share/applications/wpa_gui.desktop \
+		share/pixmaps/wpa_gui.svg
+PLIST_DIRSTRY=	share/applications
+WRKSRC=		${WRKDIR}/${DISTNAME}/wpa_supplicant/wpa_gui-qt4
+USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
 
-DESKTOP_ENTRIES=	"${PORTNAME}" "Frontend for WPA Supplicant" "" \
-			"${PORTNAME}" "System;Qt;" "true"
+post-patch:
+	@${REINPLACE_CMD} -e "s|Exec=wpa_gui|Exec=${PREFIX}/sbin/wpa_gui|" \
+	    ${WRKSRC}/wpa_gui.desktop
+	${MV} ${WRKDIR}/icons/hicolor ${WRKSRC}/icons
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin
+	@${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg ${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>

Modified: head/net/wpa_gui/distinfo
==============================================================================
--- head/net/wpa_gui/distinfo	Tue Jul 30 06:59:59 2013	(r323945)
+++ head/net/wpa_gui/distinfo	Tue Jul 30 07:40:14 2013	(r323946)
@@ -1,2 +1,4 @@
-SHA256 (wpa_supplicant-0.5.11.tar.gz) = 5b4e73dc489a118293a3d08291730c3fab82c3542e1ad1fb12267180c3478f19
-SIZE (wpa_supplicant-0.5.11.tar.gz) = 723321
+SHA256 (wpa_supplicant-0.7.3.tar.gz) = d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443
+SIZE (wpa_supplicant-0.7.3.tar.gz) = 1638224
+SHA256 (wpa-gui-icons.tar.gz) = c0d2adb4d8d9f58c015e4862a5ab50c7a562b6bb641e1bb6a0cc841249573b42
+SIZE (wpa-gui-icons.tar.gz) = 3797

Added: head/net/wpa_gui/files/patch-wpa_gui.pro
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/wpa_gui/files/patch-wpa_gui.pro	Tue Jul 30 07:40:14 2013	(r323946)
@@ -0,0 +1,10 @@
+--- ./wpa_gui.pro.orig	2010-09-07 10:43:39.000000000 -0500
++++ ./wpa_gui.pro	2013-07-05 13:24:16.000000000 -0500
+@@ -26,6 +26,7 @@
+ } else {
+   DEFINES += CONFIG_CTRL_IFACE_UNIX
+   SOURCES += ../../src/utils/os_unix.c
++  RESOURCES += icons_png.qrc
+ }
+ 
+ INCLUDEPATH	+= . .. ../../src ../../src/utils

Modified: head/net/wpa_gui/pkg-descr
==============================================================================
--- head/net/wpa_gui/pkg-descr	Tue Jul 30 06:59:59 2013	(r323945)
+++ head/net/wpa_gui/pkg-descr	Tue Jul 30 07:40:14 2013	(r323946)
@@ -1,3 +1,3 @@
 wpa_gui is a nice GUI frontend for wpa_supplicant tool. 
 
-WWW:	http://hostap.epitest.fi/wpa_supplicant/
+WWW: http://hostap.epitest.fi/wpa_supplicant/