diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-08 13:25:59 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-08 13:25:59 +0000 |
| commit | 26444dae35e399069fed4f5bf65f6b5218cea024 (patch) | |
| tree | 74a5e2f20db239fdca57dc1877b3d09c96445b1c /misc/compat4x | |
| parent | efe60d6b899c0ef6bf5891ac772f62d51cc235d9 (diff) | |
| download | ports-26444dae35e399069fed4f5bf65f6b5218cea024.tar.gz ports-26444dae35e399069fed4f5bf65f6b5218cea024.zip | |
- Remove obsolete logic used to coexist with compat3x, fix stage-qa
PR: 203272
Approved by: mat
Notes
Notes:
svn path=/head/; revision=398822
Diffstat (limited to 'misc/compat4x')
| -rw-r--r-- | misc/compat4x/Makefile | 10 | ||||
| -rw-r--r-- | misc/compat4x/pkg-plist.freebsd5 | 8 |
2 files changed, 3 insertions, 15 deletions
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile index 1b2b09ef727a..6a027e78e1be 100644 --- a/misc/compat4x/Makefile +++ b/misc/compat4x/Makefile @@ -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/${COMPAT4X_ARCH} 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} diff --git a/misc/compat4x/pkg-plist.freebsd5 b/misc/compat4x/pkg-plist.freebsd5 index 791340e01fae..c5b6b62ca4c3 100644 --- a/misc/compat4x/pkg-plist.freebsd5 +++ b/misc/compat4x/pkg-plist.freebsd5 @@ -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 |