Attachment #101604 for bug #141179

View | Details | Raw Unified | Return to bug 141179
Collapse All | Expand All

Lines 577-582 Link Here

(-)www/Makefile (+1 lines)
577	SUBDIR += npc	577	SUBDIR += npc
578	SUBDIR += nscache	578	SUBDIR += nscache
579	SUBDIR += nspluginwrapper	579	SUBDIR += nspluginwrapper
		580	SUBDIR += nspluginwrapper-devel
580	SUBDIR += ocaml-net	581	SUBDIR += ocaml-net
581	SUBDIR += ocsigen	582	SUBDIR += ocsigen
582	SUBDIR += ojs2	583	SUBDIR += ojs2

Lines 19-24 Link Here

(-)www/nspluginwrapper/Makefile (+2 lines)
19	EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm	19	EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
20	LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl	20	LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl
21		21
		22	CONFLICTS= nspluginwrapper-1.3.*
		23
22	RPMFILE= ${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm	24	RPMFILE= ${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
23		25
24	ONLY_FOR_ARCHS= i386 amd64	26	ONLY_FOR_ARCHS= i386 amd64

Lines 6-24 Link Here

(-)www/nspluginwrapper-devel/Makefile (-13 / +24 lines)
6	#	6	#
7		7
8	PORTNAME= nspluginwrapper	8	PORTNAME= nspluginwrapper
9	PORTVERSION= 1.2.2	9	PORTVERSION= 1.3.0
10	PORTREVISION= 4
11	CATEGORIES= www linux emulators	10	CATEGORIES= www linux emulators
12	MASTER_SITES= http://gwenole.beauchesne.info/projects/nspluginwrapper/files/	11	MASTER_SITES= http://gwenole.beauchesne.info/projects/nspluginwrapper/files/:hostsrc \
13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}	12	LOCAL/jkim:targetbin
		13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:hostsrc \
		14	${RPMFILE}:targetbin
14	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	15	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
15		16
16	MAINTAINER= malus.x@gmail.com	17	MAINTAINER= jkim@FreeBSD.org
17	COMMENT= A compatibility plugin for Netscape 4 (NPAPI) plugins	18	COMMENT= A compatibility plugin for Mozilla NPAPI (development version)
18		19
19	EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm	20	EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
20	LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl	21	LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl
21		22
		23	CONFLICTS= nspluginwrapper-1.2.*
		24
22	RPMFILE= ${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm	25	RPMFILE= ${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
23		26
24	ONLY_FOR_ARCHS= i386 amd64	27	ONLY_FOR_ARCHS= i386 amd64
Lines 41-59 Link Here
41		44
42	LIBDIR= ${PREFIX}/lib/${PORTNAME}	45	LIBDIR= ${PREFIX}/lib/${PORTNAME}
43		46
44	PLIST_SUB= LIBDIR="${LIBDIR:C/^${PREFIX}\///}" ARCH="${ARCH}"	47	PLIST_SUB= LIBDIR="${LIBDIR:C/^${PREFIX}\///}" HOST_ARCH="${HOST_ARCH}"
		48
		49	.include <bsd.port.pre.mk>
		50
		51	.if ${ARCH} == "amd64"
		52	HOST_ARCH= x86_64
		53	.else
		54	HOST_ARCH= ${ARCH}
		55	.endif
45		56
46	# We must manually extract, modify, and install the Linux version of npviewer.	57	# We must manually extract, modify, and install the Linux version of npviewer.
47	post-extract:	58	post-extract:
48	cd ${WRKSRC} && rpm2cpio ${DISTDIR}/${RPMFILE} \| ${CPIO} -id	59	cd ${WRKSRC} && rpm2cpio ${DISTDIR}/${RPMFILE} \| ${CPIO} -id
49	${REINPLACE_CMD} -e 's\|/usr\|${PREFIX}\|' \	60	${REINPLACE_CMD} -e 's\|/usr\|${PREFIX}\|' \
50	${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer	61	${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer
51	${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.bak	62	@${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.bak
52		63
53	post-patch:	64	post-patch:
54	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \	65	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
55	${WRKSRC}/src/npw-config.c	66	${WRKSRC}/src/npw-config.c
56	${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.orig	67	@${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.orig
57		68
58	post-install:	69	post-install:
59	${MKDIR} ${LIBDIR}/i386/linux	70	${MKDIR} ${LIBDIR}/i386/linux
Lines 61-64 Link Here
61	${LIBDIR}/i386/linux/	72	${LIBDIR}/i386/linux/
62	@${CAT} ${PKGMESSAGE}	73	@${CAT} ${PKGMESSAGE}
63		74
64	.include <bsd.port.mk>	75	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)www/nspluginwrapper-devel/distinfo (-6 / +6 lines)
1	MD5 (nspluginwrapper-1.2.2.tar.bz2) = 197e3439aa7136addb88972e48c2fe4a	1	MD5 (nspluginwrapper-1.3.0.tar.bz2) = 188f77bd3427c131ccba4bfdb25892a9
2	SHA256 (nspluginwrapper-1.2.2.tar.bz2) = 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3	2	SHA256 (nspluginwrapper-1.3.0.tar.bz2) = b8900bd5f0bd950f95b963e5c8f5e20d7d15cc70e777b6058289687ad968b21c
3	SIZE (nspluginwrapper-1.2.2.tar.bz2) = 327947	3	SIZE (nspluginwrapper-1.3.0.tar.bz2) = 336049
4	MD5 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = a7c7d46d0ae887a0fab6cd14348c36aa	4	MD5 (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = 5363d7c27bbd967f2609c3bcbe70bc61
5	SHA256 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = c9572430351b716ca1c63170150981cfc8546f0cb7e03c7a75f1d0687db99e6f	5	SHA256 (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = d8868156e9906badc83aeb0971768d3bbc13807e2deefc4c10da3b231c3fab5c
6	SIZE (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425	6	SIZE (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = 73324




bin/nspluginplayer
bin/nspluginwrapper
%%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.sh
@dirrm %%LIBDIR%%/noarch
@dirrm %%LIBDIR%%/i386/linux
@dirrm %%LIBDIR%%/%%HOST_ARCH%%/freebsd
@dirrm %%LIBDIR%%/i386
@dirrmtry %%LIBDIR%%/%%HOST_ARCH%%
@dirrm %%LIBDIR%%




 
 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

Return to bug 141179

Lines 1-16 Link Here

(-)www/nspluginwrapper-devel/pkg-plist (-6 / +6 lines)
1	bin/nspluginplayer	1	bin/nspluginplayer
2	bin/nspluginwrapper	2	bin/nspluginwrapper
3	%%LIBDIR%%/%%ARCH%%/freebsd/npconfig	3	%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npconfig
4	%%LIBDIR%%/%%ARCH%%/freebsd/npplayer	4	%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npplayer
5	%%LIBDIR%%/%%ARCH%%/freebsd/npwrapper.so	5	%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npwrapper.so
6	%%LIBDIR%%/i386/linux/libnoxshm.so	6	%%LIBDIR%%/i386/linux/libnoxshm.so
7	%%LIBDIR%%/i386/linux/libxpcom.so	7	%%LIBDIR%%/i386/linux/libxpcom.so
8	%%LIBDIR%%/i386/linux/npviewer	8	%%LIBDIR%%/i386/linux/npviewer
9	%%LIBDIR%%/i386/linux/npviewer.bin	9	%%LIBDIR%%/i386/linux/npviewer.bin
10	%%LIBDIR%%/noarch/npviewer	10	%%LIBDIR%%/noarch/npviewer.sh
11	@dirrm %%LIBDIR%%/noarch	11	@dirrm %%LIBDIR%%/noarch
12	@dirrm %%LIBDIR%%/i386/linux	12	@dirrm %%LIBDIR%%/i386/linux
13	@dirrm %%LIBDIR%%/%%ARCH%%/freebsd	13	@dirrm %%LIBDIR%%/%%HOST_ARCH%%/freebsd
14	@dirrm %%LIBDIR%%/i386	14	@dirrm %%LIBDIR%%/i386
15	@dirrmtry %%LIBDIR%%/%%ARCH%%	15	@dirrmtry %%LIBDIR%%/%%HOST_ARCH%%
16	@dirrm %%LIBDIR%%	16	@dirrm %%LIBDIR%%

Lines 16-27 Link Here

(-)www/nspluginwrapper-devel/files/patch-configure (-9 lines)
16		16
17	TMPC="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.c"	17	TMPC="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.c"
18	TMPO="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.o"	18	TMPO="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.o"
19	@@ -728,7 +723,7 @@
20	elif test "$host_cpu" = "x86_64" ; then
21	echo "ARCH=x86_64" >> $config_mak
22	echo "#define HOST_X86_64 1" >> $config_h
23	- echo "#define HOST_ARCH \"x86_64\"" >> $config_h
24	+ echo "#define HOST_ARCH \"amd64\"" >> $config_h
25	elif test "$host_cpu" = "ppc" ; then
26	echo "ARCH=ppc" >> $config_mak
27	echo "#define HOST_PPC 1" >> $config_h