From 948d071f34a66e518337348c89bb77b4aa12a6c8 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Sun, 11 Aug 2002 12:36:24 +0000 Subject: [PATCH] More changes to allow this port to be used as master for ports/x11-fm/gnomemc --- misc/mc/Makefile | 14 +++++++++----- misc/mc/pkg-plist | 12 ++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 52eb658ae16c..3e482d8d72c4 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -45,22 +45,26 @@ PLIST_SUB= CHARSETS="@comment " .endif .if ${PORTNAME} == "mc" CONFIGURE_ARGS+=--without-gnome +.else +CONFIGURE_ARGS+=--without-edit .endif CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS="-L${LOCALBASE}/lib -lintl" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} .if ${PORTNAME} == "mc" -PLIST_SUB+= GNOMEMC="@comment " SHARE_PATH="share" -.else -PLIST_SUB+= GNOMEMC="" SHARE_PATH="share/gnome" -.endif - +PLIST_SUB+= GNOMEMC="@comment " MC="" SHARE_PATH="share" MAN1= mc.1 mcedit.1 +.else +PLIST_SUB+= GNOMEMC="" MC="@comment " SHARE_PATH="share/gnome" +.endif post-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} \ -e 's|\$$(libdir)/mc|\$$(datadir)/mc|g' \ -e 's|\$$(datadir)/locale|\$$(prefix)/share/locale|g' +.if ${PORTNAME} != "mc + @${REINPLACE_CMD} -e 's|^SUBDIRS = intl po vfs edit src lib doc|SUBDIRS = intl po vfs lib|' ${WRKSRC}/Makefile.in +.endif @${REINPLACE_CMD} -e 's|DRAR=/usr/bin|DRAR=${LOCALBASE}/bin|' \ ${WRKSRC}/vfs/extfs/urar.in @${REINPLACE_CMD} -e 's|/usr/bin/\(.*\)zip|${LOCALBASE}/bin/\1zip|' \ diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist index c0a453266a7b..74f71a73731a 100644 --- a/misc/mc/pkg-plist +++ b/misc/mc/pkg-plist @@ -1,11 +1,11 @@ %%GNOMEMC%%bin/gmc %%GNOMEMC%%bin/gmc-client %%GNOMEMC%%bin/plain-gmc -bin/mcmfmt -bin/mc -bin/mcedit -bin/mcview -bin/midc +%%MC%%bin/mcmfmt +%%MC%%bin/mc +%%MC%%bin/mcedit +%%MC%%bin/mcview +%%MC%%bin/midc %%GNOMEMC%%etc/CORBA/servers/gmc.gnorba etc/mc.global share/locale/az/LC_MESSAGES/mc.mo @@ -81,7 +81,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mc.mo %%SHARE_PATH%%/mc/mc.hint.ru %%SHARE_PATH%%/mc/mc.hint.uk %%SHARE_PATH%%/mc/mc.hint.zh -%%SHARE_PATH%%/mc/mc.hlp +%%MC%%%%SHARE_PATH%%/mc/mc.hlp %%SHARE_PATH%%/mc/mc.hlp.hu %%SHARE_PATH%%/mc/mc.lib %%SHARE_PATH%%/mc/mc.menu