Update. Fixes by fabien@, armani@, Azwaw OUSADOU and jasper@ .

This commit is contained in:
laurent 2011-01-16 00:56:28 +00:00
parent 7ad9252b27
commit 52f41c3061
5 changed files with 56 additions and 33 deletions

View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.13 2010/11/22 08:36:56 espie Exp $
# $OpenBSD: Makefile,v 1.14 2011/01/16 00:56:28 laurent Exp $
COMMENT = implementations of freedesktop.org specifications
DISTNAME = efreet-0.5.0.061
DISTNAME = efreet-1.0.0.beta2
PKGNAME = efreet-1.0.0
EPOCH= 0
REVISION= 0
EPOCH = 0
SO_VERSION = 0.1
SO_VERSION = 1.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
.for _lib in efreet efreet_mime efreet_trash
SHARED_LIBS += ${_lib} ${SO_VERSION} \
${_lib}-ver-svn-02 ${SO_VERSION}
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
# BSD
@ -20,13 +19,17 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c crypto eina m ssl ecore ecore_con ecore_file
WANTLIB += c cares crypto curl ecore ecore_con ecore_file eet eina glib-2.0
WANTLIB += iconv idn intl jpeg m pcre pthread ssl z
LIB_DEPENDS = x11/e17/ecore
LIB_DEPENDS = x11/e17/ecore>=1.0
USE_LIBTOOL = Yes
USE_LIBTOOL = Yes
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lcrypto"
CONFIGURE_ARGS = --disable-doc
# enable strict specification compliance
# --enable-strict-spec
# disable sloppy specification compliance
# --disable-sloppy-spec
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (e17/efreet-0.5.0.061.tar.gz) = o9Wkb9SZySyTI56iPiieOw==
RMD160 (e17/efreet-0.5.0.061.tar.gz) = OJLfbSiQiZ1Kq6S60yx1smmoUtk=
SHA1 (e17/efreet-0.5.0.061.tar.gz) = bkP8sR3Du/N6da9yRBK0Nke6S2U=
SHA256 (e17/efreet-0.5.0.061.tar.gz) = jTz+8MoSbP9ai1XD6xLr1jxRD7umNy0eJyUWfNsz0tE=
SIZE (e17/efreet-0.5.0.061.tar.gz) = 617920
MD5 (e17/efreet-1.0.0.beta2.tar.gz) = sNdPkTH4QGj8aUwarVCESw==
RMD160 (e17/efreet-1.0.0.beta2.tar.gz) = wWhHyvJUm+IC96hU/19iMA40JgQ=
SHA1 (e17/efreet-1.0.0.beta2.tar.gz) = uqwIuMdGsZ6pyGRP5WW25BaiuGE=
SHA256 (e17/efreet-1.0.0.beta2.tar.gz) = 7DJQznm+vZqViOuw5Vpxzcv7bk92aWZBzcxTDdfOh9M=
SIZE (e17/efreet-1.0.0.beta2.tar.gz) = 469299

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_bin_Makefile_in,v 1.1 2011/01/16 00:56:28 laurent Exp $
--- src/bin/Makefile.in.orig Sat Aug 21 03:53:44 2010
+++ src/bin/Makefile.in Wed Sep 22 23:45:00 2010
@@ -82,7 +82,7 @@ am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(AM_LDFLAGS) $(LDFLAGS) -leet -lecore -o $@
AM_V_CCLD = $(am__v_CCLD_$(V))
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -329,7 +329,7 @@ clean-internal_binPROGRAMS:
rm -f $$list
efreet_desktop_cache_create$(EXEEXT): $(efreet_desktop_cache_create_OBJECTS) $(efreet_desktop_cache_create_DEPENDENCIES)
@rm -f efreet_desktop_cache_create$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(efreet_desktop_cache_create_OBJECTS) $(efreet_desktop_cache_create_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(efreet_desktop_cache_create_OBJECTS) $(efreet_desktop_cache_create_LDADD) -L$(top_builddir)/src/lib/.libs/ -lefreet $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)

View File

@ -1,7 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2010/01/11 15:02:56 jasper Exp $
@lib lib/libefreet-ver-svn-02.so.${LIBefreet-ver-svn-02_VERSION}
@comment $OpenBSD: PFRAG.shared,v 1.4 2011/01/16 00:56:28 laurent Exp $
@lib lib/libefreet.so.${LIBefreet_VERSION}
@lib lib/libefreet_mime-ver-svn-02.so.${LIBefreet_mime-ver-svn-02_VERSION}
@lib lib/libefreet_mime.so.${LIBefreet_mime_VERSION}
@lib lib/libefreet_trash-ver-svn-02.so.${LIBefreet_trash-ver-svn-02_VERSION}
@lib lib/libefreet_trash.so.${LIBefreet_trash_VERSION}

View File

@ -1,21 +1,23 @@
@comment $OpenBSD: PLIST,v 1.4 2010/01/11 15:02:56 jasper Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/01/16 00:56:28 laurent Exp $
%%SHARED%%
@bin bin/efreet_alloc
@bin bin/efreet_cache_test
@bin bin/efreet_menu_alloc
@bin bin/efreet_spec_test
@bin bin/efreet_test
include/efreet/
include/efreet/Efreet.h
include/efreet/Efreet_Mime.h
include/efreet/Efreet_Trash.h
include/efreet/efreet_base.h
include/efreet/efreet_desktop.h
include/efreet/efreet_icon.h
include/efreet/efreet_ini.h
include/efreet/efreet_menu.h
include/efreet/efreet_uri.h
include/efreet/efreet_utils.h
include/efreet-1/
include/efreet-1/Efreet.h
include/efreet-1/Efreet_Mime.h
include/efreet-1/Efreet_Trash.h
include/efreet-1/efreet_base.h
include/efreet-1/efreet_desktop.h
include/efreet-1/efreet_icon.h
include/efreet-1/efreet_ini.h
include/efreet-1/efreet_menu.h
include/efreet-1/efreet_uri.h
include/efreet-1/efreet_utils.h
lib/efreet/
@bin lib/efreet/efreet_desktop_cache_create
lib/libefreet.a
lib/libefreet.la
lib/libefreet_mime.a