Index: Makefile =================================================================== --- Makefile (revision 12) +++ Makefile (working copy) @@ -1,77 +1,62 @@ # $FreeBSD$ -PORTNAME= seafile +PORTNAME= seafile PORTVERSION= 3.1.4 -CATEGORIES= www +CATEGORIES= www -MAINTAINER= yan_jingfeng@yahoo.com -COMMENT= A framework for writing networked applications +MAINTAINER= yan_jingfeng@yahoo.com +COMMENT= Framework for writing networked applications -LICENSE= GPLv3 +LICENSE= GPLv3 -BUILD_DEPENDS+= valac:${PORTSDIR}/lang/vala \ - bash:${PORTSDIR}/shells/bash +BUILD_DEPENDS+= valac:${PORTSDIR}/lang/vala LIB_DEPENDS+= libsearpc.so:${PORTSDIR}/www/libsearpc \ - libevhtp.so:${PORTSDIR}/www/libevhtp \ - libzdb.so:${PORTSDIR}/databases/libzdb \ - libcrypto.so:${PORTSDIR}/security/openssl \ - libarchive.so.13:${PORTSDIR}/archivers/libarchive \ - libfuse.so:${PORTSDIR}/sysutils/fusefs-libs \ - libinotify.so:${PORTSDIR}/devel/libinotify \ - libccnet.so:${PORTSDIR}/www/ccnet + libevhtp.so:${PORTSDIR}/www/libevhtp \ + libzdb.so:${PORTSDIR}/databases/libzdb \ + libcrypto.so:${PORTSDIR}/security/openssl \ + libarchive.so.13:${PORTSDIR}/archivers/libarchive \ + libfuse.so:${PORTSDIR}/sysutils/fusefs-libs \ + libinotify.so:${PORTSDIR}/devel/libinotify \ + libccnet.so:${PORTSDIR}/www/ccnet RUN_DEPENDS= ccnet-server:${PORTSDIR}/www/ccnet \ - ccnet-init:${PORTSDIR}/www/ccnet \ - ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo \ - ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 + ccnet-init:${PORTSDIR}/www/ccnet \ + ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo \ + ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ + bash:${PORTSDIR}/shells/bash -SH= ${LOCALBASE}/bin/bash +USE_GITHUB= yes +GH_ACCOUNT= haiwen +GH_TAGNAME= v3.1.4 +GH_COMMIT= ac58109 -USE_GITHUB= yes -GH_ACCOUNT= haiwen -GH_PROJECT= seafile -GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= ac58109 +USES= libtool pkgconfig python:2 pathfix shebangfix +PATHFIX_MAKEFILEIN= Makefile.am +USE_LDCONFIG= yes +USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf +LIBTOOLIZE_ARGS=-i -c -f +ACLOCAL_ARGS= -I m4 +AUTOMAKE_ARGS= --add-missing --gnu -USES= libtool pkgconfig python:2 -USE_AUTOTOOLS= libtoolize -USE_AUTOTOOLS+= aclocal -USE_AUTOTOOLS+= autoheader -USE_AUTOTOOLS+= automake -USE_AUTOTOOLS+= autoconf -LIBTOOLIZE_ARGS= -i -c -f -ACLOCL_ARGS= -I m4 -AUTOHEADER_ARGS= -AUTOMAKE_ARGS= --add-missing --gnu -AUTOCONF_ARGS= +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/event2 +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/event2 -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/event2 -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/event2 +MAKE_JOBS_UNSAFE=yes -MAKE_JOBS_UNSAFE= yes - GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} --enable-server -CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig" +CONFIGURE_ARGS+=--enable-server INSTALL_TARGET= install-strip -WITH_OPENSSL_PORT= yes -USE_OPENSSL= yes +WITH_OPENSSL_PORT= yes +USE_OPENSSL= yes -WWWDIR= ${PREFIX}/www/haiwen/seafile-server +WWWDIR= ${PREFIX}/www/haiwen/seafile-server -post-patch: - @${REINPLACE_CMD} -e 's:/bin/bash:/usr/bin/env bash:' ${WRKSRC}/scripts/*.sh - @${REINPLACE_CMD} -e 's:/bin/bash:/usr/bin/env bash:' ${WRKSRC}/scripts/upgrade/*.sh - - -pre-install: +post-install: @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}/seafile/bin @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile @${INSTALL} -m 0755 ${WRKSRC}/doc/seafile-tutorial.doc \ ${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile/ - -post-install: @${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/bin/fileserver \ ${STAGEDIR}${WWWDIR}/seafile/bin/fileserver @${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/bin/seaf-fsck \ Index: files/controller_seafile-controller.c =================================================================== --- files/controller_seafile-controller.c (revision 12) +++ files/controller_seafile-controller.c (working copy) @@ -1,53 +0,0 @@ ---- controller/seafile-controller.c.orig 2014-08-05 01:28:35.000000000 -0400 -+++ controller/seafile-controller.c 2014-08-30 01:38:54.671154391 -0400 -@@ -18,6 +18,10 @@ - #include "log.h" - #include "seafile-controller.h" - -+#ifdef __FreeBSD__ -+#include -+#endif -+ - #define CHECK_PROCESS_INTERVAL 10 /* every 10 seconds */ - - SeafileController *ctl; -@@ -272,6 +276,22 @@ - static void - init_seafile_path () - { -+ char *tmp = NULL; -+#ifdef __FreeBSD__ -+ int mib[4]; -+ char exectuble[1024]; -+ size_t cb = sizeof(exectuble); -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_PATHNAME; -+ mib[3] = -1; -+ sysctl(mib, 4, exectuble, &cb, NULL, 0); -+#endif -+ -+#ifdef __APPLE__ -+#endif -+ -+#ifdef __linux__ - GError *error = NULL; - char *executable = g_file_read_link ("/proc/self/exe", &error); - char *tmp = NULL; -@@ -281,13 +301,16 @@ - } - - bin_dir = g_path_get_dirname (executable); -+#endif - - tmp = g_path_get_dirname (bin_dir); - installpath = g_path_get_dirname (tmp); - - topdir = g_path_get_dirname (installpath); - -+#ifdef __linux__ - g_free (executable); -+#endif - g_free (tmp); - } - Index: pkg-plist =================================================================== --- pkg-plist (revision 12) +++ pkg-plist (working copy) @@ -19,7 +19,6 @@ lib/libseafile.so lib/libseafile.so.0 lib/libseafile.so.0.0.0 -lib/pkgconfig/libseafile.pc %%PYTHON_SITELIBDIR%%/seafile/__init__.py %%PYTHON_SITELIBDIR%%/seafile/__init__.pyc %%PYTHON_SITELIBDIR%%/seafile/__init__.pyo @@ -35,6 +34,7 @@ %%PYTHON_SITELIBDIR%%/seaserv/service.py %%PYTHON_SITELIBDIR%%/seaserv/service.pyc %%PYTHON_SITELIBDIR%%/seaserv/service.pyo +libdata/pkgconfig/libseafile.pc man/man1/ccnet.1.gz man/man1/seaf-cli.1.gz man/man1/seaf-daemon.1.gz