Attachment 54285 Details for Bug 82138 – file.diff

[patch] file.diff

file.diff (text/plain), 4.50 KB, created by edwin on 2005-06-11 13:10:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: edwin

Created: 2005-06-11 13:10:19 UTC

Size: 4.50 KB

patch

obsolete

>Index: bsd.java.mk
>===================================================================
>RCS file: /home/pcvs/ports/Mk/bsd.java.mk,v
>retrieving revision 1.65
>diff -u -r1.65 bsd.java.mk
>--- bsd.java.mk	27 Feb 2005 23:49:33 -0000	1.65
>+++ bsd.java.mk	11 Jun 2005 12:03:18 -0000
>@@ -216,12 +216,7 @@
> _JAVA_OS_linux=		Linux
> 
> # Enforce preferred Java ports according to OS
>-.		if ${OSVERSION} >= 400000
> _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4
>-.		else
>-_JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1
>-.		endif
>-
> 
> # List all JDK ports
> __JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
>Index: bsd.port.mk
>===================================================================
>RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
>retrieving revision 1.512
>diff -u -r1.512 bsd.port.mk
>--- bsd.port.mk	9 Jun 2005 20:39:43 -0000	1.512
>+++ bsd.port.mk	11 Jun 2005 12:03:31 -0000
>@@ -1242,11 +1242,7 @@
> PERL_VERSION?=	5.6.0
> PERL_VER?=		5.6.0
> .else
>-.if ${OSVERSION} >= 300000
> PERL_VERSION?=	5.00503
>-.else
>-PERL_VERSION?=	5.00502
>-.endif
> PERL_VER?=		5.005
> .endif
> .endif
>@@ -1639,10 +1635,8 @@
> .endif
> 
> .if defined(USE_BISON)
>-.if ${OSVERSION} >= 400014
> BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
> .endif
>-.endif
> 
> PLIST_SUB+=		PERL_VERSION=${PERL_VERSION} \
> 				PERL_VER=${PERL_VER} \
>@@ -1842,13 +1836,8 @@
> # Special macro for doing in-place file editing using regexps
> .if defined(USE_REINPLACE)
> REINPLACE_ARGS?=	-i.bak
>-.if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 )
>-PATCH_DEPENDS+=	${LOCALBASE}/bin/sed_inplace:${PORTSDIR}/textproc/sed_inplace
>-REINPLACE_CMD?=	${LOCALBASE}/bin/sed_inplace ${REINPLACE_ARGS}
>-.else
> REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
> .endif
>-.endif
> 
> # Names of cookies used to skip already completed stages
> EXTRACT_COOKIE?=	${WRKDIR}/.extract_done.${PKGNAME}.${PREFIX:S/\//_/g}
>@@ -1895,13 +1884,8 @@
> .endif
> 
> .if exists(/usr/bin/fetch)
>-# avoid -A for 2.2 -- it's not ported to that branch
>-.if ${OSVERSION} < 300000
>-FETCH_CMD?=		/usr/bin/fetch
>-.else
> FETCH_CMD?=		/usr/bin/fetch -ARr
> FETCH_REGET?=	1
>-.endif
> .if ${OSVERSION} >= 480000 && !defined(DISABLE_SIZE)
> # Avoid -S for 4.7 and earlier since it causes fetch errors
> FETCH_BEFORE_ARGS+=	$${CKSIZE:+-S $$CKSIZE}
>@@ -2036,7 +2020,7 @@
> .undef NO_PACKAGE
> .endif
> 
>-COMMENTFILE?=		${PKGDIR}/pkg-comment
>+COMMENTFILE?=	${PKGDIR}/pkg-comment
> DESCR?=			${PKGDIR}/pkg-descr
> PLIST?=			${PKGDIR}/pkg-plist
> PKGINSTALL?=	${PKGDIR}/pkg-install
>@@ -2046,14 +2030,12 @@
> 
> TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
> 
>-.if ${OSVERSION} >= 400000
> .for _CATEGORY in ${CATEGORIES}
> PKGCATEGORY?=	${_CATEGORY}
> .endfor
> _PORTDIRNAME=	${.CURDIR:T}
> PORTDIRNAME?=	${_PORTDIRNAME}
> PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
>-.endif
> 
> .if exists(${LOCALBASE}/sbin/pkg_info)
> PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
>@@ -2061,13 +2043,6 @@
> PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
> PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
> PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
>-.elif ${OSVERSION} < 460102 && ${PKGORIGIN} != "sysutils/pkg_install"
>-BUILD_DEPENDS+=		${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/sysutils/pkg_install
>-PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
>-PKG_ADD?=		${LOCALBASE}/sbin/pkg_add
>-PKG_DELETE?=		${LOCALBASE}/sbin/pkg_delete
>-PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
>-PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
> .else
> PKG_CMD?=		/usr/sbin/pkg_create
> PKG_ADD?=		/usr/sbin/pkg_add
>@@ -2778,11 +2753,6 @@
> # Don't build a port if the system is too old.
> ################################################################
> 
>-.if ${OSVERSION} < 420000
>-# You need an upgrade kit or make world newer than this
>-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"
>-.endif
>-
> .if defined(ONLY_FOR_ARCHS)
> .for __ARCH in ${ONLY_FOR_ARCHS}
> .if ${MACHINE_ARCH:M${__ARCH}} != ""
>@@ -3028,10 +2998,6 @@
> 
> # Check if the port is listed in the vulnerability database
> 
>-.if ${PKGINSTALLVER} < 20040125 || ${OSVERSION} < 420001 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500014
>-DISABLE_VULNERABILITIES=	yes
>-.endif
>-
> AUDITFILE?=		/var/db/portaudit/auditfile.tbz
> _EXTRACT_AUDITFILE=	${TAR} -jxOf "${AUDITFILE}" auditfile
> 
>@@ -4607,11 +4573,7 @@
> # Print out package names.
> 
> package-depends:
>-.if ${OSVERSION} >= 460102 || exists(${LOCALBASE}/sbin/pkg_info)
> 	@${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}'
>-.else
>-	@${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1}'
>-.endif
> 
> # Build packages for port and dependencies

Actions: View | Diff

Attachments on bug 82138: 54285