- use libiconv module
- remove hacks for openssl, now that it has a pkg-config file
This commit is contained in:
parent
ceb9943c7b
commit
d3f3465761
@ -1,11 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.14 2011/01/16 10:39:25 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.15 2011/01/16 11:18:00 jasper Exp $
|
||||
|
||||
COMMENT = library to write an arbitary set of chunks of data to a file
|
||||
DISTNAME = eet-1.4.0.beta2
|
||||
|
||||
REVISION = 0
|
||||
EPOCH = 1
|
||||
|
||||
SHARED_LIBS += eet 1.4
|
||||
SHARED_LIBS += eet 1.4 # 5.0
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
@ -13,7 +14,9 @@ PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM =Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB += c crypto eina iconv jpeg m pthread ssl z
|
||||
WANTLIB += c crypto eina jpeg m pthread ssl z
|
||||
|
||||
MODULES = converters/libiconv
|
||||
|
||||
LIB_DEPENDS = x11/e17/eina>=1.0 \
|
||||
graphics/jpeg
|
||||
@ -27,8 +30,6 @@ CONFIGURE_ARGS = --disable-doc \
|
||||
# --disable-assert
|
||||
|
||||
CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
|
||||
LDFLAGS="${LDFLAGS} -I${LOCALBASE}/lib -lcrypto" \
|
||||
OPENSSL_CFLAGS=" " \
|
||||
OPENSSL_LIBS="-lssl"
|
||||
LDFLAGS="${LDFLAGS} -I${LOCALBASE}/lib"
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,15 +1,6 @@
|
||||
$OpenBSD: patch-configure,v 1.3 2011/01/16 00:35:27 laurent Exp $
|
||||
$OpenBSD: patch-configure,v 1.4 2011/01/16 11:18:00 jasper Exp $
|
||||
--- configure.orig Fri Nov 12 15:24:02 2010
|
||||
+++ configure Sun Nov 21 05:36:21 2010
|
||||
@@ -12873,7 +12873,7 @@ $as_echo "yes" >&6; }
|
||||
|
||||
$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
|
||||
|
||||
- requirement_eet="openssl ${requirement_eet}"
|
||||
+ requirement_eet="${requirement_eet}"
|
||||
|
||||
fi
|
||||
fi
|
||||
@@ -13002,12 +13002,12 @@ case "$host_os" in
|
||||
mingw*)
|
||||
;;
|
||||
|
Loading…
Reference in New Issue
Block a user