[Midnightbsd-cvs] mports [18521] trunk/misc/mc-light: fix the build as seen on magus

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 31 21:43:26 EDT 2015


Revision: 18521
          http://svnweb.midnightbsd.org/mports/?rev=18521
Author:   laffer1
Date:     2015-03-31 21:43:25 -0400 (Tue, 31 Mar 2015)
Log Message:
-----------
fix the build as seen on magus

Modified Paths:
--------------
    trunk/misc/mc-light/Makefile
    trunk/misc/mc-light/pkg-plist

Modified: trunk/misc/mc-light/Makefile
===================================================================
--- trunk/misc/mc-light/Makefile	2015-04-01 01:39:52 UTC (rev 18520)
+++ trunk/misc/mc-light/Makefile	2015-04-01 01:43:25 UTC (rev 18521)
@@ -2,7 +2,7 @@
 
 PORTNAME=	mc-light
 PORTVERSION=	4.1.40.p9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc shells
 MASTER_SITES=	http://mc.linuxinside.com/Releases/
 DISTNAME=	mc-${PORTVERSION:S/.p9/-pre9/}
@@ -16,12 +16,7 @@
 
 CONFLICTS=	mc-4.7*
 
-OPTIONS_DEFINE=	NLS SUBSHELL MC_IN_MC
-SUBSHELL_DESC=	Build with subshell support (only for bash!)
-MC_IN_MC_DESC=	Allow run mc inside mc (useful for mcedit)
-
-USES=		pkgconfig iconv
-USE_GMAKE=	yes
+USES=		pkgconfig iconv gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-included-slang \
 		--with-gettext \
@@ -30,30 +25,25 @@
 		--without-gpm-mouse \
 		--with-edit
 
-MAN1=		mc.1 mcedit.1
-MAN8=		mcserv.8
+OPTIONS_DEFINE=	NLS SUBSHELL MC_IN_MC
+OPTIONS_SUB=	yes
 
-.include <bsd.mport.options.mk>
+SUBSHELL_DESC=	Build with subshell support (only for bash!)
+SUBSHELL_CONFIGURE_WITH=	subshell
 
-.if ! ${PORT_OPTIONS:MSUBSHELL}
-CONFIGURE_ARGS+=--without-subshell
-.endif
+MC_IN_MC_DESC=	Allow run mc inside mc (useful for mcedit)
+MC_IN_MC_CPPFLAGS=	-DMC_IN_MC_ALLOWED
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
-.if ${PORT_OPTIONS:MMC_IN_MC}
-CPPFLAGS+=	-DMC_IN_MC_ALLOWED
-.endif
+post-patch:
+	@${REINPLACE_CMD} '/destdir/ s|gnulocaledir|DESTDIR)$$(&|' \
+		${WRKSRC}/po/Makefile.in.in
 
 post-install:
 .for i in a arfs audio cpio deb esp ftplist hp48 iso lha lslR mailfs patchfs rar rpm trpm uarj uha zip zoo
-	${CHMOD} 755 ${PREFIX}/share/mc/extfs/${i}
+	${CHMOD} 755 ${PREFIX}/share/mc/extfs/${i} 
 .endfor
 
 .include <bsd.port.mk>

Modified: trunk/misc/mc-light/pkg-plist
===================================================================
--- trunk/misc/mc-light/pkg-plist	2015-04-01 01:39:52 UTC (rev 18520)
+++ trunk/misc/mc-light/pkg-plist	2015-04-01 01:43:25 UTC (rev 18521)
@@ -1,8 +1,10 @@
- at comment $MidnightBSD$
 bin/mc
 bin/mcedit
 bin/mcmfmt
 bin/mcserv
+man/man1/mc.1.gz
+man/man1/mcedit.1.gz
+man/man8/mcserv.8.gz
 share/mc/FAQ
 share/mc/bin/mcfn_install
 share/mc/codepages/7bit.cp
@@ -127,9 +129,3 @@
 share/mc/term/xterm.tcap
 share/mc/term/xterm.ti
 %%NLS%%share/locale/ru/LC_MESSAGES/mc.mo
- at dirrm share/mc/term
- at dirrm share/mc/syntax
- at dirrm share/mc/extfs
- at dirrm share/mc/codepages
- at dirrm share/mc/bin
- at dirrm share/mc



More information about the Midnightbsd-cvs mailing list