diff --git a/net-mgmt/wifimgr/Makefile b/net-mgmt/wifimgr/Makefile index e3ac5eeac9fc..87ae8f75f023 100644 --- a/net-mgmt/wifimgr/Makefile +++ b/net-mgmt/wifimgr/Makefile @@ -1,34 +1,34 @@ # Created by: J.R. Oldroyd PORTNAME= wifimgr -PORTVERSION= 1.16 +PORTVERSION= 1.17 CATEGORIES= net-mgmt sysutils MASTER_SITES= http://opal.com/freebsd/ports/net-mgmt/wifimgr/ \ LOCAL/ehaupt MAINTAINER= fbsd@opal.com COMMENT= WiFi Networks Manager LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= desktop-file-utils gnome pkgconfig tar:bzip2 xorg USE_GNOME= cairo INSTALLS_ICONS= yes USE_XORG= x11 OPTIONS_DEFINE= GTK2 NLS OPTIONS_SUB= yes GTK2_USE= GNOME=gtk20 GTK2_MAKE_ENV= GTK_VERSION=2 GTK2_USE_OFF= GNOME=gtk30 NLS_USES= gettext-runtime gettext-tools NLS_MAKE_ENV_OFF= WITHOUT_NLS=yes NLS_CFLAGS_OFF= -DWITHOUT_NLS .include diff --git a/net-mgmt/wifimgr/distinfo b/net-mgmt/wifimgr/distinfo index 8afe8cabf312..9701dabaf7c8 100644 --- a/net-mgmt/wifimgr/distinfo +++ b/net-mgmt/wifimgr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624878064 -SHA256 (wifimgr-1.16.tar.bz2) = 77facd5fbaed2ed4a7565d2022c2b1004ccd901aa004c36d1dc71c1f3339ccbd -SIZE (wifimgr-1.16.tar.bz2) = 123167 +TIMESTAMP = 1625916451 +SHA256 (wifimgr-1.17.tar.bz2) = 1902029615f2a556b57bc349d6ce549f97314587ad4443f6bc5ac2d69b9a9c8d +SIZE (wifimgr-1.17.tar.bz2) = 122980 diff --git a/net-mgmt/wifimgr/files/patch-src_Makefile b/net-mgmt/wifimgr/files/patch-src_Makefile index f81053e001bc..5b8e947bf1c4 100644 --- a/net-mgmt/wifimgr/files/patch-src_Makefile +++ b/net-mgmt/wifimgr/files/patch-src_Makefile @@ -1,52 +1,20 @@ ---- src/Makefile.orig 2021-06-28 10:55:25 UTC +--- src/Makefile.orig 2014-05-10 22:54:38 UTC +++ src/Makefile -@@ -6,9 +6,11 @@ - # $Id: Makefile 145 2021-06-28 10:55:25Z jr $ - # - --GTK_CFLAGS != pkg-config --cflags gtk+-3.0 --GTK_LDFLAGS != pkg-config --libs gtk+-3.0 -+GTK_VERSION ?= 3 - -+GTK_CFLAGS != pkg-config --cflags gtk+-${GTK_VERSION}.0 -+GTK_LDFLAGS != pkg-config --libs gtk+-${GTK_VERSION}.0 -+ - .if defined(WITHOUT_NLS) - CFLAGS += -DWITHOUT_NLS - .else -@@ -71,7 +73,7 @@ installed = ${DESTDIR}${PREFIX}/bin/wifimgr \ - - all: wifimgr wifimgrsu - --wmgr_objs = wifimgr.o string.o net_list.o wifimgr-gtk.o -+wmgr_objs = wifimgr.o string.o net_list.o wifimgr-gtk${GTK_VERSION}.o - - wifimgr: ${wmgr_objs} - ${CC} -o $@ ${wmgr_objs} ${LDFLAGS} -@@ -82,7 +84,7 @@ string.o: string.c - - net_list.o: net_list.c wifimgr.h - --wifimgr-gtk.o: wifimgr-gtk.c wifimgr.h version.h -+wifimgr-gtk${GTK_VERSION}.o: wifimgr-gtk${GTK_VERSION}.c wifimgr.h version.h - - wmgrsu_objs = wifimgrsu.o string.o - -@@ -97,7 +99,7 @@ clean: +@@ -97,7 +97,7 @@ clean: rm -f *.o rm -f *.core -install: ${installed} update-icon-cache +install: ${installed} # update-icon-cache deinstall: do-deinstall update-icon-cache -@@ -113,7 +115,7 @@ ${DESTDIR}${PREFIX}/bin/wifimgr: wifimgr +@@ -113,7 +113,7 @@ ${DESTDIR}${PREFIX}/bin/wifimgr: wifimgr ${INSTALL} $? $@ ${DESTDIR}${PREFIX}/libexec/wifimgrsu: wifimgrsu - ${INSTALL} -o root -g wheel -m 4511 $? $@ + ${INSTALL} -m 511 $? $@ ${DESTDIR}${PREFIX}/share/applications/wifimgr.desktop: wifimgr.desktop ${INSTALL} -m 444 $? $@