[Midnightbsd-cvs] mports [15639] trunk: switch over to MAKE_CMD for freebsd compatibility and add an fmake port

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Nov 29 17:44:57 EST 2013 

Revision: 15639
          http://svnweb.midnightbsd.org/mports/?rev=15639
Author:   laffer1
Date:     2013-11-29 17:44:56 -0500 (Fri, 29 Nov 2013)
Log Message:
-----------
switch over to MAKE_CMD for freebsd compatibility and add an fmake port

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk
    trunk/Mk/components/commands.mk
    trunk/Mk/components/fake/targets.mk
    trunk/Mk/extensions/gmake.mk
    trunk/devel/Makefile
    trunk/devel/git/Makefile
    trunk/devel/git/distinfo

Added Paths:
-----------
    trunk/Mk/extensions/fmake.mk
    trunk/devel/fmake/
    trunk/devel/fmake/Makefile
    trunk/devel/fmake/distinfo
    trunk/devel/fmake/pkg-descr

Property Changed:
----------------
    trunk/Mk/components/fake/targets.mk
    trunk/Mk/components/fake/vars.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/Mk/bsd.mport.mk	2013-11-29 22:44:56 UTC (rev 15639)
@@ -334,7 +334,7 @@
 # in the future if things could be fixed to work when loaded alphabetacally, then
 # we could go back to the above approach.
 _ALL_EXT=	charsetfix pathfix pkgconfig linux_rpm linux_apps xorg fortran \
-		gcc gmake bison local perl5 openssl \
+		gcc fmake gmake bison local perl5 openssl \
 		emacs gnustep php python java ruby tcl apache kde qt \
 		autotools gnome lua wx gstreamer sdl xfce kde4 cmake mysql \
 		pgsql bdb sqlite gecko scons ocaml efl gettext \

Modified: trunk/Mk/components/commands.mk
===================================================================
--- trunk/Mk/components/commands.mk	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/Mk/components/commands.mk	2013-11-29 22:44:56 UTC (rev 15639)
@@ -12,7 +12,7 @@
 
 _COMMANDSMKINCLUDED=     yes
 
-_MAKE_CMD=	/usr/bin/make
+MAKE_CMD=	/usr/bin/make
 
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename

Modified: trunk/Mk/components/fake/targets.mk
===================================================================
--- trunk/Mk/components/fake/targets.mk	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/Mk/components/fake/targets.mk	2013-11-29 22:44:56 UTC (rev 15639)
@@ -62,10 +62,10 @@
 
 run-fake:
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKE_SETUP}\
-		${_MAKE_CMD} -f ${MAKEFILE} ${FAKE_MAKEARGS} ${FAKE_TARGET};
+		${MAKE_CMD} -f ${MAKEFILE} ${FAKE_MAKEARGS} ${FAKE_TARGET};
 .	if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
 		@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKE_SETUP}\
-			${_MAKE_CMD} -f ${MAKEFILE} ${FAKE_MAKEARGS} install.man
+			${MAKE_CMD} -f ${MAKEFILE} ${FAKE_MAKEARGS} install.man
 .	endif
 
 


Property changes on: trunk/Mk/components/fake/targets.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/Mk/components/fake/vars.mk
===================================================================
--- trunk/Mk/components/fake/vars.mk	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/Mk/components/fake/vars.mk	2013-11-29 22:44:56 UTC (rev 15639)

Property changes on: trunk/Mk/components/fake/vars.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/Mk/extensions/fmake.mk
===================================================================
--- trunk/Mk/extensions/fmake.mk	                        (rev 0)
+++ trunk/Mk/extensions/fmake.mk	2013-11-29 22:44:56 UTC (rev 15639)
@@ -0,0 +1,22 @@
+# $MidnightBSD$
+#
+# Provide support to use the legacy FreeBSD make
+#
+# Feature:		fmake
+# Usage:		USES=fmake
+#
+
+.if !defined(_INCLUDE_USES_FMAKE_MK)
+_INCLUDE_USES_FMAKE_MK=	yes
+
+.if defined(fmake_ARGS)
+IGNORE=	Incorrect 'USES+= fmake:${fmake_ARGS}' fmake takes no arguments
+.endif
+
+.if defined(.PARSEDIR)
+FMAKE=			${LOCALBASE}/bin/fmake
+BUILD_DEPENDS+=		${FMAKE}:${PORTSDIR}/devel/fmake
+CONFIGURE_ENV+=		MAKE=${FMAKE}
+MAKE_CMD?=		${FMAKE}
+.endif
+.endif

Modified: trunk/Mk/extensions/gmake.mk
===================================================================
--- trunk/Mk/extensions/gmake.mk	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/Mk/extensions/gmake.mk	2013-11-29 22:44:56 UTC (rev 15639)
@@ -15,6 +15,6 @@
 
 BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel/gmake
 CONFIGURE_ENV+=		MAKE=${GMAKE}
-_MAKE_CMD?=		${GMAKE}
+MAKE_CMD?=		${GMAKE}
 
 .endif

Modified: trunk/devel/Makefile
===================================================================
--- trunk/devel/Makefile	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/devel/Makefile	2013-11-29 22:44:56 UTC (rev 15639)
@@ -71,6 +71,7 @@
 SUBDIR += etoile-unitkit
 SUBDIR += fam
 SUBDIR += ffcall
+SUBDIR += fmake
 SUBDIR += gamin
 SUBDIR += gccmakedep
 SUBDIR += gconf

Added: trunk/devel/fmake/Makefile
===================================================================
--- trunk/devel/fmake/Makefile	                        (rev 0)
+++ trunk/devel/fmake/Makefile	2013-11-29 22:44:56 UTC (rev 15639)
@@ -0,0 +1,24 @@
+# $MidnightBSD$
+
+PORTNAME=	fmake
+PORTVERSION=	r250982
+MASTER_SITES=	FREEBSD_LOCAL/crees/${PORTNAME}/ \
+		http://www.bayofrum.net/dist/${PORTNAME}/
+CATEGORIES=	devel
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Legacy FreeBSD pmake
+
+LICENSE=	bsd3
+
+PLIST_FILES=	bin/${PORTNAME}
+MAN1=		${PORTNAME}.1
+
+MAKE_ARGS+=	PROG=fmake NO_MAN=yes
+
+do-install:
+		${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+		${INSTALL_MAN} ${WRKSRC}/make.1 \
+			${MAN1PREFIX}/man/man1/${PORTNAME}.1
+
+.include <bsd.port.mk>

Added: trunk/devel/fmake/distinfo
===================================================================
--- trunk/devel/fmake/distinfo	                        (rev 0)
+++ trunk/devel/fmake/distinfo	2013-11-29 22:44:56 UTC (rev 15639)
@@ -0,0 +1,2 @@
+SHA256 (fmake-r250982.tar.gz) = 29a7c3b6e247a564fa6ac4bc7515b1ccc56df8061df023456d10e89f0916f4fd
+SIZE (fmake-r250982.tar.gz) = 176405

Added: trunk/devel/fmake/pkg-descr
===================================================================
--- trunk/devel/fmake/pkg-descr	                        (rev 0)
+++ trunk/devel/fmake/pkg-descr	2013-11-29 22:44:56 UTC (rev 15639)
@@ -0,0 +1 @@
+This contains the traditional FreeBSD pmake, which is installed as fmake.

Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/devel/git/Makefile	2013-11-29 22:44:56 UTC (rev 15639)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	git
-PORTVERSION=	1.8.4.3
+PORTVERSION=	1.8.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -16,6 +16,8 @@
 
 PROJECTHOST=	git-core
 
+MAKE_JOBS_UNSAFE=	yes
+
 MAN1=		git.1 \
 		git-add.1 \
 		git-am.1 \
@@ -188,7 +190,7 @@
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 EXTENSIONS+=    python
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -228,7 +230,7 @@
 .if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON_VER=${PYTHON_VER} PYTHON=""
-CONFIGURE_ARGS+=	--with-python=${LOCALBASE}/bin/python
+CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
 .else
 CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=	PYTHON="@comment "

Modified: trunk/devel/git/distinfo
===================================================================
--- trunk/devel/git/distinfo	2013-11-28 18:21:17 UTC (rev 15638)
+++ trunk/devel/git/distinfo	2013-11-29 22:44:56 UTC (rev 15639)
@@ -1,6 +1,6 @@
-SHA256 (git-1.8.4.3.tar.gz) = 0a78fa71465e58e07d003dc5a575b606fe02b5e7cd5b509d83a44926606fcb21
-SIZE (git-1.8.4.3.tar.gz) = 4677332
-SHA256 (git-manpages-1.8.4.3.tar.gz) = e3f04ee3fa05fc82c584297a51d2baba42c65265687494a7bf0d828d0a9d156c
-SIZE (git-manpages-1.8.4.3.tar.gz) = 565288
-SHA256 (git-htmldocs-1.8.4.3.tar.gz) = 79942c09cefa8dd67e160796b834a562d95808dc6f0e390904350c3c8b4d0ca3
-SIZE (git-htmldocs-1.8.4.3.tar.gz) = 2206916
+SHA256 (git-1.8.5.tar.gz) = 870f52e19bb599b2835455e62db10e4c693fdbcc154f7802512d74393cc26b23
+SIZE (git-1.8.5.tar.gz) = 4754382
+SHA256 (git-manpages-1.8.5.tar.gz) = 5e8dfb2cc26c84e8dd3156232e104e71424f86ca35b741e7d163afe8b242b256
+SIZE (git-manpages-1.8.5.tar.gz) = 569012
+SHA256 (git-htmldocs-1.8.5.tar.gz) = 7c62416f22fc6f5b82b8b3f088ebffeb6b2bb1886dfd8925291cde2842fbc6bc
+SIZE (git-htmldocs-1.8.5.tar.gz) = 2235835

More information about the Midnightbsd-cvs mailing list