Date: 10 Apr 2005 15:03:50 -0000 From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79760: [PATCH:ADD_FEATURE] bsd.port.mk support for smake Message-ID: <20050410150350.26800.qmail@exxodus.fedaykin.here> Resent-Message-ID: <200504101510.j3AFAMTg097410@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79760
>Category: ports
>Synopsis: [PATCH:ADD_FEATURE] bsd.port.mk support for smake
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 10 15:10:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Mario Sergio Fujikawa Ferreira
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD exxodus.fedaykin.here 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Apr 6 21:27:42 BRT 2005 root@exxodus.fedaykin.here:/usr/obj/usr/src/sys/LIOUX i386
n.a.
>Description:
This patch adds support for smake to bsd.port.mk. This is
a nifty Makefile processor tool which can be used for ports as
sysutils/cdrtools-devel, sysutils/cdrdao, etc.
This is merely a proposal. I would like feedback on it. I
understand that adding a bsd.port.mk feature for merely <10 ports
(that I know of) is far fetched but I thought I should drop this
on the queue to see if others want it.
ps: this PR is being forwarded 1st to cdrtools-devel maintainer for
feedback then it will be sent to portmgr's queue for evaluation
>How-To-Repeat:
Apply bsd.port.mk patch then apply cdrtools-devel patch.
Build cdrtools-devel port to verify that the patch works.
I do understand that remove USE_GMAKE and setting
MAKE=${LOCALBASE}/smake should yield the same effect. This is a
proposal for bsd.port.mk direct and clean support though.
>Fix:
--- patch-smake-bsd.port.mk begins here ---
--- bsd.port.mk.orig Sun Apr 10 10:43:55 2005
+++ bsd.port.mk Sun Apr 10 11:48:24 2005
@@ -1437,6 +1437,10 @@
BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
CONFIGURE_ENV+= MAKE=${GMAKE}
.endif
+.if defined(USE_SMAKE)
+BUILD_DEPENDS+= smake:${PORTSDIR}/devel/smake
+CONFIGURE_ENV+= MAKE=${SMAKE}
+.endif
.if defined(USE_GCC)
.include "${PORTSDIR}/Mk/bsd.gcc.mk"
@@ -1842,6 +1846,7 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
+SMAKE?= smake
XMKMF?= xmkmf -a
.if exists(/sbin/md5)
MD5?= /sbin/md5
@@ -3301,6 +3306,8 @@
do-build:
.if defined(USE_GMAKE)
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.elif defined(USE_SMAKE)
+ @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${SMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
.else
.if defined(PERL_MODBUILD)
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
@@ -3347,7 +3354,11 @@
.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
.endif
-.else # !defined(USE_GMAKE)
+# !defined(USE_GMAKE)
+.elif defined(USE_SMAKE)
+ @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${SMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+# !define(USE_SMAKE)
+.else
.if defined(PERL_MODBUILD)
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${INSTALL_TARGET})
.else
--- patch-smake-bsd.port.mk ends here ---
--- patch-smake-cdrtools-devel begins here ---
--- Makefile.orig Sun Apr 10 11:01:13 2005
+++ Makefile Sun Apr 10 11:43:03 2005
@@ -33,9 +33,9 @@
NO_LATEST_LINK= yes
USE_BZIP2= yes
-USE_GMAKE= yes
+USE_SMAKE= yes
USE_REINPLACE= yes
-MAKE_ENV= CCOM=${CC} LANG=C
+MAKE_ENV= CC=${CC} CCOM=${CC} LANG=C
#CFLAGS+= -DSOURCE_MODIFIED
WRKSRC= ${WRKDIR}/${DISTNAME:C/a(.+)$//}
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -80,7 +80,7 @@
.endif
post-patch:
- @${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man
+# @${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man
.if !defined(WITH_RSCSI)
@${RM} ${WRKSRC}/TARGETS/55rscsi
.endif
--- patch-smake-cdrtools-devel ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050410150350.26800.qmail>