sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid clobbering ${ARCH} variable for amd64 which resulted in this port

Browse source 
being unfechable as a dependency of another port. Introduce instead
COMPAT4X_ARCH which is the same as ARCH except on amd64 where it is "i386"
and replace relevant occurances of ARCH with it.
This also unbreaks ".if ${ARCH} == amd64" comparison that comes after ARCH
was modified to "i386" before.
While here, avoid installing ldconfig/compat4x for amd64 which only needs
ldconfig32/compat4x.

Unfetchability hinted at by:	pointyhat via kris
This commit is contained in:
Dejan Lesjak 2006-02-21 11:01:59 +00:00
parent a1d0923743
commit d8d7151ef8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=156575
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
misc/compat4x/Makefile
View file

@ -7,13 +7,13 @@
PORTNAME= compat4x
PORTVERSION= ${COMPAT4X_PORTVERSION}
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= ${COMPAT4X_MASTER_SITES}
MASTER_SITE_SUBDIR= ${COMPAT4X_MASTER_SITE_SUBDIR}
PKGNAMESUFFIX= -${ARCH}
PKGNAMESUFFIX= -${COMPAT4X_ARCH}
DISTFILES= ${COMPAT4X_DISTFILES}
DIST_SUBDIR= ${ARCH}/${PORTVERSION}
DIST_SUBDIR= ${COMPAT4X_ARCH}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A convenience package to install the compat4x libraries
@ -38,6 +38,8 @@ SUB_LIST+= LDCONFIG="${LDCONFIG}"
PLIST_SUB+= USE_LDCONFIG="@comment "
.endif
COMPAT4X_ARCH= ${ARCH}
.if ${OSVERSION} >= 600016
RUN_DEPENDS= ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
.endif
@ -49,8 +51,7 @@ PLIST_SUB+= LIBDIR="lib"
COMPAT4X_DISTFILES= ${PORTNAME}.aa \
${PORTNAME}.ab
.elif ${ARCH} == amd64
ARCH= i386
PKGNAMESUFFIX= -i386
COMPAT4X_ARCH= i386
TARGET_DIR= ${TARGET32_DIR}
PLIST_SUB+= LIBDIR="lib32"
COMPAT4X_DISTFILES= ${PORTNAME}.aa \
@ -80,19 +81,20 @@ IGNORE= unsupported architecture
.endif
.endif
.if ${ARCH} == i386
.if ${COMPAT4X_ARCH} == i386
PLIST_SUB+= I386_ONLY=""
.else
PLIST_SUB+= I386_ONLY="@comment "
.endif
.if ${ARCH} == amd64
PLIST_SUB+= AMD64_ONLY=""
PLIST_SUB+= AMD64_ONLY="" AMD64NA="@comment "
PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32"
.if defined(USE_RC_SUBR)
SUB_LIST+= AMD64="" TARGET32_DIR="${TARGET32_DIR}"
.endif
.else
PLIST_SUB+= AMD64_ONLY="@comment "
PLIST_SUB+= AMD64_ONLY="@comment " AMD64NA=""
.if defined(USE_RC_SUBR)
SUB_LIST+= AMD64="@comment "
.endif
@ -112,15 +114,15 @@ 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/%SUBDIR%/
COMPAT4X_MASTER_SITE_SUBDIR= snapshots/${ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}
COMPAT4X_MASTER_SITE_SUBDIR= snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}
.elif ${COMPAT4X_OSVERSION} == "5.3"
COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION}
COMPAT4X_MASTER_SITES= ${MASTER_SITE_LOCAL}
COMPAT4X_MASTER_SITE_SUBDIR= kris/${ARCH}
COMPAT4X_MASTER_SITE_SUBDIR= kris/${COMPAT4X_ARCH}
.else
COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION}
COMPAT4X_MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG}
COMPAT4X_MASTER_SITE_SUBDIR= releases/${ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PORTNAME}
COMPAT4X_MASTER_SITE_SUBDIR= releases/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PORTNAME}
.endif
do-extract:
@ -166,9 +168,10 @@ do-install:
post-install:
@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
.if defined(USE_LDCONFIG)
@${ECHO} ${USE_LDCONFIG} > ${PREFIX}/libdata/ldconfig/${UNIQUENAME}
.if ${ARCH} == amd64
@${ECHO} ${TARGET32_DIR} > ${PREFIX}/libdata/ldconfig32/${UNIQUENAME}
.else
@${ECHO} ${USE_LDCONFIG} > ${PREFIX}/libdata/ldconfig/${UNIQUENAME}
.endif
.else
@${CAT} ${PKGMESSAGE}

2
misc/compat4x/pkg-plist.freebsd5
View file

@ -37,7 +37,7 @@
%%LIBDIR%%/compat/pam_ssh.so
%%LIBDIR%%/compat/pam_tacplus.so
%%LIBDIR%%/compat/pam_unix.so
%%USE_LDCONFIG%%libdata/ldconfig/compat4x
%%USE_LDCONFIG%%%%AMD64NA%%libdata/ldconfig/compat4x
%%USE_LDCONFIG%%%%AMD64_ONLY%%libdata/ldconfig32/compat4x
%%AMD64_ONLY%%@exec %%LDCONFIG_LIB32%% -m %D/%%LIBDIR%%/compat
@dirrmtry %%LIBDIR%%/compat