From 95e1b4adc3c217295ee0fb10edc368df8849ce34 Mon Sep 17 00:00:00 2001 From: edwin Date: Thu, 4 Oct 2007 01:53:45 +0000 Subject: Remove always-false/true conditions based on OSVERSION 500000 --- misc/compat4x/Makefile | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'misc/compat4x') diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile index 3bfcf57a41db..752ba4554ac2 100644 --- a/misc/compat4x/Makefile +++ b/misc/compat4x/Makefile @@ -36,7 +36,6 @@ COMPAT4X_ARCH= ${ARCH} RUN_DEPENDS+= ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata .endif -.if ${OSVERSION} >= 500000 COMPAT4X_OSVERSION= 5.3 PLIST= ${.CURDIR}/pkg-plist.freebsd5 .if ${ARCH} == i386 @@ -56,23 +55,6 @@ COMPAT4X_DISTFILES= ${PORTNAME}.aa \ .else IGNORE= in unsupported (FreeBSD 4.x did not run on this architecture) .endif -.else -COMPAT4X_OSVERSION= 4.10 -PLIST= ${.CURDIR}/pkg-plist.freebsd4 -.if ${ARCH} == i386 -COMPAT4X_DISTFILES= ${PORTNAME}.aa \ - ${PORTNAME}.ab \ - ${PORTNAME}.ac \ - ${PORTNAME}.ad -.elif ${ARCH} == alpha -COMPAT4X_DISTFILES= ${PORTNAME}.aa \ - ${PORTNAME}.ab \ - ${PORTNAME}.ac \ - ${PORTNAME}.ad -.else -IGNORE= unsupported architecture -.endif -.endif .if ${COMPAT4X_ARCH} == i386 PLIST_SUB+= I386_ONLY="" @@ -105,24 +87,18 @@ FREEBSD4_LIBS= libc_r.so.4 libperl.so.3 COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE} COMPAT4X_MASTER_SITES= ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ COMPAT4X_MASTER_SITE_SUBDIR= snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME} -.elif ${COMPAT4X_OSVERSION} == "5.3" +.else ${COMPAT4X_OSVERSION} == "5.3" COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION} COMPAT4X_MASTER_SITES= ${MASTER_SITE_LOCAL} COMPAT4X_MASTER_SITE_SUBDIR= kris/${COMPAT4X_ARCH} -.else -COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION} -COMPAT4X_MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} -COMPAT4X_MASTER_SITE_SUBDIR= releases/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PORTNAME} .endif do-extract: @${MKDIR} ${WRKDIR} @(cd ${DISTDIR}/${DIST_SUBDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR} ) -.if ${OSVERSION} >= 500000 .for lib in ${FREEBSD4_LIBS} @${MV} ${WRKSRC}/${lib} ${WRKSRC}/${lib}.compat4x .endfor -.endif .if !defined(FORCE_VULNERABLE_OPENSSL) .for lib in ${OPENSSL_LIBS} @${RM} -f ${WRKSRC}/${lib} @@ -132,11 +108,9 @@ do-extract: do-install: @${MKDIR} ${TARGET_DIR} ${INSTALL_DATA} ${WRKSRC}/* ${TARGET_DIR}/ -.if ${OSVERSION} >= 500000 .for lib in ${FREEBSD4_LIBS} ${LN} -sf ${lib}.compat4x ${TARGET_DIR}/${lib} .endfor -.endif # Include to automatic install file in libdata/ldconfig{,32} .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" -- cgit