[Midnightbsd-cvs] CVS Commit: misc/compat4x: Welcome back FreeBSD 4.x compatibility! We
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 16 20:30:40 EDT 2007
Log Message:
-----------
Welcome back FreeBSD 4.x compatibility! We missed you!
Since we don't have two cases, we'll just use pkg-plist.
The ldconfig steps are handled automatically according to ctriv (per compat5x commit) We'll do the same here.
Modified Files:
--------------
mports/misc/compat4x:
Makefile (r1.2 -> r1.3)
pkg-descr (r1.1 -> r1.2)
pkg-message (r1.1 -> r1.2)
Added Files:
-----------
mports/misc/compat4x:
pkg-plist (r1.1)
Removed Files:
-------------
mports/misc/compat4x:
pkg-plist.freebsd4
pkg-plist.freebsd5
-------------- next part --------------
Index: pkg-message
===================================================================
RCS file: /home/cvs/mports/misc/compat4x/pkg-message,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmisc/compat4x/pkg-message -Lmisc/compat4x/pkg-message -u -r1.1 -r1.2
--- misc/compat4x/pkg-message
+++ misc/compat4x/pkg-message
@@ -1,9 +1,2 @@
-*******************************************************************************
-* *
-* Do not forget to add COMPAT_FREEBSD4 into *
-* your kernel configuration (enabled by default). *
-* *
-* To configure and recompile your kernel see: *
-* http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html *
-* *
-*******************************************************************************
+ Do not forget to add COMPAT_FREEBSD4 into
+ your kernel configuration (enabled by default).
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/misc/compat4x/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmisc/compat4x/pkg-descr -Lmisc/compat4x/pkg-descr -u -r1.1 -r1.2
--- misc/compat4x/pkg-descr
+++ misc/compat4x/pkg-descr
@@ -6,7 +6,5 @@
--
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 500000
LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x
-.endif
--
--- /dev/null
+++ misc/compat4x/pkg-plist
@@ -0,0 +1,43 @@
+%%LIBDIR%%/compat/libc.so.4
+ at 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
+ at exec ln -sf %f %B/libc_r.so.4
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.1
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.2
+%%LIBDIR%%/compat/libdevstat.so.2
+%%LIBDIR%%/compat/libedit.so.3
+%%LIBDIR%%/compat/libfetch.so.2
+%%LIBDIR%%/compat/libgmp.so.3
+%%LIBDIR%%/compat/libhistory.so.4
+%%LIBDIR%%/compat/libm.so.2
+%%LIBDIR%%/compat/libmp.so.3
+%%LIBDIR%%/compat/libopie.so.2
+%%LIBDIR%%/compat/libpam.so.1
+%%LIBDIR%%/compat/libpcap.so.2
+ at 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
+ at exec ln -sf %f %B/libperl.so.3
+%%LIBDIR%%/compat/libposix1e.so.2
+%%LIBDIR%%/compat/libreadline.so.4
+%%LIBDIR%%/compat/libskey.so.2
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.1
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.2
+%%LIBDIR%%/compat/libstdc++.so.3
+%%LIBDIR%%/compat/libusb.so.0
+%%LIBDIR%%/compat/libusbhid.so.0
+%%I386_ONLY%%%%LIBDIR%%/compat/libutil.so.3
+%%I386_ONLY%%%%LIBDIR%%/compat/libvgl.so.2
+%%LIBDIR%%/compat/pam_cleartext_pass_ok.so
+%%LIBDIR%%/compat/pam_deny.so
+%%LIBDIR%%/compat/pam_opie.so
+%%LIBDIR%%/compat/pam_opieaccess.so
+%%LIBDIR%%/compat/pam_permit.so
+%%LIBDIR%%/compat/pam_radius.so
+%%LIBDIR%%/compat/pam_skey.so
+%%LIBDIR%%/compat/pam_ssh.so
+%%LIBDIR%%/compat/pam_tacplus.so
+%%LIBDIR%%/compat/pam_unix.so
+%%AMD64_ONLY%%@exec %%LDCONFIG_LIB32%% -m %D/%%LIBDIR%%/compat
+ at dirrmtry %%LIBDIR%%/compat
+ at comment Hardcode lib32 since we should not remove lib.
+ at dirrmtry lib32
--- misc/compat4x/pkg-plist.freebsd5
+++ /dev/null
@@ -1,43 +0,0 @@
-%%LIBDIR%%/compat/libc.so.4
- at 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
- at exec ln -sf %f %B/libc_r.so.4
-%%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.1
-%%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.2
-%%LIBDIR%%/compat/libdevstat.so.2
-%%LIBDIR%%/compat/libedit.so.3
-%%LIBDIR%%/compat/libfetch.so.2
-%%LIBDIR%%/compat/libgmp.so.3
-%%LIBDIR%%/compat/libhistory.so.4
-%%LIBDIR%%/compat/libm.so.2
-%%LIBDIR%%/compat/libmp.so.3
-%%LIBDIR%%/compat/libopie.so.2
-%%LIBDIR%%/compat/libpam.so.1
-%%LIBDIR%%/compat/libpcap.so.2
- at 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
- at exec ln -sf %f %B/libperl.so.3
-%%LIBDIR%%/compat/libposix1e.so.2
-%%LIBDIR%%/compat/libreadline.so.4
-%%LIBDIR%%/compat/libskey.so.2
-%%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.1
-%%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.2
-%%LIBDIR%%/compat/libstdc++.so.3
-%%LIBDIR%%/compat/libusb.so.0
-%%LIBDIR%%/compat/libusbhid.so.0
-%%I386_ONLY%%%%LIBDIR%%/compat/libutil.so.3
-%%I386_ONLY%%%%LIBDIR%%/compat/libvgl.so.2
-%%LIBDIR%%/compat/pam_cleartext_pass_ok.so
-%%LIBDIR%%/compat/pam_deny.so
-%%LIBDIR%%/compat/pam_opie.so
-%%LIBDIR%%/compat/pam_opieaccess.so
-%%LIBDIR%%/compat/pam_permit.so
-%%LIBDIR%%/compat/pam_radius.so
-%%LIBDIR%%/compat/pam_skey.so
-%%LIBDIR%%/compat/pam_ssh.so
-%%LIBDIR%%/compat/pam_tacplus.so
-%%LIBDIR%%/compat/pam_unix.so
-%%AMD64_ONLY%%@exec %%LDCONFIG_LIB32%% -m %D/%%LIBDIR%%/compat
- at dirrmtry %%LIBDIR%%/compat
- at comment Hardcode lib32 since we should not remove lib.
- at dirrmtry lib32
--- misc/compat4x/pkg-plist.freebsd4
+++ /dev/null
@@ -1,6 +0,0 @@
-%%FORBIDDEN:%%lib/compat/libcrypto.so.1
-%%FORBIDDEN:%%lib/compat/libcrypto.so.2
-lib/compat/libfetch.so.2
-%%FORBIDDEN:%%lib/compat/libssl.so.1
-%%FORBIDDEN:%%lib/compat/libssl.so.2
- at dirrmtry lib/compat
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/misc/compat4x/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmisc/compat4x/Makefile -Lmisc/compat4x/Makefile -u -r1.2 -r1.3
--- misc/compat4x/Makefile
+++ misc/compat4x/Makefile
@@ -8,7 +8,7 @@
PORTNAME= compat4x
PORTVERSION= ${COMPAT4X_PORTVERSION}
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= misc
MASTER_SITES= ${COMPAT4X_MASTER_SITES}
MASTER_SITE_SUBDIR= ${COMPAT4X_MASTER_SITE_SUBDIR}
@@ -21,8 +21,6 @@
WRKSRC= ${WRKDIR}/usr/lib/compat
-BROKEN= Does not make it past fake.
-
NO_BUILD= yes
USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/compat
@@ -35,13 +33,9 @@
COMPAT4X_ARCH= ${ARCH}
-.if ${OSVERSION} >= 600016
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
PLIST_SUB+= LIBDIR="lib"
COMPAT4X_DISTFILES= ${PORTNAME}.aa \
@@ -52,30 +46,9 @@
PLIST_SUB+= LIBDIR="lib32"
COMPAT4X_DISTFILES= ${PORTNAME}.aa \
${PORTNAME}.ab
-.elif ${ARCH} == alpha
-PLIST_SUB+= LIBDIR="lib"
-COMPAT4X_DISTFILES= ${PORTNAME}.aa \
- ${PORTNAME}.ab
.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=""
@@ -121,11 +94,9 @@
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}
@@ -135,19 +106,11 @@
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"
-post-install: install-ldconfig-file
-.if ${ARCH} == amd64
- ${LDCONFIG} -32 -m ${TARGET32_DIR}
-.endif
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.post.mk>
More information about the Midnightbsd-cvs
mailing list