Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Sep 2019 21:01:05 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r510742 - in head/sysutils/pc-networkmanager: . files
Message-ID:  <201909012101.x81L156q071756@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Sun Sep  1 21:01:04 2019
New Revision: 510742
URL: https://svnweb.freebsd.org/changeset/ports/510742

Log:
  Unbreak sysutils/pc-networkmanager
  
  This is part of the TrueOS tools, and it was marked BROKEN about
  a year ago; a fix appeared upstream only days later, but there's
  been no udpate to the port.
  
  The same kind of fix probably applies to sysutils/pcbsd-utils-qt5
  but I don't feel like chasing it. PR listed below is for that port,
  pinging maintainer(s).
  
  (All this is because we're chasing fallout for the Qt 5.13 update)
  
  PR:		231682

Added:
  head/sysutils/pc-networkmanager/files/
  head/sysutils/pc-networkmanager/files/patch-git-b812350a   (contents, props changed)
Modified:
  head/sysutils/pc-networkmanager/Makefile

Modified: head/sysutils/pc-networkmanager/Makefile
==============================================================================
--- head/sysutils/pc-networkmanager/Makefile	Sun Sep  1 20:54:49 2019	(r510741)
+++ head/sysutils/pc-networkmanager/Makefile	Sun Sep  1 21:01:04 2019	(r510742)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pc-networkmanager
 PORTVERSION=	201710031301
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	jt@ixsystems.com
@@ -10,15 +10,12 @@ COMMENT=	TrueOS Qt based network manager
 
 LICENSE=	BSD2CLAUSE
 
-BROKEN_FreeBSD_12=	use of undeclared identifiers 'IFM_FDDI' and 'IFM_TOKEN'
-BROKEN_FreeBSD_13=	use of undeclared identifiers 'IFM_FDDI' and 'IFM_TOKEN'
 ONLY_FOR_ARCHS=	amd64
 
 LIB_DEPENDS=	libtrueos-ui.so:sysutils/trueos-libqt5
 
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
-CONFLICTS=	pcbsd-utils*
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		qmake qt:5 shebangfix tar:xz

Added: head/sysutils/pc-networkmanager/files/patch-git-b812350a
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/pc-networkmanager/files/patch-git-b812350a	Sun Sep  1 21:01:04 2019	(r510742)
@@ -0,0 +1,16 @@
+diff --git src/backend/NetDevice.cpp src/backend/NetDevice.cpp
+index bb3a047..eb1f320 100644
+--- src/backend/NetDevice.cpp
++++ src/backend/NetDevice.cpp
+@@ -169,11 +169,6 @@ QString NetDevice::mediaStatusAsString(){
+    QString status;
+ 
+    switch (IFM_TYPE(ifm.ifm_active)){
+-      case IFM_FDDI:
+-      case IFM_TOKEN:
+-         if (ifm.ifm_status & IFM_ACTIVE) status = "inserted";
+-         else status = "no ring";
+-         break;
+       case IFM_IEEE80211:
+          if (ifm.ifm_status & IFM_ACTIVE) status = "associated";
+          else status = "no carrier";



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909012101.x81L156q071756>