* Fix some whitespace nits

* Add the WITHOUT_KDE_MENUS knob to prevent the merging of KDE menus

Obtained from:	FreeBSD ports tree


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1543 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 18 insertions, 10 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index be0366346..3a9c7e4f0 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -28,27 +28,31 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+.if !defined(WITHOUT_KDE_MENUS)
+EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=        yes
+WITH_CDPARANOIA=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libfam.a)
 WITH_FAM=	yes
 .endif
 
 .if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=   cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=     CDPARANOIA=""
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	CDPARANOIA=""
 .else
-PLIST_SUB+=     CDPARANOIA="@comment "
+PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
 .if defined(WITH_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
index 13ce78387..13ce78387 100644
--- a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in
+++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index be0366346..3a9c7e4f0 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -28,27 +28,31 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+.if !defined(WITHOUT_KDE_MENUS)
+EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=        yes
+WITH_CDPARANOIA=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libfam.a)
 WITH_FAM=	yes
 .endif
 
 .if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=   cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=     CDPARANOIA=""
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	CDPARANOIA=""
 .else
-PLIST_SUB+=     CDPARANOIA="@comment "
+PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
 .if defined(WITH_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
index 13ce78387..13ce78387 100644
--- a/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in
+++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in