svn commit: r345531 - head/Mk

[John Marino]

Author: marino
Date: Fri Feb 21 18:53:16 2014
New Revision: 345531
URL: http://svnweb.freebsd.org/changeset/ports/345531
QAT: https://qat.redports.org/buildarchive/r345531/

Log:
  Mk/bsd.(ruby,efl).mk: Replace "freebsd" with OPSYS:L
  
  This change is no-op for FreeBSD but is needed for DragonFly support.
  It has been run in dports for a year.  Also unneeded trailing slashes were
  removed from bsd.efl.mk (also tested for a year).
  
  Approved by: 	portmgr (bapt)

Modified:
  head/Mk/bsd.efl.mk
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.efl.mk
==============================================================================
--- head/Mk/bsd.efl.mk	Fri Feb 21 18:44:41 2014	(r345530)
+++ head/Mk/bsd.efl.mk	Fri Feb 21 18:53:16 2014	(r345531)
@@ -137,9 +137,9 @@ _EFL_EVAS_LOADERS_ALL=	bmp eet generic g
 # Generic evas engines definitions
 #
 _EFL_EVAS_CATEGORY=		graphics
-_EFL_EVAS_MODDIR=		${LOCALBASE}/lib/evas/modules/
-_EFL_EVAS_ENGINES_MODDIR=	${_EFL_EVAS_MODDIR}/engines/
-_EFL_EVAS_LOADERS_MODDIR=	${_EFL_EVAS_MODDIR}/loaders/
+_EFL_EVAS_MODDIR=		${LOCALBASE}/lib/evas/modules
+_EFL_EVAS_ENGINES_MODDIR=	${_EFL_EVAS_MODDIR}/engines
+_EFL_EVAS_LOADERS_MODDIR=	${_EFL_EVAS_MODDIR}/loaders
 
 #
 # Evas engine modules definitions
@@ -288,8 +288,8 @@ _USE_EFL_EVAS_ENGINES_UQ+=	${COMP}
 . endfor
 
 . for COMP in ${_USE_EFL_EVAS_ENGINES_UQ}
-BUILD_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
-RUN_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
+BUILD_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
+RUN_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
 . endfor
 
 .endif #USE_EFL_EVAS_ENGINES
@@ -316,8 +316,8 @@ _USE_EFL_EVAS_LOADERS_UQ+=	${COMP}
 . endfor
 
 . for COMP in ${_USE_EFL_EVAS_LOADERS_UQ}
-BUILD_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
-RUN_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
+BUILD_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
+RUN_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
 . endfor
 
 .endif #USE_EFL_EVAS_LOADERS
@@ -398,7 +398,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
-PLIST_SUB+=	E17_ARCH=freebsd${OSREL}-${ARCH}
+PLIST_SUB+=	E17_ARCH=${OPSYS:L}${OSREL}-${ARCH}
 
 .if defined(_USE_EFL_LIBRT_HACK)
 #

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Fri Feb 21 18:44:41 2014	(r345530)
+++ head/Mk/bsd.ruby.mk	Fri Feb 21 18:53:16 2014	(r345531)
@@ -243,9 +243,9 @@ RUBY_CONFIGURE_ARGS+=	--with-rubyhdrdir=
 			--docdir="${RUBY_DOCDIR}" \
 			--with-soname=ruby${RUBY_SUFFIX}
 
-CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL:C/\..*//}
+CONFIGURE_TARGET?=	${ARCH}-portbld-${OPSYS:L}${OSREL:C/\..*//}
 
-RUBY_ARCH?=		${ARCH}-freebsd${OSREL:C/\..*//}
+RUBY_ARCH?=		${ARCH}-${OPSYS:L}${OSREL:C/\..*//}
 RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
 _RUBY_SYSLIBDIR?=	${PREFIX}/lib