From 707cfb8178c014c4d79edd83e6c5afcc8898b503 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 29 Dec 2003 20:00:38 +0000 Subject: * 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 --- devel/gnome-vfs/Makefile | 14 +++++++++----- .../modules_vfolder_applications-all-users.vfolder-info.in | 11 +++++++++++ ...-modules_vfolder_applications-all-users.vfolder-info.in | 11 ----------- devel/gnomevfs2/Makefile | 14 +++++++++----- .../modules_vfolder_applications-all-users.vfolder-info.in | 11 +++++++++++ ...-modules_vfolder_applications-all-users.vfolder-info.in | 11 ----------- 6 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in delete mode 100644 devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in create mode 100644 devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in delete mode 100644 devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in (limited to 'devel') 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 .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/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in new file mode 100644 index 000000000..13ce78387 --- /dev/null +++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -0,0 +1,11 @@ +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 ++++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 +@@ -19,7 +19,7 @@ + /usr/share/gnome/apps/ + + +- /etc/X11/applnk/ ++ %%LOCALBASE%%/share/applnk/ + + + diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in deleted file mode 100644 index 13ce78387..000000000 --- a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 -@@ -19,7 +19,7 @@ - /usr/share/gnome/apps/ - - -- /etc/X11/applnk/ -+ %%LOCALBASE%%/share/applnk/ - - - 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 .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/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in new file mode 100644 index 000000000..13ce78387 --- /dev/null +++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -0,0 +1,11 @@ +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 ++++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 +@@ -19,7 +19,7 @@ + /usr/share/gnome/apps/ + + +- /etc/X11/applnk/ ++ %%LOCALBASE%%/share/applnk/ + + + diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in deleted file mode 100644 index 13ce78387..000000000 --- a/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 -@@ -19,7 +19,7 @@ - /usr/share/gnome/apps/ - - -- /etc/X11/applnk/ -+ %%LOCALBASE%%/share/applnk/ - - - -- cgit v1.2.3