Attachment 150681 Details for Bug 196062 – Remove Mk/bsd.efl.mk

[patch] Remove Mk/bsd.efl.mk

mk.diff (text/plain), 26.65 KB, created by Grzegorz Blach on 2014-12-17 13:47:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Grzegorz Blach

Created: 2014-12-17 13:47:12 UTC

Size: 26.65 KB

patch

obsolete

>Index: Mk/bsd.efl.mk
>===================================================================
>--- Mk/bsd.efl.mk	(revision 374730)
>+++ Mk/bsd.efl.mk	(working copy)
>@@ -1,269 +0,0 @@
>-#
>-# $MBSDlabs: portmk/bsd.efl.mk,v 1.17 2006/10/02 14:57:48 stas Exp $
>-# $FreeBSD$
>-#
>-# bsd.efl.mk - Support for Enlightenment Foundation Libraries (EFL)
>-#
>-# Author: Stanislav Sedov <stas@FreeBSD.org>
>-# Inspired by bsd.sdl.mk by Edwin Groothuis <edwin@freebsd.org>
>-#
>-# You can specify EFL-related library dependency using "USE_EFL=" statement,
>-# e.g. "USE_EFL= ecore evas" will add x11/ecore and graphics/evas as dependency
>-# for your port.
>-# You can check existency of certain library throught "WANT_EFL/HAVE_EFL" pair.
>-# Note: WANT_EFL should be defined before including <bsd.port.pre.mk>, and
>-# HAVE_EFL variable could be tested after it. For example:
>-#
>-#	WANT_EFL=	yes
>-#	.include <bsd.port.pre.mk>
>-#	.if ${HAVE_EFL:Mevas}
>-#	USE_EFL+=	evas
>-#	.endif
>-#
>-# Currently recognized variables are:
>-# USE_EFL	- lists all EFL libraries which port depends on
>-# WANT_EFL	- the port wants to test which of EFL libraries are installed
>-#			on the target system
>-#
>-# The following variables could be tested after inclusion of bsd.port.pre.mk:
>-# HAVE_EFL	- lists all EFL libraries which are available on target system
>-#
>-# Feel free to send any comments and suggestion to maintainer.
>-#
>-
>-EFL_Include_MAINTAINER=	gblach@FreeBSD.org
>-
>-#
>-# Define all supported libraries
>-#
>-_USE_EFL_ALL=	epeg imlib2
>-
>-# For each library supported we define the following variables:
>-#	_%%LIB%%_CATEGORY	- category the port belongs to
>-#	_%%LIB%%_PREFIX		- where the library is installed
>-#	_%%LIB%%_VERSION	- version of the shared library
>-#	_%%LIB%%_SLIB		- name of the shared library
>-#
>-
>-_epeg_CATEGORY=		graphics
>-_epeg_VERSION=		9
>-
>-_imlib2_CATEGORY=	graphics
>-_imlib2_VERSION=	5
>-_imlib2_SLIB=		Imlib2
>-
>-#
>-# Assign values for variables which were not defined explicitly
>-#
>-.for LIB in ${_USE_EFL_ALL}
>-. if !defined(_${LIB}_SLIB)
>-_${LIB}_SLIB=${LIB}
>-. endif
>-. if !defined(_${LIB}_PORTNAME)
>-_${LIB}_PORTNAME=${LIB}
>-. endif
>-. if !defined(_${LIB}_PREFIX)
>-_${LIB}_PREFIX=${LOCALBASE}
>-. endif
>-.endfor
>-
>-#
>-# Handle WANT_EFL feature
>-#
>-.if !defined(AFTERPORTMK)
>-.if !defined(EFL_Include_pre)
>-
>-EFL_Include_pre=	bsd.efl.mk
>-
>-HAVE_EFL?=
>-.if defined(WANT_EFL)
>-#
>-# General EFL components
>-#
>-. for LIB in ${_USE_EFL_ALL}
>-.  if exists(${_${LIB}_PREFIX}/lib/lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION})
>-HAVE_EFL+=	${LIB}
>-.  endif
>-. endfor
>-.endif
>-
>-.endif #EFL_Include_pre
>-.endif #AFTERPORTMK
>-
>-#
>-# Handle USE_EFL feature
>-#
>-.if !defined(BEFOREPORTMK)
>-.if !defined(EFL_Include_post)
>-
>-.if defined(USE_EFL_EVAS_ENGINES)
>-
>-USE_EFL+=	evas
>-
>-_USE_EFL_EVAS_ENGINES=	#empty
>-. for COMP in ${USE_EFL_EVAS_ENGINES}
>-.  if ${_EFL_EVAS_ENGINES_ALL:M${COMP}}==""
>-IGNORE=	cannot install: unknown evas engine ${COMP}
>-.  else
>-_USE_EFL_EVAS_ENGINES+=	${COMP}
>-.  endif
>-. endfor
>-
>-# Get rid of duplicates
>-_USE_EFL_EVAS_ENGINES_UQ=	#empty
>-. for COMP in ${_USE_EFL_EVAS_ENGINES}
>-.  if ${_USE_EFL_EVAS_ENGINES_UQ:M${COMP}}==""
>-_USE_EFL_EVAS_ENGINES_UQ+=	${COMP}
>-.  endif
>-. endfor
>-
>-. for COMP in ${_USE_EFL_EVAS_ENGINES_UQ}
>-BUILD_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
>-RUN_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
>-. endfor
>-
>-.endif #USE_EFL_EVAS_ENGINES
>-
>-.if defined(USE_EFL_EVAS_LOADERS)
>-
>-USE_EFL+=	evas
>-
>-_USE_EFL_EVAS_LOADERS=	#empty
>-. for COMP in ${USE_EFL_EVAS_LOADERS}
>-.  if ${_EFL_EVAS_LOADERS_ALL:M${COMP}}==""
>-IGNORE=	cannot install: unknown evas loader ${COMP}
>-.  else
>-_USE_EFL_EVAS_LOADERS+=	${COMP}
>-.  endif
>-. endfor
>-
>-# Get rid of duplicates
>-_USE_EFL_EVAS_LOADERS_UQ=	#empty
>-. for COMP in ${_USE_EFL_EVAS_LOADERS}
>-.  if ${_USE_EFL_EVAS_LOADERS_UQ:M${COMP}}==""
>-_USE_EFL_EVAS_LOADERS_UQ+=	${COMP}
>-.  endif
>-. endfor
>-
>-. for COMP in ${_USE_EFL_EVAS_LOADERS_UQ}
>-BUILD_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
>-RUN_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
>-. endfor
>-
>-.endif #USE_EFL_EVAS_LOADERS
>-
>-.if defined(USE_EFL_ECORE)
>-
>-USE_EFL+=	ecore
>-
>-_USE_EFL_ECORE=	#empty
>-. for COMP in ${USE_EFL_ECORE}
>-.  if ${_EFL_ECORE_ALL:M${COMP}}==""
>-IGNORE=	cannot install: unknown ecore module ${COMP}
>-.  else
>-_USE_EFL_ECORE+=	${COMP}
>-.  endif
>-. endfor
>-
>-# Get rid of duplicates
>-_USE_EFL_ECORE_UQ=	#empty
>-. for COMP in ${_USE_EFL_ECORE}
>-.  if ${_USE_EFL_ECORE_UQ:M${COMP}}==""
>-_USE_EFL_ECORE_UQ+=	${COMP}
>-.  endif
>-. endfor
>-
>-. for COMP in ${_USE_EFL_ECORE_UQ}
>-LIB_DEPENDS+=	lib${_ecore_${COMP}_NAME}.so.${_ecore_VERSION}:${PORTSDIR}/${_ecore_${COMP}_CATEGORY}/${_ecore_${COMP}_PORTNAME}
>-. endfor
>-
>-.endif #USE_EFL_ECORE
>-
>-.if defined(USE_EFL)
>-
>-EFL_Include_post=	bsd.efl.mk
>-
>-#
>-# Check if we have all libraries requiested and build depends list
>-#
>-.if ${USE_EFL:Mlibrt_hack}
>-_USE_EFL_LIBRT_HACK=	yes
>-.endif
>-.if ${USE_EFL:Mmodarch_hack}
>-_USE_EFL_MODARCH_HACK=	yes
>-.endif
>-.if ${USE_EFL:Mlibtool_hack}
>-_USE_EFL_LIBTOOL_HACK=	yes
>-.endif
>-_USE_EFL=	#empty
>-.for LIB in ${USE_EFL:Nlibrt_hack:Nmodarch_hack:Nlibtool_hack}
>-. if ${_USE_EFL_ALL:M${LIB}}==""
>-IGNORE=	cannot install: unknown library ${LIB}
>-. else
>-_USE_EFL+=	${LIB}
>-. endif
>-.endfor
>-
>-#
>-# Get rid of duplicates
>-#
>-_USE_EFL_UQ=	#empty
>-.for LIB in ${_USE_EFL}
>-. if ${_USE_EFL_UQ:M${LIB}}==""
>-_USE_EFL_UQ+=	${LIB}
>-. endif
>-.endfor
>-
>-#
>-# define dependencies
>-#
>-.for LIB in ${_USE_EFL_UQ}
>-LIB_DEPENDS+=	lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}/${_${LIB}_PORTNAME}
>-.endfor
>-
>-#
>-# Initialize configure enviropment
>-#
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CFLAGS+=	-I${LOCALBASE}/include
>-
>-PLIST_SUB+=	E17_ARCH=${OPSYS:tl}${OSREL}-${ARCH}
>-
>-.if defined(_USE_EFL_LIBRT_HACK)
>-#
>-# Don't use librt
>-#
>-post-patch: efl_drop_librt
>-efl_drop_librt:
>-	@${REINPLACE_CMD} -E \
>-		-e '/^[[:space:]]+freebsd\*/,/^[[:space:]];;/s/-lrt//g' \
>-		${WRKSRC}/configure
>-.endif
>-
>-.if defined(_USE_EFL_MODARCH_HACK)
>-#
>-# Use correct module arch path
>-#
>-post-patch: efl_patch_modarch
>-efl_patch_modarch:
>-	@${REINPLACE_CMD} -E \
>-		-e 's/(MODULE_ARCH="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
>-		-e 's/(MODULE_EDJE="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
>-		${WRKSRC}/configure
>-.endif
>-
>-.if defined(_USE_EFL_LIBTOOL_HACK)
>-#
>-# Get rid of .la and static library files
>-#
>-post-configure: efl_drop_la
>-efl_drop_la:
>-	${REINPLACE_CMD} -E -e \
>-		'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
>-.endif
>-
>-.endif #USE_EFL
>-
>-.endif #EFL_Include_post
>-.endif #BEFOREPORTMK
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 374730)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -383,9 +383,6 @@
> #				  (libtool, autoconf, autoheader, automake et al.)
> #				  See bsd.autotools.mk for more details.
> ##
>-# USE_EFL		- If set, this port use EFL libraries.
>-#				  Implies inclusion of bsd.efl.mk.  (Also see
>-#				  that file for more information on USE_EFL_*).
> # USE_FPC		- If set, this port relies on the Free Pascal language.
> # 				  Implies inclusion of bsd.fpc.mk.  (Also see
> #				  that file for more information on WANT_FPC_*).
>@@ -1433,10 +1430,6 @@
> USES+=	python
> .endif
> 
>-.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART)
>-.include "${PORTSDIR}/Mk/bsd.efl.mk"
>-.endif
>-
> .if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL)
> .include "${PORTSDIR}/Mk/bsd.fpc.mk"
> .endif
>@@ -1867,10 +1860,6 @@
> .include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
> .endif
> 
>-.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART)
>-.include "${PORTSDIR}/Mk/bsd.efl.mk"
>-.endif
>-
> .if defined(USE_JAVA)
> .include "${PORTSDIR}/Mk/bsd.java.mk"
> .endif
>Index: deskutils/pypanel/Makefile
>===================================================================
>--- deskutils/pypanel/Makefile	(revision 374730)
>+++ deskutils/pypanel/Makefile	(working copy)
>@@ -11,13 +11,13 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Desktop panel written in Python
> 
>-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
>+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>-USE_EFL=	imlib2
> USE_XORG=	xft
> 
> PORTDOCS=	*
>Index: devel/libast/Makefile
>===================================================================
>--- devel/libast/Makefile	(revision 374730)
>+++ devel/libast/Makefile	(working copy)
>@@ -13,9 +13,9 @@
> 
> LICENSE=	MIT
> 
>-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
>+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
>-USE_EFL=	imlib2
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
>Index: games/xteddy/Makefile
>===================================================================
>--- games/xteddy/Makefile	(revision 374730)
>+++ games/xteddy/Makefile	(working copy)
>@@ -12,8 +12,9 @@
> 
> LICENSE=	GPLv2
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USES=		pkgconfig
>-USE_EFL=	imlib2
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>Index: graphics/feh/Makefile
>===================================================================
>--- graphics/feh/Makefile	(revision 374730)
>+++ graphics/feh/Makefile	(working copy)
>@@ -13,11 +13,11 @@
> 
> LICENSE=	MIT
> 
>-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
>+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> USE_XORG=	x11 xt xinerama
> USES=		gmake perl5 tar:bzip2 shebangfix desktop-file-utils
>-USE_EFL=	imlib2
> USE_PERL5=	run
> 
> CPPFLAGS+=	-I${LOCALBASE}/include -std=c99
>Index: graphics/giblib/Makefile
>===================================================================
>--- graphics/giblib/Makefile	(revision 374730)
>+++ graphics/giblib/Makefile	(working copy)
>@@ -13,8 +13,9 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USES=		pathfix pkgconfig libtool
>-USE_EFL=	imlib2
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> MAKE_ARGS=	docsdir=${DOCSDIR}
>Index: graphics/hsetroot/Makefile
>===================================================================
>--- graphics/hsetroot/Makefile	(revision 374730)
>+++ graphics/hsetroot/Makefile	(working copy)
>@@ -13,11 +13,12 @@
> 
> LICENSE=	GPLv2
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> GNU_CONFIGURE=	yes
> USES=		gmake
>-USE_EFL=	imlib2
> USE_XORG=	x11
>-LDFLAGS+=	-lX11
>+LDFLAGS+=	-L${LOCALBASE}/lib -lX11
> 
> PLIST_FILES=	bin/hsetroot
> 
>Index: graphics/icat/Makefile
>===================================================================
>--- graphics/icat/Makefile	(revision 374730)
>+++ graphics/icat/Makefile	(working copy)
>@@ -8,8 +8,9 @@
> MAINTAINER=	ehaupt@FreeBSD.org
> COMMENT=	Displays images in 256-color capable terminals
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USES=		gmake dos2unix
>-USE_EFL=	imlib2
> USE_GITHUB=	yes
> GH_ACCOUNT=	atextor
> GH_TAGNAME=	v${PORTVERSION}
>Index: graphics/imlib2/Makefile
>===================================================================
>--- graphics/imlib2/Makefile	(revision 374730)
>+++ graphics/imlib2/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	imlib2
> PORTVERSION=	1.4.6
>-PORTREVISION=	3
>+PORTREVISION=	4
> PORTEPOCH=	2
> CATEGORIES=	graphics enlightenment
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>@@ -20,11 +20,10 @@
> LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
> 
> GNU_CONFIGURE=	yes
>-USE_EFL=	libtool_hack
> USE_LDCONFIG=	yes
>-USES=		pathfix pkgconfig tar:bzip2
>+USES=		libtool pathfix pkgconfig tar:bzip2
> 
>-CONFIGURE_ARGS+=	--enable-visibility-hiding
>+CONFIGURE_ARGS+=	--enable-visibility-hiding --disable-static
> CONFIGURE_ENV+=	ac_cv_lib_dl_dlopen=no
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>Index: graphics/imlib2/pkg-plist
>===================================================================
>--- graphics/imlib2/pkg-plist	(revision 374730)
>+++ graphics/imlib2/pkg-plist	(working copy)
>@@ -25,7 +25,8 @@
> lib/imlib2/loaders/xpm.so
> lib/imlib2/loaders/zlib.so
> lib/libImlib2.so
>-lib/libImlib2.so.5
>+lib/libImlib2.so.1
>+lib/libImlib2.so.1.4.6
> libdata/pkgconfig/imlib2.pc
> %%DATADIR%%/data/fonts/cinema.ttf
> %%DATADIR%%/data/fonts/grunge.ttf
>Index: graphics/imlib2_loaders/Makefile
>===================================================================
>--- graphics/imlib2_loaders/Makefile	(revision 374730)
>+++ graphics/imlib2_loaders/Makefile	(working copy)
>@@ -17,9 +17,10 @@
> LICENSE_FILE_imlib2=	${WRKSRC}/COPYING
> LICENSE_PERMS_imlib2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> GNU_CONFIGURE=	yes
>-USES=		pathfix pkgconfig tar:bzip2
>-USE_EFL=	imlib2 libtool_hack
>+USES=		libtool pathfix pkgconfig tar:bzip2
> 
> OPTIONS_DEFINE=	EET XCF
> OPTIONS_DEFAULT=	EET XCF
>@@ -26,6 +27,7 @@
> EET_DESC=	Enable eet loader
> XCF_DESC=	Enable XCF loader
> 
>+CONFIGURE_ARGS=	--disable-static
> MAKE_ENV+=	INSTALL_STRIP_FLAG="${STRIP}"
> 
> .include <bsd.port.options.mk>
>Index: graphics/maim/Makefile
>===================================================================
>--- graphics/maim/Makefile	(revision 374730)
>+++ graphics/maim/Makefile	(working copy)
>@@ -9,6 +9,8 @@
> 
> LICENSE=	GPLv3
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USE_GITHUB=	yes
> GH_ACCOUNT=	naelstrof
> GH_PROJECT=	maim
>@@ -16,7 +18,6 @@
> GH_COMMIT=	178b253
> 
> USES=		cmake
>-USE_EFL=	imlib2
> USE_XORG=	x11 xrandr xfixes
> PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
> 
>Index: graphics/p5-Image-Imlib2/Makefile
>===================================================================
>--- graphics/p5-Image-Imlib2/Makefile	(revision 374730)
>+++ graphics/p5-Image-Imlib2/Makefile	(working copy)
>@@ -12,10 +12,10 @@
> COMMENT=	Perl interface to the Imlib2 image library
> 
> BUILD_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> USES=		perl5
> USE_PERL5=	modbuild
>-USE_EFL=	imlib2
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>Index: graphics/p5-Imlib2/Makefile
>===================================================================
>--- graphics/p5-Imlib2/Makefile	(revision 374730)
>+++ graphics/p5-Imlib2/Makefile	(working copy)
>@@ -12,7 +12,8 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Perl bindings for Imlib2
> 
>-USE_EFL=	imlib2
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USES=		perl5
> USE_PERL5=	configure
> 
>Index: graphics/pecl-imlib2/Makefile
>===================================================================
>--- graphics/pecl-imlib2/Makefile	(revision 374730)
>+++ graphics/pecl-imlib2/Makefile	(working copy)
>@@ -13,11 +13,12 @@
> MAINTAINER=	leeym@FreeBSD.org
> COMMENT=	PECL extension if imlib2
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USE_PHP=	yes
> USE_PHPEXT=	yes
> DEFAULT_PHP_VER=53
> IGNORE_WITH_PHP=5
>-USE_EFL=	imlib2
> 
> # libImlib2 may or may not depend on X, however,
> # imlib2 extension doesn't need X related functions in libImlib2
>Index: graphics/ruby-imlib2/Makefile
>===================================================================
>--- graphics/ruby-imlib2/Makefile	(revision 374730)
>+++ graphics/ruby-imlib2/Makefile	(working copy)
>@@ -13,11 +13,12 @@
> MAINTAINER=	ruby@FreeBSD.org
> COMMENT=	Imlib2 bindings for Ruby
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
> USE_RUBY=	yes
> USE_RUBY_EXTCONF=	yes
>-USE_EFL=	imlib2
> 
> INSTALL_TARGET=	site-install
> 
>Index: graphics/simpleviewer/Makefile
>===================================================================
>--- graphics/simpleviewer/Makefile	(revision 374730)
>+++ graphics/simpleviewer/Makefile	(working copy)
>@@ -15,10 +15,10 @@
> 
> LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
> 		libpng15.so:${PORTSDIR}/graphics/png \
>-		libgif.so:${PORTSDIR}/graphics/giflib
>+		libgif.so:${PORTSDIR}/graphics/giflib \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> USES=		tar:bzip2
>-USE_EFL=	imlib2
> USE_GL=		glut
> WRKSRC=		${WRKDIR}/sviewgl-src
> CFLAGS+=	-I${LOCALBASE}/include/libpng15
>Index: graphics/telak/Makefile
>===================================================================
>--- graphics/telak/Makefile	(revision 374730)
>+++ graphics/telak/Makefile	(working copy)
>@@ -14,10 +14,10 @@
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
>-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
>+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> USES=		gmake
>-USE_EFL=	imlib2
> 
> ALL_TARGET=	${PORTNAME}
> 
>Index: graphics/zphoto/Makefile
>===================================================================
>--- graphics/zphoto/Makefile	(revision 374730)
>+++ graphics/zphoto/Makefile	(working copy)
>@@ -16,7 +16,8 @@
> ZIP_DESC=	Enable zip support
> 
> LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming \
>-		libpopt.so:${PORTSDIR}/devel/popt
>+		libpopt.so:${PORTSDIR}/devel/popt \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> ZIP_RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
> ZIP_CONFIGURE_OFF=	--disable-zip
>@@ -25,7 +26,6 @@
> CONFIGURE_ARGS=	--disable-avifile
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
>-USE_EFL=	imlib2
> USES=		perl5 gmake
> USE_PERL5=	build
> 
>Index: irc/minbif/Makefile
>===================================================================
>--- irc/minbif/Makefile	(revision 374730)
>+++ irc/minbif/Makefile	(working copy)
>@@ -65,7 +65,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MCACA}
>-USE_EFL=	imlib2
>+LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
> .endif
> 
> .if ${PORT_OPTIONS:MVIDEO} && empty(PORT_OPTIONS:MCACA)
>Index: multimedia/audacious-plugins/Makefile
>===================================================================
>--- multimedia/audacious-plugins/Makefile	(revision 374730)
>+++ multimedia/audacious-plugins/Makefile	(working copy)
>@@ -21,7 +21,6 @@
> CFLAGS+=	-I${LOCALBASE}/include
> CONFIGURE_ARGS=	--disable-mpris2
> USE_GNOME=	glib20
>-WANT_EFL=	yes
> WANT_SDL=	yes
> 
> PORTDOCS=	AUTHORS
>Index: multimedia/py-kaa-imlib2/Makefile
>===================================================================
>--- multimedia/py-kaa-imlib2/Makefile	(revision 374730)
>+++ multimedia/py-kaa-imlib2/Makefile	(working copy)
>@@ -13,9 +13,9 @@
> 
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/kaa/__init__.py:${PORTSDIR}/multimedia/py-kaa-base
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>-USE_EFL=	imlib2
> 
> .include <bsd.port.mk>
>Index: x11/3ddesktop/Makefile
>===================================================================
>--- x11/3ddesktop/Makefile	(revision 374730)
>+++ x11/3ddesktop/Makefile	(working copy)
>@@ -10,9 +10,10 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	3D Virtual Desktop Switcher
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USE_XORG=	xmu
> USE_GL=		glut
>-USE_EFL=	imlib2
> GNU_CONFIGURE=	yes
> 
> PORTDOCS=	README README.windowmanagers
>Index: x11/bgs/Makefile
>===================================================================
>--- x11/bgs/Makefile	(revision 374730)
>+++ x11/bgs/Makefile	(working copy)
>@@ -11,8 +11,9 @@
> MAINTAINER=	jlaffaye@FreeBSD.org
> COMMENT=	Simple X11 BackGround Setter using Imlib2
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USE_XORG=	x11 xinerama
>-USE_EFL=	imlib2
> 
> PLIST_FILES=	bin/bgs \
> 		man/man1/bgs.1.gz
>Index: x11/erun/Makefile
>===================================================================
>--- x11/erun/Makefile	(revision 374730)
>+++ x11/erun/Makefile	(working copy)
>@@ -11,7 +11,8 @@
> MAINTAINER=	gblach@FreeBSD.org
> COMMENT=	Simple epplet for launching arbitrary programs
> 
>-LIB_DEPENDS=	libepplet.so:${PORTSDIR}/x11-wm/epplets
>+LIB_DEPENDS=	libepplet.so:${PORTSDIR}/x11-wm/epplets \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> PLIST_FILES=	bin/E-Run.epplet
> 
>@@ -18,7 +19,6 @@
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> USE_GL=	gl
>-USE_EFL=	imlib2
> CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
> LDFLAGS+=	-L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
> 
>Index: x11/eterm/Makefile
>===================================================================
>--- x11/eterm/Makefile	(revision 374730)
>+++ x11/eterm/Makefile	(working copy)
>@@ -12,7 +12,8 @@
> COMMENT?=	X11 terminal emulator based on rxvt/xterm
> 
> BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
>-LIB_DEPENDS=	libast.so:${PORTSDIR}/devel/libast
>+LIB_DEPENDS=	libast.so:${PORTSDIR}/devel/libast \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS?=--enable-trans --enable-utmp \
>@@ -25,7 +26,6 @@
> SHEBANG_FILES=	${WRKSRC}/utils/kEsetroot.in
> perl_OLD_CMD=	@PERL@
> USE_CSTD=	gnu89
>-USE_EFL=	imlib2
> USE_LDCONFIG=	yes
> USE_XORG=	x11 xt
> 
>Index: x11/fbdesk/Makefile
>===================================================================
>--- x11/fbdesk/Makefile	(revision 374730)
>+++ x11/fbdesk/Makefile	(working copy)
>@@ -20,7 +20,6 @@
> 
> USE_XORG=	xext xft xpm xrender
> USES=		pkgconfig
>-WANT_EFL=	yes
> GNU_CONFIGURE=	yes
> 
> PORTDOCS=	ChangeLog INSTALL README
>@@ -29,7 +28,7 @@
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MIMLIB2}
>-USE_EFL+=	imlib2
>+LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
> .else
> CONFIGURE_ARGS+=	--disable-imlib2
> .endif
>Index: x11/idesk/Makefile
>===================================================================
>--- x11/idesk/Makefile	(revision 374730)
>+++ x11/idesk/Makefile	(working copy)
>@@ -10,9 +10,9 @@
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	Place launch icons and background directly on your desktop
> 
>-LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
>+LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
>-USE_EFL=	imlib2
> GNU_CONFIGURE=	yes
> USE_AUTOTOOLS=	autoconf
> USES=		gmake pkgconfig tar:bzip2
>Index: x11/ipager/Makefile
>===================================================================
>--- x11/ipager/Makefile	(revision 374730)
>+++ x11/ipager/Makefile	(working copy)
>@@ -12,8 +12,9 @@
> 
> LICENSE=	MIT
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USES=		scons
>-USE_EFL=	imlib2
> 
> SUB_FILES=	pkg-message
> 
>Index: x11/metalock/Makefile
>===================================================================
>--- x11/metalock/Makefile	(revision 374730)
>+++ x11/metalock/Makefile	(working copy)
>@@ -36,7 +36,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MIMLIB2}
>-USE_EFL=	imlib2
>+LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
> MAKE_ARGS+=	USE_IMLIB2=yes
> .else
> MAKE_ARGS+=	USE_IMLIB2=no
>Index: x11/tint/Makefile
>===================================================================
>--- x11/tint/Makefile	(revision 374730)
>+++ x11/tint/Makefile	(working copy)
>@@ -9,13 +9,13 @@
> MAINTAINER=	yamagi@yamagi.org
> COMMENT=	Lightweight freedesktop-compliant panel/taskbar/systray/clock
> 
>-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
>+LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> PROJECTHOST=	tint2
> USES=		cmake pkgconfig tar:bzip2
> USE_GNOME=	pango glib20
> USE_XORG=	xinerama xrandr xdamage xcomposite
>-USE_EFL=	imlib2
> 
> CMAKE_ARGS=	-DENABLE_BATTERY:BOOL=ON -DMANDIR:PATH=man
> 
>Index: x11/wbar/Makefile
>===================================================================
>--- x11/wbar/Makefile	(revision 374730)
>+++ x11/wbar/Makefile	(working copy)
>@@ -12,12 +12,14 @@
> 
> LICENSE=	GPLv3
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
> 
> USES=		pkgconfig gettext gmake tar:tgz
>-USE_EFL=	imlib2
> 
> GNU_CONFIGURE=	yes
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	NLS WBARCONFIG
> OPTIONS_DEFAULT=	NLS WBARCONFIG
>Index: x11-wm/awesome/Makefile
>===================================================================
>--- x11-wm/awesome/Makefile	(revision 374730)
>+++ x11-wm/awesome/Makefile	(working copy)
>@@ -30,11 +30,11 @@
> 		libxcb-util.so:${PORTSDIR}/x11/xcb-util \
> 		libxcb-cursor.so:${PORTSDIR}/x11/xcb-util-cursor \
> 		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
>-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm
>+		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> USES=		cmake execinfo iconv pkgconfig lua tar:xz
> CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
>-USE_EFL=	imlib2
> USE_GNOME=	glib20 pango gdkpixbuf2
> USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
> 		xproto
>Index: x11-wm/awesome2/Makefile
>===================================================================
>--- x11-wm/awesome2/Makefile	(revision 374730)
>+++ x11-wm/awesome2/Makefile	(working copy)
>@@ -17,15 +17,15 @@
> 		xmlto:${PORTSDIR}/textproc/xmlto
> LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
> 		libcairo.so:${PORTSDIR}/graphics/cairo \
>-		libfreetype.so:${PORTSDIR}/print/freetype2
>+		libfreetype.so:${PORTSDIR}/print/freetype2 \
>+		libImlib2.so:${PORTSDIR}/graphics/imlib2
> 
> USES=		iconv pkgconfig python:build
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
>-USE_EFL=	imlib2
> USE_GNOME=	pango
> USE_XORG=	x11 xft xext xinerama xt xrandr xproto
>-LDFLAGS+=	-lX11 -lXext ${ICONV_LIB}
>+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lXext ${ICONV_LIB}
> 
> MAN1S=		awesome2.1 \
> 		awesome2-client.1 \
>Index: x11-wm/e16/Makefile
>===================================================================
>--- x11-wm/e16/Makefile	(revision 374730)
>+++ x11-wm/e16/Makefile	(working copy)
>@@ -11,6 +11,8 @@
> 
> LICENSE=	MIT
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> OPTIONS_DEFINE=		DOCS NLS SOUND
> OPTIONS_SUB=		yes
> SOUND_DESC=		Sound support via pulseaudio/libsndfile
>@@ -30,7 +32,6 @@
> 		xext xfixes xft xinerama xrandr xrender xxf86vm
> USES=		gettext gmake iconv libtool perl5 pkgconfig shebangfix
> SHEBANG_FILES=	scripts/e_gen_menu
>-USE_EFL=	imlib2
> CFLAGS+=	-Wno-unused-parameter
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-dependency-tracking \
>Index: x11-wm/fluxbox/Makefile
>===================================================================
>--- x11-wm/fluxbox/Makefile	(revision 374730)
>+++ x11-wm/fluxbox/Makefile	(working copy)
>@@ -65,7 +65,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MIMLIB2}
>-USE_EFL+=		imlib2
>+LIB_DEPENDS+=		libImlib2.so:${PORTSDIR}/graphics/imlib2
> CONFIGURE_ARGS+=	--enable-imlib2
> .else
> CONFIGURE_ARGS+=	--disable-imlib2
>Index: x11-wm/phluid/Makefile
>===================================================================
>--- x11-wm/phluid/Makefile	(revision 374730)
>+++ x11-wm/phluid/Makefile	(working copy)
>@@ -10,8 +10,9 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Window manager that emphasizes efficiency, speed, and beauty
> 
>+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
>+
> USES=		gmake
>-USE_EFL=	imlib2
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -lm -lX11

Actions: View | Diff

Attachments on bug 196062: 150681 | 150690 | 150959