On Fri, August 2, 2019 15:57, Stuart Henderson wrote:
> seafile keep pushing new commits to tags (using them something like
> branches). New fetches are broken in -current for libsearpc and client
> and because the distfile was changed in ${FULLDISTDIR} without renaming
> it, there are problems sharing distfiles between current and stable
> builds. (Everyone: please if you are "regenerating distinfo" because
> upstream re-rolled things, make sure the filenames that we use are
> changed!)
>
> Kirill, is this ok with you?
Looks good to me. Thanks for your work!
>
> - use GH_COMMIT everywhere to avoid this problem happening again
> (-server was still OK but I don't trust them not to touch that).
> we're still at risk of distfiles changing due to github updates but
> that seems less common,
>
> - move all the GH_* to subdirs,
>
> - use a common (and recent) autoconf/automake version, seems silly to
> have various subports using different versions.
Also makes sense except that fact that client is using cmake. Shoould
we just sync AUTOHELL_VERSIONs in libsearpc and daemon without setting
them in Makefile.inc?
>
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/net/seafile/Makefile.inc,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile.inc
> --- Makefile.inc 16 Jul 2019 15:59:17 -0000 1.37
> +++ Makefile.inc 2 Aug 2019 12:54:35 -0000
> @@ -1,9 +1,5 @@
> # $OpenBSD: Makefile.inc,v 1.37 2019/07/16 15:59:17 kirby Exp $
>
> -GH_TAGNAME ?= v7.0.1
> -V = ${GH_TAGNAME:S/v//:S/-server//:S/-testing//:S/-latest//}
> -DISTNAME = ${GH_PROJECT}-${V}
> -
> CATEGORIES = net net/seafile
>
> HOMEPAGE = https://www.seafile.com/
> @@ -13,6 +9,7 @@ MAINTAINER = Kirill Bychkov <kirby@open
> # GPLv3
> PERMIT_PACKAGE = Yes
>
> -GH_ACCOUNT = haiwen
> +AUTOCONF_VERSION ?= 2.69
> +AUTOMAKE_VERSION ?= 1.15
>
> #.include <bsd.port.mk>
> Index: client/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/seafile/client/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- client/Makefile 16 Jul 2019 15:59:17 -0000 1.28
> +++ client/Makefile 2 Aug 2019 12:54:35 -0000
> @@ -2,7 +2,12 @@
>
> COMMENT = seafile client
>
> -GH_PROJECT = seafile-client
> +GH_ACCOUNT = haiwen
> +GH_PROJECT = seafile-client
> +# upstream keep on sliding tags to pull in new commits
> +# this commit is from the "v7.0.1" tag
> +GH_COMMIT = 1dece9b82d66574140abca5a967705366a04d8ed
> +DISTNAME = seafile-client-7.0.1pl20190801
>
> WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets c
> WANTLIB += crypto event_core event_extra gio-2.0 glib-2.0 gobject-2.0
> @@ -12,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX}
> MODULES = devel/cmake x11/qt5
> LIB_DEPENDS = net/seafile/seafile \
> databases/sqlite3
> -RUN_DEPENDS = devel/desktop-file-utils \
> +RUN_DEPENDS = devel/desktop-file-utils \
> x11/gtk+3,-guic
>
> NO_TEST = Yes
> Index: client/distinfo
> ===================================================================
> RCS file: /cvs/ports/net/seafile/client/distinfo,v
> retrieving revision 1.35
> diff -u -p -r1.35 distinfo
> --- client/distinfo 16 Jul 2019 15:59:17 -0000 1.35
> +++ client/distinfo 2 Aug 2019 12:54:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (seafile-client-7.0.1.tar.gz) =
> E3zF3qf8Z5e73480BmWsb6aZJPAWISRNy9YOKrovFO0=
> -SIZE (seafile-client-7.0.1.tar.gz) = 2363827
> +SHA256 (seafile-client-7.0.1pl20190801-1dece9b8.tar.gz) =
> 2qQ/LS4k7MPamzGhXmZly7wRvwO+bWF1XSjazYe7t5Q=
> +SIZE (seafile-client-7.0.1pl20190801-1dece9b8.tar.gz) = 2365162
> Index: libsearpc/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/seafile/libsearpc/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- libsearpc/Makefile 12 Jul 2019 20:48:48 -0000 1.12
> +++ libsearpc/Makefile 2 Aug 2019 12:54:35 -0000
> @@ -2,11 +2,14 @@
>
> COMMENT = simple RPC framework based on GObject system
>
> -GH_PROJECT = libsearpc
> -GH_TAGNAME = v3.1-latest
> -REVISION = 1
> +GH_ACCOUNT = haiwen
> +GH_PROJECT = libsearpc
> +# upstream keep on sliding tags to pull in new commits
> +# this commit is from the "v3.1-latest" tag
> +GH_COMMIT = 2803f8d5cff4db632015c061e032d19f9c3a26eb
> +DISTNAME = libsearpc-3.1pl20190719
>
> -SHARED_LIBS += searpc 0.0 # 1.2
> +SHARED_LIBS += searpc 0.0 # 1.2
>
> # LGPLv3
> PERMIT_PACKAGE = Yes
> @@ -21,9 +24,6 @@ LIB_DEPENDS = devel/glib2 \
> SEPARATE_BUILD = Yes
> CONFIGURE_STYLE = autoreconf
>
> -AUTOCONF_VERSION = 2.61
> -AUTOMAKE_VERSION = 1.9
> -
> -MODPY_ADJ_FILES = lib/searpc-codegen.py pysearpc/pygencode.py
> +MODPY_ADJ_FILES = lib/searpc-codegen.py pysearpc/pygencode.py
>
> .include <bsd.port.mk>
> Index: libsearpc/distinfo
> ===================================================================
> RCS file: /cvs/ports/net/seafile/libsearpc/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- libsearpc/distinfo 22 May 2019 17:03:31 -0000 1.4
> +++ libsearpc/distinfo 2 Aug 2019 12:54:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libsearpc-3.1.tar.gz) = djLNjHTyDzQWJUnL5kf+AmaJdVWvqz70hkOWWAAdXtA=
> -SIZE (libsearpc-3.1.tar.gz) = 51768
> +SHA256 (libsearpc-3.1pl20190719-2803f8d5.tar.gz) =
> XkETskr1RerWOyjYjdM275dbG522687XKHKKGbcHG30=
> +SIZE (libsearpc-3.1pl20190719-2803f8d5.tar.gz) = 51655
> Index: libsearpc/patches/patch-Makefile_am
> ===================================================================
> RCS file: /cvs/ports/net/seafile/libsearpc/patches/patch-Makefile_am,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Makefile_am
> --- libsearpc/patches/patch-Makefile_am 17 Jul 2015 22:44:04 -0000
> 1.2
> +++ libsearpc/patches/patch-Makefile_am 2 Aug 2019 12:54:35 -0000
> @@ -1,12 +1,14 @@
> $OpenBSD: patch-Makefile_am,v 1.2 2015/07/17 22:44:04 jasper Exp $
> ---- Makefile.am.orig Thu Aug 14 09:48:58 2014
> -+++ Makefile.am Fri Jul 17 16:40:05 2015
> -@@ -22,7 +22,7 @@ install-data-local:
> - if MACOS
> +
> +Index: Makefile.am
> +--- Makefile.am.orig
> ++++ Makefile.am
> +@@ -25,7 +25,7 @@ else
> + if FBSD
> sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
> else
> - ${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
> + ${SED} -i "s|(DESTDIR)||g" $(pcfiles)
> endif
> + endif
>
> - dist-hook:
> Index: seafile/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/seafile/seafile/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- seafile/Makefile 18 May 2019 12:13:33 -0000 1.21
> +++ seafile/Makefile 2 Aug 2019 12:54:35 -0000
> @@ -2,8 +2,12 @@
>
> COMMENT = seafile daemon
>
> +GH_ACCOUNT = haiwen
> GH_PROJECT = seafile
> -PKGNAME = ${GH_PROJECT}-daemon-${V}
> +GH_COMMIT = 099302d77a6aae8d15951621713d0d4d48b7c142
> +# upstream keep on sliding tags to pull in new commits
> +# this commit is from the "v7.0.1" tag
> +DISTNAME = seafile-daemon-7.0.1pl20190709
>
> SHARED_LIBS = seafile 3.0
>
> @@ -16,8 +20,8 @@ WANTLIB += lib/inotify/inotify ${cWANTLI
> MODULES = lang/python
> BUILD_DEPENDS = lang/vala
>
> -RUN_DEPENDS = devel/py-simplejson
> -LIB_DEPENDS = devel/libinotify \
> +RUN_DEPENDS = devel/py-simplejson
> +LIB_DEPENDS = devel/libinotify \
> databases/sqlite3 \
> devel/libevent2 \
> net/curl \
> @@ -31,10 +35,7 @@ CONFIGURE_ARGS += --disable-fuse \
> CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include
> -I${LOCALBASE}/include/inotify" \
> LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/inotify"
>
> -AUTOCONF_VERSION = 2.62
> -AUTOMAKE_VERSION = 1.11
> -
> -MODPY_ADJ_FILES = scripts/*.py scripts/build/*.py integration-tests/*.py \
> +MODPY_ADJ_FILES = scripts/*.py scripts/build/*.py integration-tests/*.py \
> app/seaf-cli
>
> .include <bsd.port.mk>
> Index: seafile/distinfo
> ===================================================================
> RCS file: /cvs/ports/net/seafile/seafile/distinfo,v
> retrieving revision 1.35
> diff -u -p -r1.35 distinfo
> --- seafile/distinfo 16 Jul 2019 15:59:17 -0000 1.35
> +++ seafile/distinfo 2 Aug 2019 12:54:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (seafile-7.0.1.tar.gz) = x5oYbjpRJFTLZdhjvUXsyK4sZqDdIBBTPz/teGL6kvg=
> -SIZE (seafile-7.0.1.tar.gz) = 698043
> +SHA256 (seafile-daemon-7.0.1pl20190709-099302d7.tar.gz) =
> mDyXBK+7Xh2TwTWkF5D6Bhhq8g7HpsfXVgUfjGmF+jc=
> +SIZE (seafile-daemon-7.0.1pl20190709-099302d7.tar.gz) = 698245
>
>
