Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Apr 2006 19:10:27 GMT
From:      "Alex Kozlov" <spam@rm-rf.kiev.ua>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/95467: Allow use USE_LDCONFIG mechanism in RELENG_6_1
Message-ID:  <200604071910.k37JARVw096181@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/95467; it has been noted by GNATS.

From: "Alex Kozlov" <spam@rm-rf.kiev.ua>
To: bug-followup@freebsd.org, pam@rm-rf.kiev.ua
Cc:  
Subject: Re: ports/95467: Allow use USE_LDCONFIG mechanism in RELENG_6_1
Date: Fri, 07 Apr 2006 22:06:03 +0400

 More correct patch.
 
 diff -u Makefile.orig Makefile
 --- Makefile.orig    Fri Apr  7 20:50:54 2006
 +++ Makefile    Fri Apr  7 21:28:27 2006
 @@ -11,7 +11,7 @@
 
   PORTNAME=  compat5x
   PORTVERSION=   5.4.0.8
 -PORTREVISION=  5
 +PORTREVISION=  6
   CATEGORIES=    misc
   MASTER_SITES=  ${MASTER_SITE_LOCAL}
   MASTER_SITE_SUBDIR=lesi/compat5x
 @@ -23,6 +23,7 @@
 
   ONLY_FOR_ARCHS=    alpha amd64 i386 sparc64
   USE_BZIP2= yes
 +NO_BUILD=  yes
   WRKSRC=        ${WRKDIR}/${PORTNAME}
   INSTALLS_SHLIB=    yes
   LDCONFIG_DIRS= %%PREFIX%%/lib/compat
 @@ -35,16 +36,14 @@
   IGNORE=    is for FreeBSD 6.x and newer
   .endif
 
 -.if ${OSVERSION} > 700011
   USE_LDCONFIG=  ${TARGET_DIR}
 -PLIST_SUB+=    USE_LDCONFIG=""
 -.else
 -NO_MTREE=  yes
 -USE_RC_SUBR=   000.${PORTNAME}.sh
 -SUB_LIST+= LDCONFIG="${LDCONFIG}"
 -PLIST_SUB+=    USE_LDCONFIG="@comment "
 +.if ${ARCH} == amd64
 +USE_LDCONFIG32=   ${TARGET32_DIR}
 +LDCONFIG_DIRS+=    %%PREFIX%%/lib32/compat
   .endif
 
 +.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 +
   .if ${OSVERSION} >= 600016
   RUN_DEPENDS=    
 ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
   .endif
 @@ -54,60 +53,33 @@
   .else
   PLIST_SUB+=    ALPHA="@comment "
   .endif
 +
   .if ${ARCH} == amd64
   PLIST_SUB+=    AMD64=""
 -PLIST_SUB+=    LDCONFIG_LIB32="${LDCONFIG} -32"
 -.if defined(USE_RC_SUBR)
 -SUB_LIST+= AMD64="" TARGET32_DIR="${TARGET32_DIR}"
 -.endif
   .else
   PLIST_SUB+=    AMD64="@comment "
 -.if defined(USE_RC_SUBR)
 -SUB_LIST+= AMD64="@comment "
 -.endif
   .endif
 +
   .if ${ARCH} == i386
   PLIST_SUB+=    I386=""
   .else
   PLIST_SUB+=    I386="@comment "
   .endif
 +
   .if ${ARCH} == sparc64
   PLIST_SUB+=    SPARC64=""
   .else
   PLIST_SUB+=    SPARC64="@comment "
   .endif
 
 -post-extract:
 -.if defined(USE_RC_SUBR)
 -   @( ${ECHO} ""; \
 -      ${ECHO} "******************************************************"; \
 -      ${ECHO} "To enable the ldconfig of these libraries at boot time"; \
 -      ${ECHO} "you need to add compat5x_enable=\"yes\" to either"; \
 -      ${ECHO} "/etc/rc.conf.local or /etc/rc.conf"; \
 -      ${ECHO} "******************************************************"; \
 -      ${ECHO} ""; ) > ${WRKDIR}/pkg-message
 -PKGMESSAGE=    ${WRKDIR}/pkg-message
 -.endif
 -
 -NO_BUILD=  yes
 -
   do-install:
      ${MKDIR} ${TARGET_DIR}
      (cd ${WRKSRC} && ${INSTALL_DATA} *.so.* ${TARGET_DIR})
   .if ${ARCH} == amd64
      ${MKDIR} ${TARGET32_DIR}
      (cd ${WRKSRC}/lib32 && ${INSTALL_DATA} *.so.* ${TARGET32_DIR})
 -   ${LDCONFIG} -32 -m ${TARGET32_DIR}
   .endif
 
 -post-install:
 -.if defined(USE_LDCONFIG)
 -   @${ECHO} ${USE_LDCONFIG} > ${PREFIX}/libdata/ldconfig/${UNIQUENAME}
 -.if ${ARCH} == amd64
 -   @${ECHO} ${TARGET32_DIR} > ${PREFIX}/libdata/ldconfig32/${UNIQUENAME}
 -.endif
 -.else
 -   @${CAT} ${PKGMESSAGE}
 -.endif
 +post-install: install-ldconfig-file
 
   .include <bsd.port.post.mk>
 
 
 diff -u pkg-plist.orig pkg-plist
 --- pkg-plist.orig   Fri Apr  7 21:06:56 2006
 +++ pkg-plist   Fri Apr  7 21:24:44 2006
 @@ -107,8 +107,6 @@
   lib/compat/snmp_atm.so.2
   lib/compat/snmp_mibII.so.2
   lib/compat/snmp_netgraph.so.2
 -%%USE_LDCONFIG%%libdata/ldconfig/compat5x
 -%%USE_LDCONFIG%%%%AMD64%%libdata/ldconfig32/compat5x
   %%AMD64%%lib32/compat/libalias.so.4
   %%AMD64%%lib32/compat/libarchive.so.1
   %%AMD64%%lib32/compat/libatm.so.2
 @@ -203,7 +201,6 @@
   %%AMD64%%lib32/compat/snmp_atm.so.2
   %%AMD64%%lib32/compat/snmp_mibII.so.2
   %%AMD64%%lib32/compat/snmp_netgraph.so.2
 -%%AMD64%%@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
   %%AMD64%%@dirrmtry lib32/compat
   %%AMD64%%@dirrmtry lib32
   @dirrmtry lib/compat
 
 
 -- 
 Adios



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604071910.k37JARVw096181>