Date: Thu, 8 Oct 2015 13:25:59 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398822 - head/misc/compat4x Message-ID: <201510081325.t98DPxZG059130@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Oct 8 13:25:59 2015 New Revision: 398822 URL: https://svnweb.freebsd.org/changeset/ports/398822 Log: - Remove obsolete logic used to coexist with compat3x, fix stage-qa PR: 203272 Approved by: mat Modified: head/misc/compat4x/Makefile head/misc/compat4x/pkg-plist.freebsd5 Modified: head/misc/compat4x/Makefile ============================================================================== --- head/misc/compat4x/Makefile Thu Oct 8 13:19:42 2015 (r398821) +++ head/misc/compat4x/Makefile Thu Oct 8 13:25:59 2015 (r398822) @@ -3,7 +3,7 @@ PORTNAME= compat4x PORTVERSION= ${COMPAT4X_PORTVERSION} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= misc MASTER_SITES= ${COMPAT4X_MASTER_SITES} PKGNAMESUFFIX= -${COMPAT4X_ARCH} @@ -64,8 +64,6 @@ PLIST_SUB+= FORBIDDEN:="" PLIST_SUB+= FORBIDDEN:="@comment " .endif -FREEBSD4_LIBS= libc_r.so.4 libperl.so.3 - .if defined(COMPAT4X_OSRELDATE) && !empty(COMPAT4X_OSRELDATE) COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE} COMPAT4X_MASTER_SITES= ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}/ @@ -77,9 +75,6 @@ COMPAT4X_MASTER_SITES= LOCAL/kris/${COMP do-extract: @${MKDIR} ${WRKDIR} @(cd ${DISTDIR}/${DIST_SUBDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR} ) -.for lib in ${FREEBSD4_LIBS} - @${MV} ${WRKSRC}/${lib} ${WRKSRC}/${lib}.compat4x -.endfor .if !defined(FORCE_VULNERABLE_OPENSSL) .for lib in ${OPENSSL_LIBS} @${RM} -f ${WRKSRC}/${lib} @@ -89,9 +84,6 @@ do-extract: do-install: @${MKDIR} ${STAGEDIR}${TARGET_DIR} ${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${TARGET_DIR}/ -.for lib in ${FREEBSD4_LIBS} - ${LN} -sf ${lib}.compat4x ${STAGEDIR}${TARGET_DIR}/${lib} -.endfor pre-clean: @[ -w ${WRKDIR}/var ] && chflags -R noschg ${WRKDIR}/var || ${TRUE} Modified: head/misc/compat4x/pkg-plist.freebsd5 ============================================================================== --- head/misc/compat4x/pkg-plist.freebsd5 Thu Oct 8 13:19:42 2015 (r398821) +++ head/misc/compat4x/pkg-plist.freebsd5 Thu Oct 8 13:25:59 2015 (r398822) @@ -1,7 +1,5 @@ %%LIBDIR%%/compat/libc.so.4 -@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi -%%LIBDIR%%/compat/libc_r.so.4.compat4x -@exec ln -sf %f %B/libc_r.so.4 +%%LIBDIR%%/compat/libc_r.so.4 %%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.1 %%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.2 %%LIBDIR%%/compat/libdevstat.so.2 @@ -14,9 +12,7 @@ %%LIBDIR%%/compat/libopie.so.2 %%LIBDIR%%/compat/libpam.so.1 %%LIBDIR%%/compat/libpcap.so.2 -@unexec if [ -e %B/libperl.so.3.compat3x ]; then ln -sf libperl.so.3.compat3x %B/libperl.so.3; else rm %B/libperl.so.3; fi -%%LIBDIR%%/compat/libperl.so.3.compat4x -@exec ln -sf %f %B/libperl.so.3 +%%LIBDIR%%/compat/libperl.so.3 %%LIBDIR%%/compat/libposix1e.so.2 %%LIBDIR%%/compat/libreadline.so.4 %%LIBDIR%%/compat/libskey.so.2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510081325.t98DPxZG059130>