Index: head/games/bsdgames/Makefile =================================================================== --- head/games/bsdgames/Makefile (revision 501297) +++ head/games/bsdgames/Makefile (revision 501298) @@ -1,87 +1,84 @@ # Created by: Mark Murray # $FreeBSD$ PORTNAME= bsdgames PORTVERSION= 5.5.0 +DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= games -MASTER_SITES= https://github.com/DragonFlyBSD/DragonFlyBSD/archive/ \ - https://deb.debian.org/debian/pool/main/b/bsdgames/ -DISTFILES= v${PORTVERSION}.zip \ - ${PORTNAME}_2.17.orig.tar.gz +MASTER_SITES= https://deb.debian.org/debian/pool/main/b/bsdgames/:deb +DISTFILES= ${PORTNAME}_2.17.orig.tar.gz:deb MAINTAINER= jockl@pianojockl.org COMMENT= Traditional BSD games taken from DragonFly BSD LICENSE= BSD3CLAUSE USES= ncurses tar:xz uidfix +USE_GITHUB= nodefault +GH_ACCOUNT= DragonFlyBSD:bsd +GH_PROJECT= DragonFlyBSD:bsd CONFLICTS= hangman-[0-9]* MAKE_ENV= NO_WERROR=1 MAKE_ARGS= BINGRP=${BINGRP} # contain /usr/share/games SHAREPATH_FILES=atc/atc.6 \ atc/pathnames.h \ boggle/boggle/bog.h \ boggle/boggle/boggle.6 \ cribbage/cribbage.6 \ cribbage/pathnames.h \ fish/pathnames.h \ larn/pathnames.h \ quiz/datfiles/index \ quiz/pathnames.h \ quiz/quiz.6 \ wump/pathnames.h # contain /usr/games/* GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \ backgammon/common_source/init.c \ canfield/canfield/canfield.6 \ cribbage/cribbage.6 \ hunt/hunt/hunt.6 \ hunt/huntd/huntd.6 \ phantasia/pathnames.h \ wargames/wargames.sh -.include +post-extract: + ${MV} ${WRKSRC_bsd}/games ${WRKSRC} + ${MV} ${WRKDIR}/bsd-games-2.17/sail/*.[ch] ${WRKSRC}/sail/ + ${MV} ${WRKDIR}/bsd-games-2.17/sail/pathnames.h.in ${WRKSRC}/sail/pathnames.h post-patch: @for f in ${SHAREPATH_FILES}; do \ ${REINPLACE_CMD} -e 's|/usr/share/games|${PREFIX}/share/games|g' \ ${WRKSRC}/$${f}; \ done @for f in ${GAMESPATH_FILES}; do \ ${REINPLACE_CMD} -e 's|/usr/games|${PREFIX}/bin|g' \ ${WRKSRC}/$${f}; \ done pre-install: .for d in atc larn quiz.db boggle @${MKDIR} ${STAGEDIR}${PREFIX}/share/games/$d .endfor .for d in atc battlestar hackdir/save larn phantasia @${MKDIR} ${STAGEDIR}/var/games/$d .endfor post-install: # avoid conflict with games/bs and shells/fish .for prog in bs fish ${MV} ${STAGEDIR}${PREFIX}/bin/${prog} ${STAGEDIR}${PREFIX}/bin/${prog}-game ${MV} ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}.6.gz ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}-game.6.gz .endfor @${TOUCH} ${STAGEDIR}/var/games/atc_score @${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \; -do-extract: - ${MKDIR} ${WRKDIR} - ${TAR} -xzf ${DISTDIR}/v${PORTVERSION}.zip -C ${WRKDIR} - ${TAR} -xzf ${DISTDIR}/${PORTNAME}_2.17.orig.tar.gz -C ${WRKDIR} - ${MV} ${WRKDIR}/DragonFlyBSD-${PORTVERSION}/games ${WRKSRC} - ${MV} ${WRKDIR}/bsd-games-2.17/sail/*.[ch] ${WRKSRC}/sail/ - ${MV} ${WRKDIR}/bsd-games-2.17/sail/pathnames.h.in ${WRKSRC}/sail/pathnames.h - -.include +.include Index: head/games/bsdgames/distinfo =================================================================== --- head/games/bsdgames/distinfo (revision 501297) +++ head/games/bsdgames/distinfo (revision 501298) @@ -1,5 +1,5 @@ -TIMESTAMP = 1552233173 -SHA256 (v5.5.0.zip) = c6afd51d0283e9d5f0911f046824bddf41926c277ce995ab78e128b32737e400 -SIZE (v5.5.0.zip) = 169083630 +TIMESTAMP = 1557603153 SHA256 (bsdgames_2.17.orig.tar.gz) = 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 SIZE (bsdgames_2.17.orig.tar.gz) = 2563311 +SHA256 (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = e54ca3fea6e4ae4b384df4718f5ca749e597537112f1b2170e8fb5c296c1720b +SIZE (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = 137084047 Index: head/java/openjdk11/Makefile =================================================================== --- head/java/openjdk11/Makefile (revision 501297) +++ head/java/openjdk11/Makefile (revision 501298) @@ -1,138 +1,139 @@ # $FreeBSD$ PORTNAME= openjdk -PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} +DISTVERSIONPREFIX= jdk- +DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel -MASTER_SITES= https://github.com/battleblow/openjdk-jdk11u/archive/ PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -DISTNAME= jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} MAINTAINER= java@FreeBSD.org COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgif.so:graphics/giflib \ liblcms2.so:graphics/lcms2 \ libpng16.so:graphics/png USES= compiler:features gmake iconv jpeg pkgconfig USE_XORG= x11 xext xi xrender xt xtst -WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +USE_GITHUB= yes +GH_ACCOUNT= battleblow +GH_PROJECT= openjdk-jdk11u _MAKE_JOBS= # MAKE_ENV= LANG="C" \ LC_ALL="C" \ CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ CC=/usr/bin/cc \ CXX=/usr/bin/c++ \ MAKEFLAGS="" \ USE_CLANG=true JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 3 JDK_BUILD_NUMBER= 7 BSD_JDK_VERSION= 1 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=/usr/bin/cc \ CXX=/usr/bin/c++ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-ccache \ --disable-javac-server \ --disable-hotspot-gtest \ --with-alsa=${LOCALBASE} \ --with-cups=${LOCALBASE} \ --with-fontconfig=${LOCALBASE} \ --with-freetype=system \ --with-freetype-include=${LOCALBASE}/include/freetype2 \ --with-freetype-lib=${LOCALBASE}/lib \ --with-libjpeg=system \ --with-giflib=system \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ --with-toolchain-type=clang \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib \ --with-cacerts-file=${FILESDIR}/cacerts \ --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ --with-native-debug-symbols=none \ --with-debug-level=release JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} ALL_TARGET= images JDK_BUILD_TYPE= release .include BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) BOOTSTRAPJDKDIR= ${BJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk11 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 .endif JDK_BUILD_JVM= server .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else ICONV_CFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ICONV_LIBS= ${ICONV_LIB} .endif post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @${CHMOD} 755 ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure \ ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ ${WRKSRC}/make/autoconf/libraries.m4 do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} .include Index: head/java/openjdk11/distinfo =================================================================== --- head/java/openjdk11/distinfo (revision 501297) +++ head/java/openjdk11/distinfo (revision 501298) @@ -1,3 +1,3 @@ -TIMESTAMP = 1555524590 -SHA256 (jdk-11.0.3+7-1.tar.gz) = 1a75f453c5e819c2399d802a972f9ea6c296208d8fe0b810dad89067e637419c -SIZE (jdk-11.0.3+7-1.tar.gz) = 116791459 +TIMESTAMP = 1557601910 +SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.3+7-1_GH0.tar.gz) = 1a75f453c5e819c2399d802a972f9ea6c296208d8fe0b810dad89067e637419c +SIZE (battleblow-openjdk-jdk11u-jdk-11.0.3+7-1_GH0.tar.gz) = 116791459 Index: head/java/openjdk12/Makefile =================================================================== --- head/java/openjdk12/Makefile (revision 501297) +++ head/java/openjdk12/Makefile (revision 501298) @@ -1,139 +1,140 @@ # $FreeBSD$ PORTNAME= openjdk -PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} +DISTVERSIONPREFIX= jdk- +DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel -MASTER_SITES= https://github.com/battleblow/openjdk-jdk12u/archive/ PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -DISTNAME= jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} MAINTAINER= java@FreeBSD.org COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgif.so:graphics/giflib \ liblcms2.so:graphics/lcms2 \ libpng16.so:graphics/png USES= compiler:features gmake iconv jpeg pkgconfig USE_XORG= x11 xext xi xrandr xrender xt xtst -WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +USE_GITHUB= yes +GH_ACCOUNT= battleblow +GH_PROJECT= openjdk-jdk12u _MAKE_JOBS= # MAKE_ENV= LANG="C" \ LC_ALL="C" \ CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ CC=/usr/bin/cc \ CXX=/usr/bin/c++ \ MAKEFLAGS="" \ USE_CLANG=true JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 12 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 1 JDK_BUILD_NUMBER= 12 BSD_JDK_VERSION= 1 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=/usr/bin/cc \ CXX=/usr/bin/c++ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-ccache \ --disable-javac-server \ --disable-hotspot-gtest \ --with-alsa=${LOCALBASE} \ --with-cups=${LOCALBASE} \ --with-fontconfig=${LOCALBASE} \ --with-freetype=system \ --with-freetype-include=${LOCALBASE}/include/freetype2 \ --with-freetype-lib=${LOCALBASE}/lib \ --with-libjpeg=system \ --with-giflib=system \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ --with-toolchain-type=clang \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib \ --with-cacerts-file=${FILESDIR}/cacerts \ --with-version-string=${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ --with-native-debug-symbols=none \ --with-debug-level=release JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} ALL_TARGET= images JDK_BUILD_TYPE= release .include BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk12 \ ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) BOOTSTRAPJDKDIR= ${BJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk11 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 .endif JDK_BUILD_JVM= server .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else ICONV_CFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ICONV_LIBS= ${ICONV_LIB} .endif post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @${CHMOD} 755 ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure \ ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ ${WRKSRC}/make/autoconf/libraries.m4 do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} .include Index: head/java/openjdk12/distinfo =================================================================== --- head/java/openjdk12/distinfo (revision 501297) +++ head/java/openjdk12/distinfo (revision 501298) @@ -1,3 +1,3 @@ -TIMESTAMP = 1555525600 -SHA256 (jdk-12.0.1+12-1.tar.gz) = f398da1f0eb7b8dea409061d38e04210254de51e1cb06480baa61fb171a1d4e2 -SIZE (jdk-12.0.1+12-1.tar.gz) = 110249732 +TIMESTAMP = 1557602121 +SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.1+12-1_GH0.tar.gz) = f398da1f0eb7b8dea409061d38e04210254de51e1cb06480baa61fb171a1d4e2 +SIZE (battleblow-openjdk-jdk12u-jdk-12.0.1+12-1_GH0.tar.gz) = 110249732 Index: head/java/openjdk8/Makefile =================================================================== --- head/java/openjdk8/Makefile (revision 501297) +++ head/java/openjdk8/Makefile (revision 501298) @@ -1,298 +1,298 @@ # $FreeBSD$ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}.${BSD_JDK_VERSION} CATEGORIES= java devel -MASTER_SITES= https://github.com/battleblow/openjdk-jdk8u/archive/:jdk \ - LOCAL/jkim:jtreg +MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -DISTNAME= jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -DISTFILES= ${DISTNAME}.tar.gz:jdk MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libinotify.so:devel/libinotify RUN_DEPENDS= javavm:java/javavmwrapper \ dejavu>0:x11-fonts/dejavu USES= compiler:features gmake iconv pkgconfig shebangfix +USE_GITHUB= yes +GH_ACCOUNT= battleblow +GH_PROJECT= openjdk-jdk8u +GH_TAGNAME= jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 -WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-${DISTNAME} SHEBANG_FILES= configure _MAKE_JOBS= # CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH="" MAKE_ENV+= IGNORE_OLD_CONFIG=true MAKE_ENV+= COMPILER_WARNINGS_FATAL="false" JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} .if !defined(BUILD_JRE) JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image/jre .else JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image .endif JDK_JVMDIR= lib/${ARCH:C/armv.*/arm/:S/powerpc64/ppc64/} JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/} INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 JDK_UPDATE_VERSION= 212 JDK_BUILD_NUMBER= 04 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} CONFIGURE_ARGS+= --with-build-number="b${JDK_BUILD_NUMBER}" .if ${JDK_UPDATE_VERSION} > 0 CONFIGURE_ARGS+= --with-update-version=${JDK_UPDATE_VERSION} .endif .if defined(NO_CCACHE) CONFIGURE_ARGS+= --disable-ccache .endif CONFIGURE_ARGS+= --disable-freetype-bundling \ --disable-zip-debug-info \ --with-cacerts-file=${FILESDIR}/cacerts \ --with-cups=${LOCALBASE} \ --with-debug-level=${JDK_BUILD_TYPE} \ --with-freetype=${LOCALBASE} \ --with-freetype-include=${LOCALBASE}/include/freetype2 \ --with-jobs=${MAKE_JOBS_NUMBER} \ --with-jvm-variants=${JDK_BUILD_JVM} \ --with-milestone=fcs \ --with-package-path=${LOCALBASE} \ --with-zlib=system CONFIGURE_SCRIPT= ../../configure CONFIGURE_WRKSRC= ${WRKSRC}/common/autoconf OPTIONS_DEFINE= ALSA POLICY TZUPDATE X11 FONTCONFIG OPTIONS_DEFINE_armv6= FPUHACK OPTIONS_DEFINE_armv7= FPUHACK OPTIONS_DEFAULT= ALSA POLICY TZUPDATE X11 OPTIONS_DEFAULT_armv6= FPUHACK OPTIONS_DEFAULT_armv7= FPUHACK FPUHACK_DESC= Hack denormalized numbers in flush-to-zero mode POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data ALSA_CONFIGURE_ENV_OFF= ALSA_NOT_NEEDED=yes ALSA_CONFIGURE_ON= --with-alsa=${LOCALBASE} ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib FPUHACK_EXTRA_PATCHES= ${PATCHDIR}/fpuhack.patch POLICY_CONFIGURE_ENABLE= unlimited-crypto TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo X11_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/X11/Xlib.h:x11/libX11 \ ${LOCALBASE}/include/X11/extensions/Xdbe.h:x11/libXext \ ${LOCALBASE}/include/X11/extensions/Xrender.h:x11/libXrender \ ${LOCALBASE}/include/X11/Intrinsic.h:x11-toolkits/libXt X11_CONFIGURE_OFF= --disable-headful X11_CONFIGURE_ON= --with-giflib=system \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib X11_LIB_DEPENDS= libgif.so:graphics/giflib X11_MAKE_ENV_OFF= BUILD_HEADLESS_ONLY=1 \ MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include" X11_MAKE_ENV_ON= MAKEFLAGS="" X11_USE= XORG=x11,xext,xi,xrender,xt,xtst FONTCONFIG_IMPLIES= X11 JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} .if !defined(BUILD_JRE) OPTIONS_DEFINE+= TEST OPTIONS_DEFAULT+= RELEASE OPTIONS_SINGLE= BUILD OPTIONS_SINGLE_BUILD= DEBUG DEBUGFAST RELEASE BUILD_DESC= Select OpenJDK build type DEBUG_DESC= Build for debugging (without optimizations) DEBUGFAST_DESC= Build for debugging (with optimizations) RELEASE_DESC= Build for release (default) TEST_DESC= Run regression tests DEBUG_VARS= JDK_BUILD_TYPE=slowdebug DEBUGFAST_VARS= JDK_BUILD_TYPE=fastdebug RELEASE_BUILD_DEPENDS_OFF= ${LOCALBASE}/bin/objcopy:devel/binutils RELEASE_CONFIGURE_ON= --disable-debug-symbols RELEASE_VARS= JDK_BUILD_TYPE=release RELEASE_VARS_OFF= OBJCOPY=${LOCALBASE}/bin/objcopy TEST_ALL_TARGET= test TEST_ALL_TARGET_OFF= images TEST_CONFIGURE_ON= --with-jtreg=${WRKDIR}/jtreg TEST_DISTFILES= jtreg${JTREG_VERSION}-${JTREG_BUILD_NUMBER}${EXTRACT_SUFX}:jtreg .else ALL_TARGET= images CONFIGURE_ARGS+= --disable-debug-symbols JAVAVMS_COMMENT+= JRE JDK_BUILD_TYPE= release .endif # XXX configure script rejects CC/CPP/CXX with absolute paths. .for t in CC CPP CXX .if defined(${t}) && ${${t}:M/*} BUILD_${t}= ${${t}:C|.*/||g} CONFIGURE_ENV+= ${t}="${BUILD_${t}}" TOOLS_DIR+= ${${t}:S|/${BUILD_${t}}$||} .endif .endfor .if defined(TOOLS_DIR) CONFIGURE_ARGS+= --with-tools-dir="${TOOLS_DIR:u:S/ /:/g}" .endif .include BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ ${LOCALBASE}/openjdk7 \ ${LOCALBASE}/bootstrap-openjdk8 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) BOOTSTRAPJDKDIR= ${BJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk8 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk8 .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 # XXX We must limit max heap size for 32-bit targets. CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m" MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m" .endif .if ${ARCH} == i386 # Fix the build for i386 when WITH_LLD_IS_LD is set # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741 MAKE_ENV+= LFLAGS="-Wl,-z,notext" .endif .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64 JDK_BUILD_JVM= server .else JDK_BUILD_JVM= zero LIB_DEPENDS+= libffi.so:devel/libffi .endif .if ${COMPILER_TYPE} == clang .if ${COMPILER_VERSION} >= 35 MAKE_ENV+= COMPILER_WARNINGS_FATAL=false .endif MAKE_ENV+= USE_CLANG=true .if ${COMPILER_FEATURES:Mlibc++} CONFIGURE_ENV+= LIBCXX="-lc++" .endif .endif # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html .if ${COMPILER_TYPE} == gcc CONFIGURE_ARGS+= --with-toolchain-type=gcc .if ${ARCH} == "powerpc64" MAKE_ARGS+= USE_PRECOMPILED_HEADER=1 .else MAKE_ARGS+= USE_PRECOMPILED_HEADER=0 .endif .endif .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else ICONV_CPPFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .endif post-extract-TEST-on: @${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/ do-patch-FONTCONFIG-on: @${PATCH} -d ${PATCH_WRKSRC} < ${PATCHDIR}/fontconfig.patch post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${FILESDIR}/bsd.fontconfig.properties.in > \ ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%OBJCOPY%%|${OBJCOPY}|' \ ${WRKSRC}/configure \ ${WRKSRC}/common/autoconf/toolchain.m4 \ ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \ ${WRKSRC}/jdk/make/lib/NioLibraries.gmk \ ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \ ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java @${REINPLACE_CMD} -e 's|/usr/local/share/java/classes|${LOCALBASE}/share/java/classes|' \ ${WRKSRC}/jdk/src/bsd/doc/man/*.1 @${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \ -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \ ${WRKSRC}/jdk/make/lib/CoreLibraries.gmk \ ${WRKSRC}/jdk/make/lib/ServiceabilityLibraries.gmk .if defined(BUILD_JRE) @${REINPLACE_CMD} -e 's|-f Images.gmk$$|& jre-image|' \ -e 's|-f Images.gmk overlay-images$$|-f Images.gmk jre-overlay-image|' \ ${WRKSRC}/jdk/make/BuildJdk.gmk .endif @${CHMOD} 755 ${WRKSRC}/configure post-patch-ALSA-off: @${REINPLACE_CMD} '/EXTRA_SOUND_JNI_LIBS += jsoundalsa/d' \ ${WRKSRC}/jdk/make/lib/SoundLibraries.gmk post-build: .if !defined(BUILD_JRE) @${BOOTSTRAPJDKDIR}/bin/jar cfe \ ${JRE_IMAGEDIR}/lib/compilefontconfig.jar \ build.tools.compilefontconfig.CompileFontConfig \ -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/compilefontconfig @${BOOTSTRAPJDKDIR}/bin/jar cfe \ ${JRE_IMAGEDIR}/lib/javazic.jar \ build.tools.tzdb.TzdbZoneRulesCompiler \ -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/tzdb .endif post-build-TZUPDATE-on: @# Update time zones @${RM} -r ${JRE_IMAGEDIR}/lib/zi @${LN} -sf ${LOCALBASE}/share/java/zi ${JRE_IMAGEDIR}/lib do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} .if !defined(BUILD_JRE) @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ ${FIND} bin jre/bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \ ${CHMOD} ${BINMODE} jre/${JDK_JVMDIR}/jexec \ jre/${JDK_JVMDIR}/jspawnhelper ${JDK_JVMDIR}/jexec @${ECHO} "@dir ${INSTALLDIR}/jre/lib/applet" >> ${TMPPLIST} .else @cd ${JRE_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \ ${CHMOD} ${BINMODE} ${JDK_JVMDIR}/jexec ${JDK_JVMDIR}/jspawnhelper @${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST} .endif @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} .include Index: head/java/openjdk8/distinfo =================================================================== --- head/java/openjdk8/distinfo (revision 501297) +++ head/java/openjdk8/distinfo (revision 501298) @@ -1,5 +1,5 @@ -TIMESTAMP = 1555604894 -SHA256 (jdk8u212-b04.1.tar.gz) = b69b2601bd1ddb68700df801b0ad5c8351ca8c937573130603910614e7d478d6 -SIZE (jdk8u212-b04.1.tar.gz) = 85191465 +TIMESTAMP = 1557602353 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 6834252 +SHA256 (battleblow-openjdk-jdk8u-8.212.4.1-jdk8u212-b04.1_GH0.tar.gz) = b69b2601bd1ddb68700df801b0ad5c8351ca8c937573130603910614e7d478d6 +SIZE (battleblow-openjdk-jdk8u-8.212.4.1-jdk8u212-b04.1_GH0.tar.gz) = 85191465 Index: head/x11-fonts/comic-neue/Makefile =================================================================== --- head/x11-fonts/comic-neue/Makefile (revision 501297) +++ head/x11-fonts/comic-neue/Makefile (revision 501298) @@ -1,24 +1,28 @@ # $FreeBSD$ PORTNAME= comic-neue PORTVERSION= 2.4 +DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= x11-fonts -MASTER_SITES= https://github.com/crozynski/comicneue/archive/v${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Free Comic Sans alternative LICENSE= OFL11 LICENSE_FILE= ${WRKDIR}/comicneue-${PORTVERSION}/SIL-License.txt -USES= fonts zip +USES= fonts +USE_GITHUB= yes +GH_ACCOUNT= crozynski +GH_PROJECT= comicneue + NO_BUILD= yes -WRKSRC= ${WRKDIR}/comicneue-${PORTVERSION}/OTF +WRKSRC_SUBDIR= OTF do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${FONTSDIR} .include Index: head/x11-fonts/comic-neue/distinfo =================================================================== --- head/x11-fonts/comic-neue/distinfo (revision 501297) +++ head/x11-fonts/comic-neue/distinfo (revision 501298) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549004515 -SHA256 (comic-neue-2.4.zip) = d97ecd8b4e00cce7c857a8b94c1e4f068ae01275ead3a8a3297051cf99c3389e -SIZE (comic-neue-2.4.zip) = 4711599 +TIMESTAMP = 1557602791 +SHA256 (crozynski-comicneue-v2.4_GH0.tar.gz) = 9e1153e1bc08d76e7d5418ac707278b687204b2eb6c59f387f1c310edb165be6 +SIZE (crozynski-comicneue-v2.4_GH0.tar.gz) = 2896409