- Fix build

PR:		ports/116313
Submitted by:	Alex "lissyara" Keda <admin (AT) lissyara.su>
		Peter Hofer <ph (AT) desktopbsd.net> via mail
Approved by:	miwi (mentor)

6 files changed, 18 insertions, 8 deletions

diff --git a/sysutils/desktopbsd-tools/Makefile b/sysutils/desktopbsd-tools/Makefile
index f856f40fa85c..0c41314474c5 100644
--- a/sysutils/desktopbsd-tools/Makefile
+++ b/sysutils/desktopbsd-tools/Makefile
@@ -24,6 +24,8 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 
+INSTALLS_ICONS=	yes
+
 QMAKE?=		qmake
 QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
@@ -31,8 +33,6 @@ MAKE_ENV=	QTDIR="${QT_PREFIX}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DATADIR=	${PREFIX}/share/desktopbsd
 
-BROKEN=		fails to compile in various ways
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 601101 || ( ${OSVERSION} >= 700000 && ${OSVERSION} < 700015 )
@@ -43,10 +43,9 @@ RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 RUN_DEPENDS+=	portsnap:${PORTSDIR}/ports-mgmt/portsnap
 .endif
 
-post-extract:
-.for f in ${X11R6_FILES}
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g' ${WRKSRC}/${f}
-.endfor
+.if ${OSVERSION} > 600007
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libdesktopbsd_accesspoint.h ${FILESDIR}/extra-patch-libdesktopbsd_accesspoint.cpp ${FILESDIR}/extra-patch-libdesktopbsd_wirelessinterface.h ${FILESDIR}/extra-patch-libdesktopbsd_wirelessinterface.cpp
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_accesspoint.cpp b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_accesspoint.cpp
index 7b262733dee3..1f5192632cd4 100644
--- a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_accesspoint.cpp
+++ b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_accesspoint.cpp
@@ -41,7 +41,7 @@ Index: libdesktopbsd/accesspoint.cpp
 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + * SUCH DAMAGE.
 + *
-+ * $FreeBSD: /tmp/pcvs/ports/sysutils/desktopbsd-tools/files/Attic/patch-libdesktopbsd_accesspoint.cpp,v 1.1 2007-09-07 20:02:13 lme Exp $
++ * $FreeBSD: /tmp/pcvs/ports/sysutils/desktopbsd-tools/files/Attic/extra-patch-libdesktopbsd_accesspoint.cpp,v 1.1 2007-10-29 21:03:57 lme Exp $
 + */
  
 +/*-
diff --git a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_accesspoint.h b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_accesspoint.h
index 97f5a84e58f4..97f5a84e58f4 100644
--- a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_accesspoint.h
+++ b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_accesspoint.h
diff --git a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_wirelessinterface.cpp b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_wirelessinterface.cpp
index f9f3dc805523..51d5e6fb13a3 100644
--- a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_wirelessinterface.cpp
+++ b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_wirelessinterface.cpp
@@ -41,7 +41,7 @@ Index: libdesktopbsd/wirelessinterface.cpp
 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + * SUCH DAMAGE.
 + *
-+ * $FreeBSD: /tmp/pcvs/ports/sysutils/desktopbsd-tools/files/Attic/patch-libdesktopbsd_wirelessinterface.cpp,v 1.1 2007-09-07 20:02:13 lme Exp $
++ * $FreeBSD: /tmp/pcvs/ports/sysutils/desktopbsd-tools/files/Attic/extra-patch-libdesktopbsd_wirelessinterface.cpp,v 1.1 2007-10-29 21:03:57 lme Exp $
 + */
 +
 +/*-
diff --git a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_wirelessinterface.h b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_wirelessinterface.h
index 3ef4a9ffe73f..3ef4a9ffe73f 100644
--- a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd_wirelessinterface.h
+++ b/sysutils/desktopbsd-tools/files/extra-patch-libdesktopbsd_wirelessinterface.h
diff --git a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-ui_moddevinfo.ui.h b/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-ui_moddevinfo.ui.h
new file mode 100644
index 000000000000..9d3263b02c5f
--- /dev/null
+++ b/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-ui_moddevinfo.ui.h
@@ -0,0 +1,11 @@
+--- libdesktopbsd-ui/moddevinfo.ui.h.orgi	2007-10-29 19:53:33.000000000 +0100
++++ libdesktopbsd-ui/moddevinfo.ui.h	2007-10-29 19:54:09.000000000 +0100
+@@ -32,7 +32,7 @@
+ 
+ 	if(dev->dd_name[0] != '\0' && dev->dd_state >= DIS_ATTACHED) {
+ 		Device  device(dev->dd_name);
+-		uint level = (uint) arg;
++		uint64_t level = (uint64_t) arg;
+ 
+ 		/* Check the index in parents[], even if it is
+ 		 * highly unlikely that it is > 32.