svn commit: r537154 - head/x11-toolkits/swt

[Max Brazhnikov]

Author: makc
Date: Sun May 31 11:23:04 2020
New Revision: 537154
URL: https://svnweb.freebsd.org/changeset/ports/537154

Log:
  x11-toolkits/swt:
  - Unbreak on i386 by providing distinfo. Sources are shipped along with linux
    binaries in arch dependent tarballs.
  - Allow build on powerpc64. Not sure if it works though, let's try.
  - Clean up Makefile: use option helpers, remove unused variables, simplify
  - Take maintainership

Modified:
  head/x11-toolkits/swt/Makefile
  head/x11-toolkits/swt/distinfo

Modified: head/x11-toolkits/swt/Makefile
==============================================================================
--- head/x11-toolkits/swt/Makefile	Sun May 31 11:03:32 2020	(r537153)
+++ head/x11-toolkits/swt/Makefile	Sun May 31 11:23:04 2020	(r537154)
@@ -4,33 +4,30 @@
 PORTNAME=	swt
 DISTVERSION=	4.7.3a
 CATEGORIES=	x11-toolkits devel java
-MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/
-DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
+MASTER_SITES=	https://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/
+DISTNAME=	${DISTNAME_${ARCH}}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Standard Widget Toolkit for Java
 
 LICENSE=	EPL
 
-ONLY_FOR_ARCHS=	amd64 i386
-BROKEN_i386=	missing distinfo
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 USES=		gl gnome pkgconfig zip:infozip xorg
 
-SWT_VERSION=	4763
-OUTPUT_JAR=	swt.jar
-
+USE_ANT=	yes
 USE_GL=		glu gl
 USE_GNOME=	gtk20
 USE_JAVA=	yes
 USE_XORG=	xtst
 JAVA_OS=	native
-USE_ANT=	yes
-MAKE_ARGS+=	-Doutput.jar=${OUTPUT_JAR}
+
+SWT_VERSION=	4763
+
 MAKEFILE=	make_freebsd.mak
-USE_LDCONFIG=	yes
-PLIST_SUB=	BUILD=${SWT_VERSION}
-PLIST_FILES=	${JAVAJARDIR}/${OUTPUT_JAR} \
+
+PLIST_FILES=	${JAVAJARDIR}/swt.jar \
 		lib/libswt-atk-gtk-${SWT_VERSION}.so \
 		lib/libswt-awt-gtk-${SWT_VERSION}.so \
 		lib/libswt-gtk-${SWT_VERSION}.so \
@@ -42,22 +39,20 @@ NO_WRKSUBDIR=	yes
 OPTIONS_DEFINE=	CAIRO
 OPTIONS_DEFAULT=	CAIRO
 
-.include <bsd.port.options.mk>
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
+CAIRO_PLIST_FILES=	lib/libswt-cairo-gtk-${SWT_VERSION}.so
+CAIRO_MAKE_ENV=		MAKE_CAIRO=make_cairo
 
-.if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	libcairo.so:graphics/cairo
-PLIST_FILES+=	lib/libswt-cairo-gtk-${SWT_VERSION}.so
-MAKE_CAIRO=	make_cairo
-.endif
+DISTNAME_amd64=		${PORTNAME}-${DISTVERSION}-gtk-linux-x86_64
+DISTNAME_i386=		${PORTNAME}-${DISTVERSION}-gtk-linux-x86
+# The source code for x86_64 and ppc64 is identical, so prefer x86_64 tarball
+# to save space and time
+DISTNAME_powerpc64=	${PORTNAME}-${DISTVERSION}-gtk-linux-x86_64
 
-MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
-		MAKE_MOZILLA=${MAKE_MOZILLA} \
-		JAVA_HOME=${JAVA_HOME}
-
-.if (${ARCH} == "amd64")
-DIST_EXT=	gtk-linux-x86_64
-.else
-DIST_EXT=	gtk-linux-x86
+.if ${.TARGETS:Mmakesum}
+. for i in ${ONLY_FOR_ARCHS}
+DISTFILES:=	${DISTNAME_${i}}${EXTRACT_SUFX} ${DISTFILES}
+. endfor
 .endif
 
 post-extract:
@@ -72,6 +67,6 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/${OUTPUT_JAR} ${STAGEDIR}${JAVAJARDIR}/
+	${INSTALL_DATA} ${WRKSRC}/swt.jar ${STAGEDIR}${JAVAJARDIR}/
 
 .include <bsd.port.mk>

Modified: head/x11-toolkits/swt/distinfo
==============================================================================
--- head/x11-toolkits/swt/distinfo	Sun May 31 11:03:32 2020	(r537153)
+++ head/x11-toolkits/swt/distinfo	Sun May 31 11:23:04 2020	(r537154)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1530093075
+TIMESTAMP = 1590921567
+SHA256 (swt-4.7.3a-gtk-linux-x86.zip) = 1cf752f04b65e2cea92683142c5ee51f91de0f0a87898ca1903f3e16161d6556
+SIZE (swt-4.7.3a-gtk-linux-x86.zip) = 6182251
 SHA256 (swt-4.7.3a-gtk-linux-x86_64.zip) = 856005feff25de55f7d7b304d2cbed9dd24938c7b6d07ffd7413b8361a4753e3
 SIZE (swt-4.7.3a-gtk-linux-x86_64.zip) = 6360885