Index: head/x11-toolkits/swt-devel/Makefile =================================================================== --- head/x11-toolkits/swt-devel/Makefile (revision 197468) +++ head/x11-toolkits/swt-devel/Makefile (revision 197469) @@ -1,97 +1,99 @@ # New ports collection makefile for: swt-devel # Date created: 2006-11-16 # Whom: Robert C. Noland III # # $FreeBSD$ # PORTNAME= swt-devel DISTVERSION= 3.3 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits devel java MASTER_SITES= ${MASTER_SITE_ECLIPSE} MASTER_SITE_SUBDIR= R-${DISTVERSION}-200706251500 DISTNAME= swt-${DISTVERSION}-${DIST_EXT} MAINTAINER= rnoland@2hip.net COMMENT= Standard Widget Toolkit for Java ONLY_FOR_ARCHS= i386 amd64 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-${ARCH}-os.c + SWT_VERSION= 3346 OUTPUT_JAR= swt-devel.jar USE_ZIP= yes USE_GL= yes USE_GNOME= gtk20 pkgconfig USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_OS= native USE_ANT= yes MAKE_ARGS+= -Doutput.jar=${OUTPUT_JAR} MAKEFILE= make_freebsd.mak USE_LDCONFIG= yes PLIST_SUB= BUILD=${SWT_VERSION} PLIST_FILES= %%JAVAJARDIR%%/${OUTPUT_JAR} \ lib/libswt-atk-gtk-%%BUILD%%.so \ lib/libswt-awt-gtk-%%BUILD%%.so \ lib/libswt-gtk-%%BUILD%%.so \ lib/libswt-glx-gtk-%%BUILD%%.so \ lib/libswt-pi-gtk-%%BUILD%%.so NO_WRKSUBDIR= yes OPTIONS= CAIRO "Cairo Support" on \ GNOMEVFS "Gnome VFS Support" on \ BROWSER "Gecko Browser Support" on .include .if defined(WITH_CAIRO) LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo PLIST_FILES+= lib/libswt-cairo-gtk-%%BUILD%%.so MAKE_CAIRO= make_cairo .endif .if defined(WITH_GNOMEVFS) USE_GNOME+= gnomevfs2 libgnome libgnomeui PLIST_FILES+= lib/libswt-gnome-gtk-%%BUILD%%.so MAKE_GNOME= make_gnome .endif .if defined(WITH_BROWSER) USE_GECKO= mozilla firefox seamonkey .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" PLIST_FILES+= lib/libswt-${GECKO}-gtk-%%BUILD%%.so MAKE_MOZILLA= make_mozilla .endif MAKE_ENV+= MAKE_CAIRO=${MAKE_CAIRO} \ MAKE_GNOME=${MAKE_GNOME} \ MAKE_MOZILLA=${MAKE_MOZILLA} .if (${ARCH} == "amd64") DIST_EXT= gtk-linux-x86_64 .else DIST_EXT= gtk-linux-x86 .endif post-extract: @(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip") @${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar post-patch: @${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \ ${WRKSRC}/build.sh @${REINPLACE_CMD} -e 's|swt-mozilla|swt-${GECKO}|' \ ${WRKSRC}/make_freebsd.mak do-install: ${MKDIR} ${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/libswt-*.so ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/${OUTPUT_JAR} ${JAVAJARDIR}/ .include Property changes on: head/x11-toolkits/swt-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/x11-toolkits/swt-devel/files/patch-os.c =================================================================== --- head/x11-toolkits/swt-devel/files/patch-os.c (revision 197468) +++ head/x11-toolkits/swt-devel/files/patch-os.c (nonexistent) @@ -1,21 +0,0 @@ ---- ./os.c 2007-07-22 11:53:22.000000000 +0400 -+++ ./os.c 2007-07-22 11:57:56.000000000 +0400 -@@ -17397,11 +17397,16 @@ - jint rc = 0; - OS_NATIVE_ENTER(env, that, realpath_FUNC); - if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; -- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg1) { -+ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ } else -+ lparg1 = malloc(PATH_MAX); - rc = (jint)realpath((const char *)lparg0, (char *)lparg1); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); -+ if (!arg1 && lparg1 && rc == 0) -+ free(lparg1); - OS_NATIVE_EXIT(env, that, realpath_FUNC); - return rc; - } - Property changes on: head/x11-toolkits/swt-devel/files/patch-os.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-toolkits/swt-devel/files/extra-patch-amd64-os.c =================================================================== --- head/x11-toolkits/swt-devel/files/extra-patch-amd64-os.c (nonexistent) +++ head/x11-toolkits/swt-devel/files/extra-patch-amd64-os.c (revision 197469) @@ -0,0 +1,20 @@ +--- os.c.orig 2007-06-25 16:06:14.000000000 -0400 ++++ os.c 2007-08-10 11:54:37.000000000 -0400 +@@ -17397,11 +17397,16 @@ + jlong rc = 0; + OS_NATIVE_ENTER(env, that, realpath_FUNC); + if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; +- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; ++ if (arg1) { ++ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; ++ } else ++ lparg1 = malloc(PATH_MAX); + rc = (jlong)realpath((const char *)lparg0, (char *)lparg1); + fail: + if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); + if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); ++ if (!arg1 && lparg1 && rc == 0) ++ free(lparg1); + OS_NATIVE_EXIT(env, that, realpath_FUNC); + return rc; + } Property changes on: head/x11-toolkits/swt-devel/files/extra-patch-amd64-os.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11-toolkits/swt-devel/files/extra-patch-i386-os.c =================================================================== --- head/x11-toolkits/swt-devel/files/extra-patch-i386-os.c (nonexistent) +++ head/x11-toolkits/swt-devel/files/extra-patch-i386-os.c (revision 197469) @@ -0,0 +1,20 @@ +--- os.c.orig 2007-04-26 14:03:00.000000000 -0400 ++++ os.c 2007-08-10 11:56:22.000000000 -0400 +@@ -17397,11 +17397,16 @@ + jint rc = 0; + OS_NATIVE_ENTER(env, that, realpath_FUNC); + if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; +- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; ++ if (arg1) { ++ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; ++ } else ++ lparg1 = malloc(PATH_MAX); + rc = (jint)realpath((const char *)lparg0, (char *)lparg1); + fail: + if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); + if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); ++ if (!arg1 && lparg1 && rc == 0) ++ free(lparg1); + OS_NATIVE_EXIT(env, that, realpath_FUNC); + return rc; + } Property changes on: head/x11-toolkits/swt-devel/files/extra-patch-i386-os.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property