Attachment 101604 Details for Bug 141179 – nspluginwrapper.diff

[patch] nspluginwrapper.diff

nspluginwrapper.diff (text/x-diff; charset="iso-8859-1"), 5.50 KB, created by Jung-uk Kim on 2009-12-05 00:05:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2009-12-05 00:05:31 UTC

Size: 5.50 KB

patch

obsolete

>--- www/Makefile	30 Nov 2009 14:14:30 -0000	1.2477
>+++ www/Makefile	30 Nov 2009 22:19:36 -0000
>@@ -577,6 +577,7 @@
>     SUBDIR += npc
>     SUBDIR += nscache
>     SUBDIR += nspluginwrapper
>+    SUBDIR += nspluginwrapper-devel
>     SUBDIR += ocaml-net
>     SUBDIR += ocsigen
>     SUBDIR += ojs2
>--- www/nspluginwrapper/Makefile	6 Aug 2009 15:59:17 -0000	1.15
>+++ www/nspluginwrapper/Makefile	30 Nov 2009 22:19:36 -0000
>@@ -19,6 +19,8 @@
> EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
> LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
> 
>+CONFLICTS=	nspluginwrapper-1.3.*
>+
> RPMFILE=	${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
> 
> ONLY_FOR_ARCHS=	i386 amd64
>--- www/nspluginwrapper-devel/Makefile	6 Aug 2009 15:59:17 -0000	1.15
>+++ www/nspluginwrapper-devel/Makefile	30 Nov 2009 22:19:36 -0000
>@@ -6,19 +6,22 @@
> #
> 
> PORTNAME=	nspluginwrapper
>-PORTVERSION=	1.2.2
>-PORTREVISION=	4
>+PORTVERSION=	1.3.0
> CATEGORIES=	www linux emulators
>-MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
>+MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/:hostsrc \
>+		LOCAL/jkim:targetbin
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:hostsrc \
>+		${RPMFILE}:targetbin
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
>-MAINTAINER=	malus.x@gmail.com
>-COMMENT=	A compatibility plugin for Netscape 4 (NPAPI) plugins
>+MAINTAINER=	jkim@FreeBSD.org
>+COMMENT=	A compatibility plugin for Mozilla NPAPI (development version)
> 
> EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
> LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
> 
>+CONFLICTS=	nspluginwrapper-1.2.*
>+
> RPMFILE=	${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
> 
> ONLY_FOR_ARCHS=	i386 amd64
>@@ -41,19 +44,27 @@
> 
> LIBDIR=		${PREFIX}/lib/${PORTNAME}
> 
>-PLIST_SUB=	LIBDIR="${LIBDIR:C/^${PREFIX}\///}" ARCH="${ARCH}"
>+PLIST_SUB=	LIBDIR="${LIBDIR:C/^${PREFIX}\///}" HOST_ARCH="${HOST_ARCH}"
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == "amd64"
>+HOST_ARCH=	x86_64
>+.else
>+HOST_ARCH=	${ARCH}
>+.endif
> 
> # We must manually extract, modify, and install the Linux version of npviewer.
> post-extract:
> 	cd ${WRKSRC} &&	rpm2cpio ${DISTDIR}/${RPMFILE} | ${CPIO} -id
> 	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
>-		${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer
>-	${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.bak
>+	    ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer
>+	@${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.bak
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
>-		${WRKSRC}/src/npw-config.c
>-	${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.orig
>+	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
>+	    ${WRKSRC}/src/npw-config.c
>+	@${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.orig
> 
> post-install:
> 	${MKDIR} ${LIBDIR}/i386/linux
>@@ -61,4 +72,4 @@
> 	     ${LIBDIR}/i386/linux/
> 	@${CAT} ${PKGMESSAGE}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>--- www/nspluginwrapper-devel/distinfo	8 Jan 2009 19:19:24 -0000	1.5
>+++ www/nspluginwrapper-devel/distinfo	30 Nov 2009 22:19:36 -0000
>@@ -1,6 +1,6 @@
>-MD5 (nspluginwrapper-1.2.2.tar.bz2) = 197e3439aa7136addb88972e48c2fe4a
>-SHA256 (nspluginwrapper-1.2.2.tar.bz2) = 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3
>-SIZE (nspluginwrapper-1.2.2.tar.bz2) = 327947
>-MD5 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = a7c7d46d0ae887a0fab6cd14348c36aa
>-SHA256 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = c9572430351b716ca1c63170150981cfc8546f0cb7e03c7a75f1d0687db99e6f
>-SIZE (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425
>+MD5 (nspluginwrapper-1.3.0.tar.bz2) = 188f77bd3427c131ccba4bfdb25892a9
>+SHA256 (nspluginwrapper-1.3.0.tar.bz2) = b8900bd5f0bd950f95b963e5c8f5e20d7d15cc70e777b6058289687ad968b21c
>+SIZE (nspluginwrapper-1.3.0.tar.bz2) = 336049
>+MD5 (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = 5363d7c27bbd967f2609c3bcbe70bc61
>+SHA256 (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = d8868156e9906badc83aeb0971768d3bbc13807e2deefc4c10da3b231c3fab5c
>+SIZE (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = 73324
>--- www/nspluginwrapper-devel/pkg-plist	8 Jan 2009 19:19:24 -0000	1.2
>+++ www/nspluginwrapper-devel/pkg-plist	30 Nov 2009 22:19:36 -0000
>@@ -1,16 +1,16 @@
> bin/nspluginplayer
> bin/nspluginwrapper
>-%%LIBDIR%%/%%ARCH%%/freebsd/npconfig
>-%%LIBDIR%%/%%ARCH%%/freebsd/npplayer
>-%%LIBDIR%%/%%ARCH%%/freebsd/npwrapper.so
>+%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npconfig
>+%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npplayer
>+%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npwrapper.so
> %%LIBDIR%%/i386/linux/libnoxshm.so
> %%LIBDIR%%/i386/linux/libxpcom.so
> %%LIBDIR%%/i386/linux/npviewer
> %%LIBDIR%%/i386/linux/npviewer.bin
>-%%LIBDIR%%/noarch/npviewer
>+%%LIBDIR%%/noarch/npviewer.sh
> @dirrm %%LIBDIR%%/noarch
> @dirrm %%LIBDIR%%/i386/linux
>-@dirrm %%LIBDIR%%/%%ARCH%%/freebsd
>+@dirrm %%LIBDIR%%/%%HOST_ARCH%%/freebsd
> @dirrm %%LIBDIR%%/i386
>-@dirrmtry %%LIBDIR%%/%%ARCH%%
>+@dirrmtry %%LIBDIR%%/%%HOST_ARCH%%
> @dirrm %%LIBDIR%%
>--- www/nspluginwrapper-devel/files/patch-configure	9 Jan 2009 08:31:01 -0000	1.3
>+++ www/nspluginwrapper-devel/files/patch-configure	30 Nov 2009 22:19:36 -0000
>@@ -16,12 +16,3 @@
>  
>  TMPC="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.c"
>  TMPO="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.o"
>-@@ -728,7 +723,7 @@
>- elif test "$host_cpu" = "x86_64" ; then
>-     echo "ARCH=x86_64" >> $config_mak
>-     echo "#define HOST_X86_64 1" >> $config_h
>--    echo "#define HOST_ARCH \"x86_64\"" >> $config_h
>-+    echo "#define HOST_ARCH \"amd64\"" >> $config_h
>- elif test "$host_cpu" = "ppc" ; then
>-     echo "ARCH=ppc" >> $config_mak
>-     echo "#define HOST_PPC 1" >> $config_h

Actions: View | Diff

Attachments on bug 141179: 101604