Attachment #80815 for bug #115849

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




#

PORTNAME=		resin
PORTVERSION=		3.1.2
PORTREVISION=	1
CATEGORIES=		www java
MASTER_SITES=		http://www.caucho.com/download/


			${WRKSRC}/conf/resin.conf \
			${FILESDIR}/resinctl \
			${FILESDIR}/resin.sh.in
COPYDIRS=		lib libexec webapps

.include <bsd.port.pre.mk>

.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
COPYDIRS=		lib libexec64 webapps
CFLAGS+=		-fPIC
CONFIGURE_ARGS+=	--enable-64bit
RESIN_LIBEXEC=		libexec64
.else
COPYDIRS=		lib libexec webapps
RESIN_LIBEXEC=		libexec
.endif

# Pass JAVA_HOME as determined by bsd.java.mk
CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
			--with-openssl-lib=${OPENSSLLIB} \


PLIST_SUB+=		APP_NAME=${APP_NAME}
PLIST_SUB+=		APXS=${APXS}
PLIST_SUB+=		RESIN_LIBEXEC=${RESIN_LIBEXEC}

SUBSTITUTIONS=		-e "s|%%APP_HOME%%|${APP_HOME}|g" \
			-e "s|%%APP_NAME%%|${APP_NAME}|g" \

			-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
			-e "s|%%WRKDIR%%|${WRKDIR}|g" \
			-e "s|%%WRKSRC%%|${WRKSRC}|g"

# Avoid build error on 64-bit architectures
.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
CFLAGS+=	-fPIC
.endif

post-patch:
	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES}

Lines 1-3 Link Here

(-)/usr/ports/www/resin3/distinfo (-3 / +3 lines)
1	MD5 (resin-3.1.0.tar.gz) = ed16e0645adbef9c6ba69f4e4b881b44	1	MD5 (resin-3.1.2.tar.gz) = 2887635b1c7939689e4ed2e817a85725
2	SHA256 (resin-3.1.0.tar.gz) = 1eb207d20db0af81b150ed3f40f1f21ffc26cb19b21cb8a545095818175ff5a0	2	SHA256 (resin-3.1.2.tar.gz) = 65f4e254c2169bd6167f4916d96429572a0e3b60c26f13805981316081bd683a
3	SIZE (resin-3.1.0.tar.gz) = 13065031	3	SIZE (resin-3.1.2.tar.gz) = 10768781

Line 0 Link Here

(-)/usr/ports/www/resin3/files/patch-modules-c-src-common-Makefile.in (+11 lines)
	1	--- modules/c/src/common/Makefile.in.orig 2007-07-17 18:37:16.000000000 +0000
	2	+++ modules/c/src/common/Makefile.in 2007-08-27 04:04:48.776074307 +0000
	3	@@ -13,7 +13,7 @@
	4	OBJ_PICS=stream.lo config.lo memory.lo
	5	INCLUDES=@INCLUDES@
	6
	7	-all : common.o $(OBJ_PICS)
	8	+all : $(OBJ) $(OBJ_PICS)
	9
	10	common.o : $(OBJ)
	11	$(LD) -r -o $@ $(OBJ)




%%APP_NAME%%/lib/j2ee-management-10.jar
%%APP_NAME%%/lib/javamail-14.jar
%%APP_NAME%%/lib/jaxb-api.jar
%%APP_NAME%%/lib/jaxb-impl.jar
%%APP_NAME%%/lib/jaxb-xjc.jar
%%APP_NAME%%/lib/jaxb1-impl.jar
%%APP_NAME%%/lib/jaxrpc-15.jar
%%APP_NAME%%/lib/jca-15.jar
%%APP_NAME%%/lib/jms-11.jar

%%APP_NAME%%/lib/webutil.jar
%%APP_NAME%%/webapps/ROOT/index.jsp
%%APP_NAME%%/webapps/resin-doc.war
%%APP_NAME%%/%%RESIN_LIBEXEC%%/libresin_os.so
etc/%%APP_NAME%%/app-default.xml
etc/rc.d/%%APP_NAME%%.sh
sbin/%%APP_NAME%%ctl

@dirrm %%APP_NAME%%/lib
@dirrm %%APP_NAME%%/webapps/ROOT
@dirrm %%APP_NAME%%/webapps
@dirrm %%APP_NAME%%/%%RESIN_LIBEXEC%%
@dirrm %%APP_NAME%%
@unexec if cmp -s %D/etc/%%APP_NAME%%/resin.xml %D/etc/%%APP_NAME%%/resin.xml-dist; then rm -f %D/etc/%%APP_NAME%%/resin.xml ; else echo If permanently deleting this package, %D/etc/%%APP_NAME%%/resin.xml must be removed manually; fi
etc/%%APP_NAME%%/resin.xml-dist

Return to bug 115849

Lines 6-13 Link Here

(-)/usr/ports/www/resin3/Makefile (-8 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= resin	8	PORTNAME= resin
9	PORTVERSION= 3.1.0	9	PORTVERSION= 3.1.2
10	PORTREVISION= 1
11	CATEGORIES= www java	10	CATEGORIES= www java
12	MASTER_SITES= http://www.caucho.com/download/	11	MASTER_SITES= http://www.caucho.com/download/
13		12
Lines 53-62 Link Here
53	${WRKSRC}/conf/resin.conf \	52	${WRKSRC}/conf/resin.conf \
54	${FILESDIR}/resinctl \	53	${FILESDIR}/resinctl \
55	${FILESDIR}/resin.sh.in	54	${FILESDIR}/resin.sh.in
56	COPYDIRS= lib libexec webapps
57		55
58	.include <bsd.port.pre.mk>	56	.include <bsd.port.pre.mk>
59		57
		58	.if (${ARCH} == "amd64") \|\| (${ARCH} == "ia64") \|\| (${ARCH} == "sparc64")
		59	COPYDIRS= lib libexec64 webapps
		60	CFLAGS+= -fPIC
		61	CONFIGURE_ARGS+= --enable-64bit
		62	RESIN_LIBEXEC= libexec64
		63	.else
		64	COPYDIRS= lib libexec webapps
		65	RESIN_LIBEXEC= libexec
		66	.endif
		67
60	# Pass JAVA_HOME as determined by bsd.java.mk	68	# Pass JAVA_HOME as determined by bsd.java.mk
61	CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \	69	CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \
62	--with-openssl-lib=${OPENSSLLIB} \	70	--with-openssl-lib=${OPENSSLLIB} \
Lines 93-98 Link Here
93		101
94	PLIST_SUB+= APP_NAME=${APP_NAME}	102	PLIST_SUB+= APP_NAME=${APP_NAME}
95	PLIST_SUB+= APXS=${APXS}	103	PLIST_SUB+= APXS=${APXS}
		104	PLIST_SUB+= RESIN_LIBEXEC=${RESIN_LIBEXEC}
96		105
97	SUBSTITUTIONS= -e "s\|%%APP_HOME%%\|${APP_HOME}\|g" \	106	SUBSTITUTIONS= -e "s\|%%APP_HOME%%\|${APP_HOME}\|g" \
98	-e "s\|%%APP_NAME%%\|${APP_NAME}\|g" \	107	-e "s\|%%APP_NAME%%\|${APP_NAME}\|g" \
Lines 114-124 Link Here
114	-e "s\|%%RUNASUSER%%\|${RUNASUSER}\|g" \	123	-e "s\|%%RUNASUSER%%\|${RUNASUSER}\|g" \
115	-e "s\|%%WRKDIR%%\|${WRKDIR}\|g" \	124	-e "s\|%%WRKDIR%%\|${WRKDIR}\|g" \
116	-e "s\|%%WRKSRC%%\|${WRKSRC}\|g"	125	-e "s\|%%WRKSRC%%\|${WRKSRC}\|g"
117
118	# Avoid build error on 64-bit architectures
119	.if (${ARCH} == "amd64") \|\| (${ARCH} == "ia64") \|\| (${ARCH} == "sparc64")
120	CFLAGS+= -fPIC
121	.endif
122		126
123	post-patch:	127	post-patch:
124	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES}	128	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES}

Lines 5-13 Link Here

(-)/usr/ports/www/resin3/pkg-plist (-5 / +2 lines)
5	%%APP_NAME%%/lib/j2ee-management-10.jar	5	%%APP_NAME%%/lib/j2ee-management-10.jar
6	%%APP_NAME%%/lib/javamail-14.jar	6	%%APP_NAME%%/lib/javamail-14.jar
7	%%APP_NAME%%/lib/jaxb-api.jar	7	%%APP_NAME%%/lib/jaxb-api.jar
8	%%APP_NAME%%/lib/jaxb-impl.jar
9	%%APP_NAME%%/lib/jaxb-xjc.jar
10	%%APP_NAME%%/lib/jaxb1-impl.jar
11	%%APP_NAME%%/lib/jaxrpc-15.jar	8	%%APP_NAME%%/lib/jaxrpc-15.jar
12	%%APP_NAME%%/lib/jca-15.jar	9	%%APP_NAME%%/lib/jca-15.jar
13	%%APP_NAME%%/lib/jms-11.jar	10	%%APP_NAME%%/lib/jms-11.jar
Lines 23-29 Link Here
23	%%APP_NAME%%/lib/webutil.jar	20	%%APP_NAME%%/lib/webutil.jar
24	%%APP_NAME%%/webapps/ROOT/index.jsp	21	%%APP_NAME%%/webapps/ROOT/index.jsp
25	%%APP_NAME%%/webapps/resin-doc.war	22	%%APP_NAME%%/webapps/resin-doc.war
26	%%APP_NAME%%/libexec/libresin_os.so	23	%%APP_NAME%%/%%RESIN_LIBEXEC%%/libresin_os.so
27	etc/%%APP_NAME%%/app-default.xml	24	etc/%%APP_NAME%%/app-default.xml
28	etc/rc.d/%%APP_NAME%%.sh	25	etc/rc.d/%%APP_NAME%%.sh
29	sbin/%%APP_NAME%%ctl	26	sbin/%%APP_NAME%%ctl
Lines 33-39 Link Here
33	@dirrm %%APP_NAME%%/lib	30	@dirrm %%APP_NAME%%/lib
34	@dirrm %%APP_NAME%%/webapps/ROOT	31	@dirrm %%APP_NAME%%/webapps/ROOT
35	@dirrm %%APP_NAME%%/webapps	32	@dirrm %%APP_NAME%%/webapps
36	@dirrm %%APP_NAME%%/libexec	33	@dirrm %%APP_NAME%%/%%RESIN_LIBEXEC%%
37	@dirrm %%APP_NAME%%	34	@dirrm %%APP_NAME%%
38	@unexec if cmp -s %D/etc/%%APP_NAME%%/resin.xml %D/etc/%%APP_NAME%%/resin.xml-dist; then rm -f %D/etc/%%APP_NAME%%/resin.xml ; else echo If permanently deleting this package, %D/etc/%%APP_NAME%%/resin.xml must be removed manually; fi	35	@unexec if cmp -s %D/etc/%%APP_NAME%%/resin.xml %D/etc/%%APP_NAME%%/resin.xml-dist; then rm -f %D/etc/%%APP_NAME%%/resin.xml ; else echo If permanently deleting this package, %D/etc/%%APP_NAME%%/resin.xml must be removed manually; fi
39	etc/%%APP_NAME%%/resin.xml-dist	36	etc/%%APP_NAME%%/resin.xml-dist