diff options
author | shattered <shattered@pkgsrc.org> | 2012-02-07 09:43:24 +0000 |
---|---|---|
committer | shattered <shattered@pkgsrc.org> | 2012-02-07 09:43:24 +0000 |
commit | 7d54d90ed3a3e8b3c20a306c29c70828ea706102 (patch) | |
tree | 7b57fecfb9d5b0089424ebeb37e41ae8ebe55fe2 /multimedia | |
parent | 2e4974db0bb2aee2931a045eae5a486bd728ca8e (diff) | |
download | pkgsrc-7d54d90ed3a3e8b3c20a306c29c70828ea706102.tar.gz |
Resolve file conflict with suse113_gtk2.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/libflashsupport-pulse/Makefile | 7 | ||||
-rw-r--r-- | multimedia/libflashsupport-pulse/PLIST | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/multimedia/libflashsupport-pulse/Makefile b/multimedia/libflashsupport-pulse/Makefile index a703c500181..a5891c1a334 100644 --- a/multimedia/libflashsupport-pulse/Makefile +++ b/multimedia/libflashsupport-pulse/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2009/03/18 13:29:32 jmcneill Exp $ +# $NetBSD: Makefile,v 1.3 2012/02/07 09:43:24 shattered Exp $ DISTNAME= libflashsupport-pulse-20081219 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.invisible.ca/~jmcneill/netbsd/libflashsupport/ @@ -22,10 +23,6 @@ BUILD_DIRS= # empty INSTALLATION_DIRS= ${EMULSUBDIR}/usr/lib do-install: - ${INSTALL_LIB} ${WRKDIR}/usr/lib/libgdbm.so.3.0.0 \ - ${DESTDIR}${PREFIX}/${EMULSUBDIR}/usr/lib/libgdbm.so.3 - ${INSTALL_LIB} ${WRKDIR}/usr/lib/libpulse.so.0.7.0 \ - ${DESTDIR}${PREFIX}/${EMULSUBDIR}/usr/lib/libpulse.so.0 ${INSTALL_LIB} ${WRKDIR}/usr/lib/libflashsupport.so \ ${DESTDIR}${PREFIX}/${EMULSUBDIR}/usr/lib diff --git a/multimedia/libflashsupport-pulse/PLIST b/multimedia/libflashsupport-pulse/PLIST index 0c8c1936b59..8c52bfc03fa 100644 --- a/multimedia/libflashsupport-pulse/PLIST +++ b/multimedia/libflashsupport-pulse/PLIST @@ -1,4 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/19 19:49:22 jmcneill Exp $ -${EMULSUBDIRSLASH}usr/lib/libpulse.so.0 -${EMULSUBDIRSLASH}usr/lib/libgdbm.so.3 +@comment $NetBSD: PLIST,v 1.2 2012/02/07 09:43:24 shattered Exp $ ${EMULSUBDIRSLASH}usr/lib/libflashsupport.so |