View | Details | Raw Unified | Return to bug 82138
Collapse All | Expand All

(-)bsd.java.mk (-5 lines)
Lines 216-227 Link Here
216
_JAVA_OS_linux=		Linux
216
_JAVA_OS_linux=		Linux
217
217
218
# Enforce preferred Java ports according to OS
218
# Enforce preferred Java ports according to OS
219
.		if ${OSVERSION} >= 400000
220
_JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4
219
_JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4
221
.		else
222
_JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1
223
.		endif
224
225
220
226
# List all JDK ports
221
# List all JDK ports
227
__JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
222
__JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
(-)bsd.port.mk (-39 / +1 lines)
Lines 1242-1252 Link Here
1242
PERL_VERSION?=	5.6.0
1242
PERL_VERSION?=	5.6.0
1243
PERL_VER?=		5.6.0
1243
PERL_VER?=		5.6.0
1244
.else
1244
.else
1245
.if ${OSVERSION} >= 300000
1246
PERL_VERSION?=	5.00503
1245
PERL_VERSION?=	5.00503
1247
.else
1248
PERL_VERSION?=	5.00502
1249
.endif
1250
PERL_VER?=		5.005
1246
PERL_VER?=		5.005
1251
.endif
1247
.endif
1252
.endif
1248
.endif
Lines 1639-1648 Link Here
1639
.endif
1635
.endif
1640
1636
1641
.if defined(USE_BISON)
1637
.if defined(USE_BISON)
1642
.if ${OSVERSION} >= 400014
1643
BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
1638
BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
1644
.endif
1639
.endif
1645
.endif
1646
1640
1647
PLIST_SUB+=		PERL_VERSION=${PERL_VERSION} \
1641
PLIST_SUB+=		PERL_VERSION=${PERL_VERSION} \
1648
				PERL_VER=${PERL_VER} \
1642
				PERL_VER=${PERL_VER} \
Lines 1842-1854 Link Here
1842
# Special macro for doing in-place file editing using regexps
1836
# Special macro for doing in-place file editing using regexps
1843
.if defined(USE_REINPLACE)
1837
.if defined(USE_REINPLACE)
1844
REINPLACE_ARGS?=	-i.bak
1838
REINPLACE_ARGS?=	-i.bak
1845
.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 )
1846
PATCH_DEPENDS+=	${LOCALBASE}/bin/sed_inplace:${PORTSDIR}/textproc/sed_inplace
1847
REINPLACE_CMD?=	${LOCALBASE}/bin/sed_inplace ${REINPLACE_ARGS}
1848
.else
1849
REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
1839
REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
1850
.endif
1840
.endif
1851
.endif
1852
1841
1853
# Names of cookies used to skip already completed stages
1842
# Names of cookies used to skip already completed stages
1854
EXTRACT_COOKIE?=	${WRKDIR}/.extract_done.${PKGNAME}.${PREFIX:S/\//_/g}
1843
EXTRACT_COOKIE?=	${WRKDIR}/.extract_done.${PKGNAME}.${PREFIX:S/\//_/g}
Lines 1895-1907 Link Here
1895
.endif
1884
.endif
1896
1885
1897
.if exists(/usr/bin/fetch)
1886
.if exists(/usr/bin/fetch)
1898
# avoid -A for 2.2 -- it's not ported to that branch
1899
.if ${OSVERSION} < 300000
1900
FETCH_CMD?=		/usr/bin/fetch
1901
.else
1902
FETCH_CMD?=		/usr/bin/fetch -ARr
1887
FETCH_CMD?=		/usr/bin/fetch -ARr
1903
FETCH_REGET?=	1
1888
FETCH_REGET?=	1
1904
.endif
1905
.if ${OSVERSION} >= 480000 && !defined(DISABLE_SIZE)
1889
.if ${OSVERSION} >= 480000 && !defined(DISABLE_SIZE)
1906
# Avoid -S for 4.7 and earlier since it causes fetch errors
1890
# Avoid -S for 4.7 and earlier since it causes fetch errors
1907
FETCH_BEFORE_ARGS+=	$${CKSIZE:+-S $$CKSIZE}
1891
FETCH_BEFORE_ARGS+=	$${CKSIZE:+-S $$CKSIZE}
Lines 2036-2042 Link Here
2036
.undef NO_PACKAGE
2020
.undef NO_PACKAGE
2037
.endif
2021
.endif
2038
2022
2039
COMMENTFILE?=		${PKGDIR}/pkg-comment
2023
COMMENTFILE?=	${PKGDIR}/pkg-comment
2040
DESCR?=			${PKGDIR}/pkg-descr
2024
DESCR?=			${PKGDIR}/pkg-descr
2041
PLIST?=			${PKGDIR}/pkg-plist
2025
PLIST?=			${PKGDIR}/pkg-plist
2042
PKGINSTALL?=	${PKGDIR}/pkg-install
2026
PKGINSTALL?=	${PKGDIR}/pkg-install
Lines 2046-2059 Link Here
2046
2030
2047
TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
2031
TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
2048
2032
2049
.if ${OSVERSION} >= 400000
2050
.for _CATEGORY in ${CATEGORIES}
2033
.for _CATEGORY in ${CATEGORIES}
2051
PKGCATEGORY?=	${_CATEGORY}
2034
PKGCATEGORY?=	${_CATEGORY}
2052
.endfor
2035
.endfor
2053
_PORTDIRNAME=	${.CURDIR:T}
2036
_PORTDIRNAME=	${.CURDIR:T}
2054
PORTDIRNAME?=	${_PORTDIRNAME}
2037
PORTDIRNAME?=	${_PORTDIRNAME}
2055
PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
2038
PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
2056
.endif
2057
2039
2058
.if exists(${LOCALBASE}/sbin/pkg_info)
2040
.if exists(${LOCALBASE}/sbin/pkg_info)
2059
PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
2041
PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
Lines 2061-2073 Link Here
2061
PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
2043
PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
2062
PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
2044
PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
2063
PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
2045
PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
2064
.elif ${OSVERSION} < 460102 && ${PKGORIGIN} != "sysutils/pkg_install"
2065
BUILD_DEPENDS+=		${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/sysutils/pkg_install
2066
PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
2067
PKG_ADD?=		${LOCALBASE}/sbin/pkg_add
2068
PKG_DELETE?=		${LOCALBASE}/sbin/pkg_delete
2069
PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
2070
PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
2071
.else
2046
.else
2072
PKG_CMD?=		/usr/sbin/pkg_create
2047
PKG_CMD?=		/usr/sbin/pkg_create
2073
PKG_ADD?=		/usr/sbin/pkg_add
2048
PKG_ADD?=		/usr/sbin/pkg_add
Lines 2778-2788 Link Here
2778
# Don't build a port if the system is too old.
2753
# Don't build a port if the system is too old.
2779
################################################################
2754
################################################################
2780
2755
2781
.if ${OSVERSION} < 420000
2782
# You need an upgrade kit or make world newer than this
2783
IGNORE=	": Your system is too old to use this bsd.port.mk.  You need a fresh make world or an upgrade kit.  Please go to http://www.FreeBSD.org/ports/ or a mirror site and follow the instructions"
2784
.endif
2785
2786
.if defined(ONLY_FOR_ARCHS)
2756
.if defined(ONLY_FOR_ARCHS)
2787
.for __ARCH in ${ONLY_FOR_ARCHS}
2757
.for __ARCH in ${ONLY_FOR_ARCHS}
2788
.if ${MACHINE_ARCH:M${__ARCH}} != ""
2758
.if ${MACHINE_ARCH:M${__ARCH}} != ""
Lines 3028-3037 Link Here
3028
2998
3029
# Check if the port is listed in the vulnerability database
2999
# Check if the port is listed in the vulnerability database
3030
3000
3031
.if ${PKGINSTALLVER} < 20040125 || ${OSVERSION} < 420001 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500014
3032
DISABLE_VULNERABILITIES=	yes
3033
.endif
3034
3035
AUDITFILE?=		/var/db/portaudit/auditfile.tbz
3001
AUDITFILE?=		/var/db/portaudit/auditfile.tbz
3036
_EXTRACT_AUDITFILE=	${TAR} -jxOf "${AUDITFILE}" auditfile
3002
_EXTRACT_AUDITFILE=	${TAR} -jxOf "${AUDITFILE}" auditfile
3037
3003
Lines 4607-4617 Link Here
4607
# Print out package names.
4573
# Print out package names.
4608
4574
4609
package-depends:
4575
package-depends:
4610
.if ${OSVERSION} >= 460102 || exists(${LOCALBASE}/sbin/pkg_info)
4611
	@${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}'
4576
	@${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}'
4612
.else
4613
	@${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1}'
4614
.endif
4615
4577
4616
# Build packages for port and dependencies
4578
# Build packages for port and dependencies

Return to bug 82138