diff options
| author | joerg <joerg> | 2006-04-28 09:08:32 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-04-28 09:08:32 +0000 |
| commit | e5448bd242d22e246b10b7e119efc3a9609c704a (patch) | |
| tree | a1136eb0dba8029923ae28e0ec908decbcf1134c | |
| parent | e58dbca9de6e52b33af022ffb86fd7d419ffecae (diff) | |
| download | pkgsrc-e5448bd242d22e246b10b7e119efc3a9609c704a.tar.gz | |
Add a mechanism to extend the rpm file list of suse9.1 packages.
Use it to include the shared library symlinks in suse91_x11,
they have been created and removed by ldconfig before. Bump revision.
| -rw-r--r-- | emulators/suse91_linux/Makefile.common | 5 | ||||
| -rw-r--r-- | emulators/suse91_x11/Makefile | 4 | ||||
| -rw-r--r-- | emulators/suse91_x11/PLIST_rpmfix.i386 | 14 |
3 files changed, 20 insertions, 3 deletions
diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common index a15549df5cc..e5f452e530c 100644 --- a/emulators/suse91_linux/Makefile.common +++ b/emulators/suse91_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2005/12/12 14:43:24 joerg Exp $ +# $NetBSD: Makefile.common,v 1.14 2006/04/28 09:08:32 joerg Exp $ .include "../../emulators/suse91_linux/vars.mk" .include "../../emulators/suse91_linux/arch.mk" @@ -60,6 +60,9 @@ do-install: ${RM} -f ${PLIST_SRC}; \ ${CP} ${PKGSRCDIR}/emulators/suse_linux/PLIST_dynamic ${PLIST_SRC} ; \ fi + @if [ -f ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} ]; then \ + ${SED} -e 's,^/,${EMULSUBDIR}/,' ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} >> ${PLIST_SRC}; \ + fi ${RPM2PKG} ${RPM2PKGARGS} @if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \ ${ECHO_MSG} "===> [Automatic Linux shared object handling]"; \ diff --git a/emulators/suse91_x11/Makefile b/emulators/suse91_x11/Makefile index 09a1777288c..73884dc5b3f 100644 --- a/emulators/suse91_x11/Makefile +++ b/emulators/suse91_x11/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:03 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/04/28 09:08:32 joerg Exp $ DISTNAME= suse_x11-${SUSE_VERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUSE91} DISTFILES= ${RPMFILES} diff --git a/emulators/suse91_x11/PLIST_rpmfix.i386 b/emulators/suse91_x11/PLIST_rpmfix.i386 new file mode 100644 index 00000000000..0aa20170dda --- /dev/null +++ b/emulators/suse91_x11/PLIST_rpmfix.i386 @@ -0,0 +1,14 @@ +@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 09:08:32 joerg Exp $ +/usr/X11R6/lib/libFS.so.6 +/usr/X11R6/lib/libGLw.so.1 +/usr/X11R6/lib/libI810XvMC.so.1 +/usr/X11R6/lib/libVncExt.so.2 +/usr/X11R6/lib/libXRes.so.1 +/usr/X11R6/lib/libXfontcache.so.1 +/usr/X11R6/lib/libXinerama.so.1 +/usr/X11R6/lib/libXss.so.1 +/usr/X11R6/lib/libXvMC.so.1 +/usr/X11R6/lib/libXxf86rush.so.1 +/usr/X11R6/lib/libfontenc.so.1 +/usr/X11R6/lib/libxkbfile.so.1 +/usr/X11R6/lib/libxkbui.so.1 |