Index: head/java/Makefile =================================================================== --- head/java/Makefile (revision 391180) +++ head/java/Makefile (revision 391181) @@ -1,124 +1,125 @@ # $FreeBSD$ # COMMENT = Java language support SUBDIR += avis SUBDIR += berkeley-db SUBDIR += bluej SUBDIR += bootstrap-openjdk SUBDIR += bouncycastle SUBDIR += cacao SUBDIR += castor SUBDIR += classpath SUBDIR += cos SUBDIR += cryptix-jce SUBDIR += dbvis SUBDIR += eclipse SUBDIR += eclipse-EPIC SUBDIR += eclipse-cdt SUBDIR += eclipse-drjava SUBDIR += eclipse-ecj SUBDIR += eclipse-findbugs SUBDIR += eclipse-log4e SUBDIR += eclipse-lomboz SUBDIR += eclipse-pydev SUBDIR += eclipse-shelled SUBDIR += eclipse-windowbuilder SUBDIR += hamcrest SUBDIR += icedtea-web SUBDIR += infobus SUBDIR += jad SUBDIR += jaf SUBDIR += jai SUBDIR += jakarta-bcel SUBDIR += jakarta-commons-beanutils SUBDIR += jakarta-commons-cli SUBDIR += jakarta-commons-codec SUBDIR += jakarta-commons-collections SUBDIR += jakarta-commons-dbcp SUBDIR += jakarta-commons-discovery SUBDIR += jakarta-commons-httpclient SUBDIR += jakarta-commons-lang SUBDIR += jakarta-commons-logging SUBDIR += jakarta-commons-pool SUBDIR += jakarta-commons-primitives SUBDIR += jakarta-oro SUBDIR += jakarta-regexp SUBDIR += jakarta-struts SUBDIR += jamvm SUBDIR += jasmin SUBDIR += java-checkstyle SUBDIR += java-cup SUBDIR += java-getopt SUBDIR += java-subversion SUBDIR += java-zoneinfo SUBDIR += java3d SUBDIR += javahelp SUBDIR += javamail SUBDIR += javavmwrapper SUBDIR += jaxen SUBDIR += jboss7 SUBDIR += jboss71 SUBDIR += jboss72 SUBDIR += jcalendar SUBDIR += jcckit SUBDIR += jcommon SUBDIR += jdbcpool SUBDIR += jdk16-doc SUBDIR += jdk7-doc SUBDIR += jdk8-doc SUBDIR += jdom SUBDIR += jflex SUBDIR += jfreechart SUBDIR += jgraph SUBDIR += jgrapht SUBDIR += jgraphx SUBDIR += jikes SUBDIR += jlex SUBDIR += jlint SUBDIR += jmf SUBDIR += jode SUBDIR += jomp SUBDIR += jrosetta SUBDIR += jta SUBDIR += jtiger SUBDIR += jump SUBDIR += junit SUBDIR += langspec SUBDIR += linux-oracle-jdk18 SUBDIR += linux-oracle-jre18 SUBDIR += linux-sun-jdk17 SUBDIR += linux-sun-jre17 SUBDIR += mmake SUBDIR += mx4j SUBDIR += netbeans SUBDIR += netbeans-devel SUBDIR += netcomponents SUBDIR += netrexx SUBDIR += netty SUBDIR += openjdk6 SUBDIR += openjdk6-jre SUBDIR += openjdk7 + SUBDIR += openjdk7-jre SUBDIR += openjdk8 SUBDIR += openjdk8-jre SUBDIR += phpeclipse SUBDIR += proguard SUBDIR += rubygem-rjb SUBDIR += sablevm SUBDIR += sablevm-classpath SUBDIR += servingxml SUBDIR += sigar SUBDIR += springframework SUBDIR += springframework31 SUBDIR += sqlitejdbc SUBDIR += trove4j SUBDIR += veditor SUBDIR += visualvm SUBDIR += wildfly80 SUBDIR += wildfly81 SUBDIR += wildfly82 SUBDIR += wildfly90 SUBDIR += xdoclet .include Index: head/java/openjdk7/Makefile =================================================================== --- head/java/openjdk7/Makefile (revision 391180) +++ head/java/openjdk7/Makefile (revision 391181) @@ -1,170 +1,196 @@ # Created by: Greg Lewis # $FreeBSD$ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ http://download.java.net/jaxp/1.4.5/:jaxp \ http://icedtea.classpath.org/download/drops/:jaxp \ http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/:jaxws \ http://icedtea.classpath.org/download/drops/:jaxws \ https://java.net/downloads/jax-ws/JDK7/:jaf \ http://icedtea.classpath.org/download/drops/:jaf \ APACHE/ant/binaries/:ant DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ ${ANT_DISTFILE}${EXTRACT_SUFX}:ant EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ ${ANT_DISTFILE}${EXTRACT_SUFX} -MAINTAINER= glewis@FreeBSD.org -COMMENT= Java Development Kit 7 +MAINTAINER?= glewis@FreeBSD.org +COMMENT?= Java Development Kit 7 LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} USES= compiler dos2unix iconv gmake zip USE_XORG+= x11 xext xi xrender xt xtst MAKE_ARGS= CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q} -OPTIONS_DEFINE= DEBUG POLICY TZUPDATE +OPTIONS_DEFINE= POLICY TZUPDATE OPTIONS_DEFAULT= POLICY TZUPDATE DEBUG_DESC= Enable extra debugging info POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data +JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} + +.if !defined(BUILD_JRE) +OPTIONS_DEFINE+= DEBUG +INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION} +.else +JAVAVMS_COMMENT+= JRE +INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre +.endif + PORT_MINOR_VERSION= 80 PORT_BUILD_NUMBER= 15 JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 40 JDK_BUILD_NUMBER= 43 JDK_BUILD_DATE= 26_aug_2013 JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} # Use our own version of ant to avoid circular dependencies ANT_VERSION= 1.9.4 ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin LATEST_LINK= openjdk7 LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper \ dejavu>0:${PORTSDIR}/x11-fonts/dejavu DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} -INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION} NOPRECIOUSMAKEVARS= yes ONLY_FOR_ARCHS= i386 amd64 _MAKE_JOBS= # MAKE_ENV+= LANG="C" \ LC_ALL="C" \ JAVA_HOME="" \ CLASSPATH="" \ LD_LIBRARY_PATH="" \ MAKEFLAGS="" \ ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ ALT_FREETYPE_HEADERS_PATH="${LOCALBASE}/include" \ ALT_FREETYPE_LIB_PATH="${LOCALBASE}/lib" \ ALT_CUPS_HEADERS_PATH="${LOCALBASE}/include" \ ALT_X11_PATH="${LOCALBASE}" \ ALT_PKG_PATH="${LOCALBASE}" \ ALT_PACKAGE_PATH="${LOCALBASE}" \ ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \ JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \ X11DIR="${LOCALBASE}" \ LOCALDIR="${LOCALBASE}" \ COMPILER_WARNINGS_FATAL="false" \ NO_DOCS="true" \ SKIP_COMPARE_IMAGES="true" \ SKIP_FASTDEBUG_BUILD="true" \ SKIP_DEBUG_BUILD="true" \ ZIP_DEBUGINFO_FILES=0 \ ENABLE_FULL_DEBUG_SYMBOLS=0 \ PTHREAD_LIBS="-lpthread" \ MILESTONE="fcs" \ JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \ BUILD_NUMBER="b${PORT_BUILD_NUMBER}" MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \ ${LOCALBASE}/openjdk6 \ ${LOCALBASE}/bootstrap-openjdk DEBUG_MAKE_ENV= ALT_OBJCOPY=${NONEXISTENT} POLICY_MAKE_ENV= UNLIMITED_CRYPTO=1 TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo .include # 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-openjdk BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/bootstrap-openjdk .endif .include # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html .if ${COMPILER_TYPE} == gcc MAKE_ENV+= USE_PRECOMPILED_HEADER=0 .endif .if empty(ICONV_LIB) MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG .endif post-patch: @${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java .if empty(ICONV_LIB) @${REINPLACE_CMD} 's| -liconv||' \ ${WRKSRC}/Makefile \ ${WRKSRC}/jdk/make/sun/splashscreen/Makefile \ ${WRKSRC}/jdk/make/java/npt/Makefile \ ${WRKSRC}/jdk/make/java/instrument/Makefile .endif .if ${PORT_OPTIONS:MTZUPDATE} pre-install: @# Update time zones +.if !defined(BUILD_JRE) @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ - ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib + ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib +.else + @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi + @${LN} -s -f ${LOCALBASE}/share/java/zi \ + ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib .endif +.endif do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} - @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ - ${PAX} -rw . ${STAGEDIR}${INSTALLDIR} - @${INSTALL_DATA} ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/compilefontconfig.jar ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/javazic.jar ${STAGEDIR}${INSTALLDIR}/jre/lib/ - @${INSTALL_DATA} ${FILESDIR}/cacerts ${STAGEDIR}${INSTALLDIR}/jre/lib/security/cacerts +.if !defined(BUILD_JRE) + cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ + ${PAX} -rw . ${STAGEDIR}${INSTALLDIR} + ${INSTALL_DATA} \ + ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/compilefontconfig.jar \ + ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/javazic.jar \ + ${STAGEDIR}${INSTALLDIR}/jre/lib/ + ${INSTALL_DATA} ${FILESDIR}/cacerts \ + ${STAGEDIR}${INSTALLDIR}/jre/lib/security/cacerts +.else + cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \ + ${PAX} -rw . ${STAGEDIR}${INSTALLDIR} + ${INSTALL_DATA} ${FILESDIR}/cacerts \ + ${STAGEDIR}${INSTALLDIR}/lib/security/cacerts +.endif @${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} @${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${INSTALLDIR} -type d -empty | ${SORT} -r | \ ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' >> ${TMPPLIST} - @${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # OpenJDK${JDK_MAJOR_VERSION}'" >> ${TMPPLIST} + @${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST} .include Index: head/java/openjdk7-jre/Makefile =================================================================== --- head/java/openjdk7-jre/Makefile (nonexistent) +++ head/java/openjdk7-jre/Makefile (revision 391181) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -jre + +MAINTAINER= java@FreeBSD.org +COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} + +BUILD_JRE= yes +MASTERDIR= ${.CURDIR}/../openjdk7 + +.include "${MASTERDIR}/Makefile" Property changes on: head/java/openjdk7-jre/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property