On Wed, Feb 28, 2018 at 01:49:44PM +0000, Rafael Sadowski wrote:
> On Tue Feb 27, 2018 at 12:28:07PM +0000, Stuart Henderson wrote:
> >
> > archivers/deutex
> > astro/stellarium
> > textproc/enchant
> > textproc/libical
>
Please keep your changes to a minimum. i.e only the github stuff changes.
>
> >
>
>
> Index: textproc/enchant/Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/enchant/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- textproc/enchant/Makefile 29 Dec 2017 08:30:05 -0000 1.39
> +++ textproc/enchant/Makefile 28 Feb 2018 13:45:20 -0000
> @@ -5,15 +5,8 @@ PORTROACH= limit:^1
> COMMENT= generic spell checking library
>
> V= 1.6.1
> -GH_ACCOUNT= AbiWord
> -GH_PROJECT= enchant
> -GH_TAGNAME= enchant-${V:S/./-/g}
> -REVISION= 1
> -
> -# XXX needed for portroach (DISTNAME must match the GH_PROJECT-GH_TAGNAME)
> -MASTER_SITES= https://github.com/AbiWord/enchant/releases/download/${GH_PROJECT}-${V:S/./-/g}/
> -DISTNAME= ${GH_PROJECT}-${V}
> -WRKDIST= ${WRKDIR}/${DISTNAME}
> +DISTNAME = enchant-${V}
> +REVISION= 2
>
> SHARED_LIBS += enchant 6.1 # 7.1
>
> @@ -29,6 +22,9 @@ PERMIT_PACKAGE_CDROM= Yes
> WANTLIB += aspell c glib-2.0 gmodule-2.0 hunspell-1.6 iconv intl
> WANTLIB += m pcre pthread ${LIBCXX}
>
> +MASTER_SITES= https://github.com/AbiWord/enchant/releases/download/${DISTNAME:S/./-/g}/
> +WRKDIST= ${WRKDIR}/${DISTNAME}
> +
> # c++11
> COMPILER = base-clang ports-gcc
>
> @@ -50,7 +46,7 @@ CONFIGURE_ARGS= --with-aspell-prefix=${
> --disable-uspell \
> --disable-hspell
>
> -###
> +
> AUTOCONF_VERSION= 2.69
> AUTOMAKE_VERSION= 1.15
> BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
> @@ -62,7 +58,6 @@ pre-configure:
> AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> autoreconf -fi
> -###
>
> post-install:
> rm ${PREFIX}/lib/enchant/*.{a,la}
> Index: textproc/libical/Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/libical/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- textproc/libical/Makefile 18 Feb 2018 08:53:50 -0000 1.32
> +++ textproc/libical/Makefile 28 Feb 2018 13:45:20 -0000
> @@ -3,12 +3,13 @@
> COMMENT-main= implementation of the iCalendar protocols and data units
> COMMENT-glib= GObject wrapper for libical library
>
> -GH_ACCOUNT= libical
> -GH_PROJECT= libical
> -GH_TAGNAME= v3.0.2
> +V= 3.0.2
> +DISTNAME = libical-${V}
>
> -PKGNAME-main= ${PKGNAME}
> -PKGNAME-glib= ${GH_PROJECT}-glib-${GH_TAGNAME:C/^v//}
> +DISTNAME-main= ${DISTNAME}
> +DISTNAME-glib= libical-glib-${V}
> +REVISION-glib= 0
> +REVISION-main= 0
>
> SHARED_LIBS += ical 4.0
> SHARED_LIBS += icalss 4.0
> @@ -19,16 +20,18 @@ SHARED_LIBS += ical-glib 0.0
>
> CATEGORIES= textproc
>
> -MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
> -
> HOMEPAGE= https://libical.github.io/libical/
>
> +MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
> +
> # dual MPLv2, LGPLv2.1
> PERMIT_PACKAGE_CDROM= Yes
>
> WANTLIB += icui18n icuuc
> WANTLIB-main += ${WANTLIB} ${COMPILER_LIBCXX} m lib/db4/db
> WANTLIB-glib += ${WANTLIB} ical glib-2.0 gobject-2.0 intl pthread
> +
> +MASTER_SITES = https://github.com/libical/libical/releases/download/v${V}/
>
> MULTI_PACKAGES= -main -glib
>
> Index: textproc/libical/distinfo
> ===================================================================
> RCS file: /cvs/ports/textproc/libical/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- textproc/libical/distinfo 18 Feb 2018 08:53:50 -0000 1.10
> +++ textproc/libical/distinfo 28 Feb 2018 13:45:20 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libical-3.0.2.tar.gz) = +Wmb6FIeGuoZCnyHgCgF0ziOCj9Zqbn67exJD1loB6A=
> +SHA256 (libical-3.0.2.tar.gz) = DLw/1jCWbh2u0t0cONI2Ig0WbBSfJFv9o8itdF4rZA4=
> SIZE (libical-3.0.2.tar.gz) = 865856
> Index: archivers/deutex/Makefile
> ===================================================================
> RCS file: /cvs/ports/archivers/deutex/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- archivers/deutex/Makefile 16 Jan 2018 08:51:34 -0000 1.2
> +++ archivers/deutex/Makefile 28 Feb 2018 13:45:21 -0000
> @@ -5,6 +5,7 @@ COMMENT = WAD composer for Doom, Heretic
> GH_ACCOUNT = Doom-Utils
> GH_PROJECT = deutex
> GH_TAGNAME = v5.1.1
> +REVISION = 0
>
> CATEGORIES = archivers
>
> @@ -24,9 +25,7 @@ AUTOCONF_VERSION = 2.69
> AUTOMAKE_VERSION = 1.15
>
> pre-configure:
> - cd ${WRKDIST} && \
> - AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
> - AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
> - autoreconf -i
> + cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> + AUTOCONF_VERSION=${AUTOCONF_VERSION} autoreconf -fiv
>
> .include <bsd.port.mk>
> Index: astro/stellarium/Makefile
> ===================================================================
> RCS file: /cvs/ports/astro/stellarium/Makefile,v
> retrieving revision 1.53
> diff -u -p -r1.53 Makefile
> --- astro/stellarium/Makefile 22 Dec 2017 14:36:29 -0000 1.53
> +++ astro/stellarium/Makefile 28 Feb 2018 13:45:21 -0000
> @@ -2,15 +2,17 @@
>
> COMMENT= free open source planetarium
>
> -GH_TAGNAME= v0.17.0
> -GH_ACCOUNT= Stellarium
> -GH_PROJECT= stellarium
> +V = 0.17.0
> +DISTNAME = stellarium-${V}
> +REVISION = 0
>
> CATEGORIES= astro x11
>
> HOMEPAGE= http://www.stellarium.org/
>
> MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
> +
> +MASTER_SITES = https://github.com/Stellarium/stellarium/releases/download/v${V}/
>
> # GPLv2
> PERMIT_PACKAGE_CDROM= Yes
> Index: astro/stellarium/distinfo
> ===================================================================
> RCS file: /cvs/ports/astro/stellarium/distinfo,v
> retrieving revision 1.30
> diff -u -p -r1.30 distinfo
> --- astro/stellarium/distinfo 22 Dec 2017 14:36:29 -0000 1.30
> +++ astro/stellarium/distinfo 28 Feb 2018 13:45:21 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (stellarium-0.17.0.tar.gz) = xb4nP4gN4GvwLQQy0sr44r64sWlb7ahs5+t1mI8jdDY=
> -SIZE (stellarium-0.17.0.tar.gz) = 252733565
> +SHA256 (stellarium-0.17.0.tar.gz) = zCHi2vVDOwuZxugRARcbR9p7J4tsPk5DPN5FVbQbyzQ=
> +SIZE (stellarium-0.17.0.tar.gz) = 252377198
--
Antoine
No comments:
Post a Comment