10 files changed, 33 insertions, 46 deletions

diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile
index f5932a8f2ce9..e9d33033870a 100644
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@@ -20,8 +20,6 @@ NO_WRKSUBDIR=	yes
 USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xt
 
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index fa896999e5f5..0ca0fcb4cb8c 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -14,8 +14,6 @@ COMMENT=	Graphically display output of du
 NO_WRKSUBDIR=	yes
 USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-PLIST_FILES=	bin/xdu lib/X11/app-defaults/XDu
-MAN1=		xdu.1
+PLIST_FILES=	bin/xdu lib/X11/app-defaults/XDu man/man1/xdu.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 91b51a2c4841..107dabdecc91 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CD/DVD burning tool for Xfce
 
-LIB_DEPENDS=	burn:${PORTSDIR}/devel/libburn \
-		isofs:${PORTSDIR}/devel/libisofs
+LIB_DEPENDS=	libburn.so:${PORTSDIR}/devel/libburn \
+		libisofs.so:${PORTSDIR}/devel/libisofs
 RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
@@ -21,38 +21,22 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GMSGFMT=${PREFIX}/bin/msgfmt DATADIRNAME=share
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	intltool
 USE_XFCE=	configenv libexo libgui
-USES=		pkgconfig
+USES=		pkgconfig gmake
 INSTALLS_ICONS=	yes
 
-MAN1=		xfburn.1
-
 OPTIONS_DEFINE=	DBUS HAL GSTREAMER NLS
 OPTIONS_DEFAULT=	DBUS HAL
+NLS_USE=	USES=gettext
+MLS_CONFIGURE_ENABLE=	nls
+DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_ENABLE=	dbus
+HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_ENABLE=	hal
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
-.else
-CONFIGURE_ARGS+=	--disable-dbus
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
-.else
-CONFIGURE_ARGS+=	--disable-hal
-.endif
-
 .if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER=	core
 CONFIGURE_ARGS+=	"LDFLAGS=-lgstpbutils-0.10"
diff --git a/sysutils/xfburn/pkg-plist b/sysutils/xfburn/pkg-plist
index 2e73a8b5fe8f..eee696768eb0 100644
--- a/sysutils/xfburn/pkg-plist
+++ b/sysutils/xfburn/pkg-plist
@@ -1,6 +1,7 @@
 %%DATADIR%%/xfburn-toolbars.ui
 %%DATADIR%%/xfburn.ui
 bin/xfburn
+man/man1/xfburn.1.gz
 share/Thunar/sendto/thunar-sendto-xfburn.desktop
 share/applications/xfburn.desktop
 share/icons/hicolor/16x16/stock/media/stock_xfburn-audio-cd.png
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index d9830bf1fce0..7a33081e0b9d 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -14,12 +14,10 @@ COMMENT=	Generic Monitor Xfce4 panel plugin
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=        pathfix gettext pkgconfig
+USES=		pathfix gettext pkgconfig gmake
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu panel
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-genmon-plugin/pkg-plist b/sysutils/xfce4-genmon-plugin/pkg-plist
index 9a374c0419af..0a6e74e32cbd 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-plist
+++ b/sysutils/xfce4-genmon-plugin/pkg-plist
@@ -38,6 +38,7 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/xfce4/panel/plugins/genmon.desktop
 @dirrmtry share/xfce4/panel/plugins
 @dirrmtry share/xfce4/panel
+@dirrmtry share/xfce4
 @dirrmtry share/locale/ur_PK/LC_MESSAGES
 @dirrmtry share/locale/ur_PK
 @dirrmtry share/locale/ur/LC_MESSAGES
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index e6c17b4f08dc..e9edfc6ac1d6 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -15,8 +15,6 @@ COMMENT=	X File System Monitor
 USES=		imake
 USE_XORG=	xbitmaps x11 xext
 MAKE_ARGS=	CC="${CC}" CCOPTIONS="-DFreeBSD"
-MAN1=		xfsm.1
-PLIST_FILES=	bin/xfsm
+PLIST_FILES=	bin/xfsm man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/xin/Makefile b/sysutils/xin/Makefile
index 716bc6687b6a..29d9b53b7f8b 100644
--- a/sysutils/xin/Makefile
+++ b/sysutils/xin/Makefile
@@ -12,8 +12,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Splits standard input and pipes into a command
 
 GNU_CONFIGURE=	yes
-MAN1=		xin.1
-PLIST_FILES=	bin/xin
+PLIST_FILES=	bin/xin man/man1/xin.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index d7c23f3d9973..a5e2a4fa1ff5 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -12,15 +12,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System information display tool
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_XORG=	x11
-MAN1=		xsysstats.1
 
 ALL_TARGET=	xsysstats
 
-PLIST_FILES=	bin/xsysstats
+PLIST_FILES=	bin/xsysstats man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 pre-patch:
 	${RM} ${WRKSRC}/headers.h && ${TOUCH} ${WRKSRC}/headers.h
 
diff --git a/sysutils/xsysstats/files/patch-Makefile.in b/sysutils/xsysstats/files/patch-Makefile.in
index d5efe31d1f40..2f28b5ad8033 100644
--- a/sysutils/xsysstats/files/patch-Makefile.in
+++ b/sysutils/xsysstats/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue May 30 08:07:38 2000
-+++ Makefile.in	Sat Nov  9 08:50:56 2002
+--- Makefile.in.orig	2000-05-30 14:07:38.000000000 +0800
++++ Makefile.in	2013-11-16 23:47:26.000000000 +0800
 @@ -1,6 +1,6 @@
 -CC = @CC@
 -CFLAGS = @CFLAGS@
@@ -10,3 +10,16 @@
  LIBS = @LIBS@
  LDFLAGS = @LDFLAGS@
  
+@@ -31,10 +31,8 @@ xysstats.o: xsysstats.c xsysstats.h conf
+ porting.o: xsysstats.c xsysstats.h config.h headers.h
+ 
+ install:
+-	mkdir -p $(BINDIR)
+-	$(INSTALL) xsysstats $(BINDIR)/xsysstats
+-	mkdir -p $(MANDIR)
+-	$(INSTALL) xsysstats.man $(MANDIR)/xsysstats.1
++	$(INSTALL) xsysstats $(DESTDIR)$(BINDIR)/xsysstats
++	$(INSTALL) xsysstats.man $(DESTDIR)$(MANDIR)/xsysstats.1
+ 
+ clean:
+ 	rm -f *.o core xsysstats