Date: Thu, 26 Mar 2015 15:15:06 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: John Marino <marino@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r382339 - in head/x11-toolkits/swt: . files Message-ID: <551468CA.1080200@FreeBSD.org> In-Reply-To: <551467E5.7050505@FreeBSD.org> References: <201503261937.t2QJbgfH048303@svn.freebsd.org> <551467E5.7050505@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --KQsiEaR4fo1BpT2NTQupLaN6DJHaKiWrG Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 3/26/2015 3:11 PM, Bryan Drewery wrote: > On 3/26/2015 2:37 PM, John Marino wrote: >> Author: marino >> Date: Thu Mar 26 19:37:41 2015 >> New Revision: 382339 >> URL: https://svnweb.freebsd.org/changeset/ports/382339 >> QAT: https://qat.redports.org/buildarchive/r382339/ >> >> Log: >> x11-toolkits/swt: Add DragonFly support >> =20 >> Bring in fix from dports (port is not maintained) >> >> Modified: >> head/x11-toolkits/swt/Makefile >> head/x11-toolkits/swt/files/patch-build.sh >> >> Modified: head/x11-toolkits/swt/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/x11-toolkits/swt/Makefile Thu Mar 26 19:33:35 2015 (r382338) >> +++ head/x11-toolkits/swt/Makefile Thu Mar 26 19:37:41 2015 (r382339) >> @@ -83,6 +83,10 @@ post-extract: >> @(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip") >> @${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar >> =20 >> +post-patch: >> + ${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \ >> + ${WRKSRC}/make_dragonfly.mak >> + >=20 > This being unconditional seems wrong. >=20 This is what I was talking about on #bsdports earlier. This is overly-specific. You could fix this so that both FreeBSD and DragonFly and WhateverOS works all the same. Replace freebsd with OPSYS:tl in make_freebsd.mak and FreeBSD with OPSYS in build.sh; This is not enough but it's in the direction. Considering that make_freebsd.mak and make_dragonfly.mak are the same they should be more generic for OPSYS. >> do-install: >> @${MKDIR} ${STAGEDIR}${JAVAJARDIR} >> ${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib >> >> Modified: head/x11-toolkits/swt/files/patch-build.sh >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/x11-toolkits/swt/files/patch-build.sh Thu Mar 26 19:33:35 201= 5 (r382338) >> +++ head/x11-toolkits/swt/files/patch-build.sh Thu Mar 26 19:37:41 201= 5 (r382339) >> @@ -1,6 +1,16 @@ >> ---- build.sh.orig 2009-06-11 16:10:54.000000000 -0500 >> -+++ build.sh 2009-12-01 14:42:09.000000000 -0600 >> -@@ -44,6 +44,9 @@ >> +--- build.sh.orig 2010-02-12 17:49:56 UTC >> ++++ build.sh >> +@@ -41,9 +41,19 @@ case $OS in >> + MAKE_TYPE=3Dgmake >> + fi >> + ;; >> ++ "DragonFly") >> ++ SWT_OS=3Ddragonfly >> ++ MAKEFILE=3Dmake_dragonfly.mak >> ++ if uname -p > /dev/null 2>&1; then >> ++ MODEL=3D`uname -p` >> ++ fi >> ++ ;; >> "FreeBSD") >> SWT_OS=3Dfreebsd >> MAKEFILE=3Dmake_freebsd.mak >> @@ -10,7 +20,7 @@ >> ;; >> *) >> SWT_OS=3D`uname -s | tr -s '[:upper:]' '[:lower:]'` >> -@@ -75,15 +78,16 @@ >> +@@ -75,15 +85,16 @@ case $MODEL in >> esac >> =20 >> # For 64-bit CPUs, we have a switch >> @@ -29,7 +39,7 @@ >> if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnom= eui-2.0 && echo YES` =3D "xYES" ]; then >> echo "libgnomeui-2.0 found, compiling SWT program support using GNO= ME" >> MAKE_GNOME=3Dmake_gnome >> -@@ -91,7 +95,9 @@ >> +@@ -91,7 +102,9 @@ else >> echo "libgnome-2.0 and libgnomeui-2.0 not found:" >> echo " *** SWT Program support for GNOME will not be compiled." >> fi >> @@ -39,7 +49,7 @@ >> if [ x`pkg-config --exists cairo && echo YES` =3D "xYES" ]; then >> echo "Cairo found, compiling SWT support for the cairo graphics lib= rary." >> MAKE_CAIRO=3Dmake_cairo >> -@@ -99,30 +105,17 @@ >> +@@ -99,30 +112,17 @@ else >> echo "Cairo not found:" >> echo " *** Advanced graphics support using cairo will not be com= piled." >> fi >> >=20 >=20 --=20 Regards, Bryan Drewery --KQsiEaR4fo1BpT2NTQupLaN6DJHaKiWrG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJVFGjKAAoJEDXXcbtuRpfPcoEIAMDZFDnl2DMp2nrZ5zzJRY35 hw3SPk4/EpVztXtUnddx1IX8q3LUJSsrLaZOQBBGHN0C4bgoH9Zj0kd/kUyksUH0 qZvydsee6yE66EGoLV+wSwwIVL9gW+xBH9D++z7S4M2pYMRSgv/htaamMr8Mn04X rLOnXwd1r8F4MMCBvR958KStAA4iU4rYEhwgFqW/xPXVCgkBh89r1q2SjWNWpfdG //GdsTY5RvZqUUiXZ2dsJ3iu+Ey4yJuN/gnUjEgr6lD4AXvi4paQYcieC7LCBWJb 1JSqOMEGHPBmiFAFLCuMXc0Yy+hfNB+QcVhJioo2piMhst92tf0DS8szfofqu1U= =fY6Z -----END PGP SIGNATURE----- --KQsiEaR4fo1BpT2NTQupLaN6DJHaKiWrG--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?551468CA.1080200>