cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- regen WANTLIB

Browse Source 
- remove hacks for openssl, now that it has a pkg-config file
This commit is contained in:
jasper 2011-01-16 11:34:43 +00:00
parent c9e77bae03
commit 5bb31ba2de
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x11/e17/ecore/Makefile
View File

@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2011/01/16 10:39:25 jasper Exp $
# $OpenBSD: Makefile,v 1.16 2011/01/16 11:34:43 jasper Exp $
COMMENT = core event/X abstraction layer
DISTNAME = ecore-1.0.0.beta2
REVISION = 0
EPOCH = 1
SO_VERSION = 1.0
@ -19,20 +21,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender Xss Xtst cares crypto curl eet eina evas expat
WANTLIB += fontconfig freetype fribidi glib-2.0 idn jpeg m pcre pthread-stubs
WANTLIB += ssl xcb z
MODULES = devel/gettext
USE_LIBTOOL = Yes
LIB_DEPENDS = x11/e17/evas>=1.0 \
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xss Xtst cares crypto curl
WANTLIB += eet eina evas expat fontconfig freetype glib-2.0 idn
WANTLIB += jpeg m pcre pthread-stubs ssl xcb z
LIB_DEPENDS = devel/glib2 \
net/curl \
net/libcares \
devel/glib2 \
devel/pcre
x11/e17/evas>=1.0
CONFIGURE_ARGS += --disable-doc \
--disable-gnutls \
@ -41,7 +42,6 @@ CONFIGURE_ARGS += --disable-doc \
# --with-internal-maximum-log-level=2
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
SSL_CFLAGS="-I/usr/include" SSL_LIBS="-lssl"
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.mk>

12
x11/e17/ecore/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.3 2011/01/16 00:40:32 laurent Exp $
$OpenBSD: patch-configure,v 1.4 2011/01/16 11:34:43 jasper Exp $
- Stupid way to remove openssl from the ecore-file and ecore-con pc files.
- Force disable Cocoa checks, which will later cause the build to fail
@ -13,13 +13,3 @@ $OpenBSD: patch-configure,v 1.3 2011/01/16 00:40:32 laurent Exp $
- rt_libs=-lrt
$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
@@ -25482,7 +25481,7 @@ fi
# depends on ecore_con anyway.
else
if test "x${have_openssl}" = "xyes" ; then
- requirements_ecore_con="openssl ${requirements_ecore_con}"
+ requirements_ecore_con="${requirements_ecore_con}"
# no need to add it to req_ecore_ipc, since they
# depends on ecore_con anyway.
fi