diff options
| author | marino <marino@FreeBSD.org> | 2014-02-22 02:53:16 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-02-22 02:53:16 +0800 |
| commit | 033334f99e9432a031edeeec5ecce57e05872dbf (patch) | |
| tree | bb8727d2bff815faaeee04d0c9c95e1da756d73c /Mk | |
| parent | 8deb034a373b8c52c8d85058149471e5aa2a61e0 (diff) | |
| download | freebsd-ports-gnome-033334f99e9432a031edeeec5ecce57e05872dbf.tar.gz freebsd-ports-gnome-033334f99e9432a031edeeec5ecce57e05872dbf.tar.zst freebsd-ports-gnome-033334f99e9432a031edeeec5ecce57e05872dbf.zip | |
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)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.efl.mk | 16 | ||||
| -rw-r--r-- | Mk/bsd.ruby.mk | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk index e5bff5d74e98..ef74b35a577c 100644 --- a/Mk/bsd.efl.mk +++ b/Mk/bsd.efl.mk @@ -137,9 +137,9 @@ _EFL_EVAS_LOADERS_ALL= bmp eet generic gif ico jpeg \ # 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) # diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 405f4c36fe44..95c748dd9c06 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -243,9 +243,9 @@ RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \ --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 |