From dbd53b94cc554de06afd5085a9c7c0d9eee92c96 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 29 Dec 2003 19:58:45 +0000 Subject: [PATCH] * Fix some whitespace nits spotted by portlint * Add a WITHOUT_KDE_MENUS knob to prevent the merging of KDE menus [1] Submitted by: Franz Klammer [1] --- devel/gnome-vfs/Makefile | 12 ++++++++---- ...s_vfolder_applications-all-users.vfolder-info.in} | 0 devel/gnomevfs2/Makefile | 12 ++++++++---- ...s_vfolder_applications-all-users.vfolder-info.in} | 0 4 files changed, 16 insertions(+), 8 deletions(-) rename devel/gnome-vfs/files/{patch-modules_vfolder_applications-all-users.vfolder-info.in => modules_vfolder_applications-all-users.vfolder-info.in} (100%) rename devel/gnomevfs2/files/{patch-modules_vfolder_applications-all-users.vfolder-info.in => modules_vfolder_applications-all-users.vfolder-info.in} (100%) diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index b7decdbd1fab..9161cb4b2e46 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -28,20 +28,24 @@ 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 .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 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 similarity index 100% rename from devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in rename to devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index b7decdbd1fab..9161cb4b2e46 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -28,20 +28,24 @@ 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 .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 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 similarity index 100% rename from devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in rename to devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in