From 2df76eb0a73bb59d817aa60758a5f10e3e544c3b Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Tue, 30 Jan 2007 10:25:34 +0000
Subject: - Remove support for a.out format and PORTOBJFORMAT variable from
 individual   ports

With hat:	portmgr
---
 java/jdk11/Makefile | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'java/jdk11')

diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index 10822eeb7943..ddc5b2636c9c 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	${JDK_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nate/JDK1.1
+DISTFILES=	jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Java Development Kit 1.1
 
+LIB_DEPENDS=	c.3:${PORTSDIR}/misc/compat3x
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 NO_CDROM=	"License doesn't allow distribution with fee"
@@ -26,15 +28,6 @@ PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
 WRKSRC=		${WRKDIR}/jdk${JDK_VERSION}
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-DISTFILES=	jdk${JDK_VERSION}_AOUT.V1999-11-9.tar.gz
-.else
-LIB_DEPENDS+=	c.3:${PORTSDIR}/misc/compat3x
-DISTFILES=	jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz
-.endif
-
 post-patch:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 
@@ -48,4 +41,4 @@ do-install:
 post-install:
 	${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # JDK${JDK_VERSION}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
-- 
cgit v1.2.3