Date: Sun, 6 Sep 2015 13:03:08 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396213 - head/games/qqwing Message-ID: <201509061303.t86D38FU047703@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sun Sep 6 13:03:07 2015 New Revision: 396213 URL: https://svnweb.freebsd.org/changeset/ports/396213 Log: qqwing doesn't honor CC/CXX/CPP [1], resolve this by doing a major overhaul. Which also simplies the port a bit, and gets rid of using scripts the port supplies. * Even if the old port defined CC/CXX/CPP, it was not actualy used. Due to the reason in the next point. * Instead of using the port supplied script, which call ./configure and make install targets without any arguments and so. Copy the "special" voodoo into pre-configure and pre-build targets. Define GNU_CONFIGURE and use standard do-configure, do-build and do-install, since this ports uses autotools when it matters. * Drag USE_GITHUB macros out the macro mess. Use autoreconf USES instead of having manual BUILD_DEPENDS lines. * No more post-patch to fix the port supplied scripts, and no do-install since we leave that to autotools. * Set PATHFIX_MAKEFILEIN to patch the Makefile.am file instead of the Makefile.in file due to us running autoreconf which overwrites the .in file (if it existed at all). * Wrap lines * USE_GNOME=glib introspection:build are not needed, so remove them. PR: 202901 [1] Reported by: Kenneth Salerno <kennethsalerno@yahoo.com> [1] Modified: head/games/qqwing/Makefile Modified: head/games/qqwing/Makefile ============================================================================== --- head/games/qqwing/Makefile Sun Sep 6 11:43:08 2015 (r396212) +++ head/games/qqwing/Makefile Sun Sep 6 13:03:07 2015 (r396213) @@ -3,43 +3,37 @@ PORTNAME= qqwing PORTVERSION= 1.3.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= games gnome DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Sudoku generating and solving software -BUILD_DEPENDS= automake>=0:${PORTSDIR}/devel/automake \ - autoconf>=0:${PORTSDIR}/devel/autoconf \ - libtool:${PORTSDIR}/devel/libtool - -USES= gmake libtool pathfix pkgconfig -USE_GNOME= glib20 introspection:build USE_GITHUB= yes GH_ACCOUNT= stephenostermiller -USE_LDCONFIG= yes -CONFIGURE_ENV+= CC=cc CXX=c++ CPP=cpp -post-patch: - @${REINPLACE_CMD} -e 's|exit 1|exit 0|g' \ - ${WRKSRC}/build/not_root_check.sh - - @${REINPLACE_CMD} -e 's|touch --date 1980-01-01|touch |g' \ - ${WRKSRC}/build/*.sh - - @${REINPLACE_CMD} -e 's|sudo||g' \ - ${WRKSRC}/build/cpp_install.sh - -do-build: - @(cd ${WRKSRC} && ${SH} build/cpp_configure.sh && ${SH} build/cpp_compile.sh && ${SH} build/cpp_dist.sh) - -do-install: - @(cd ${WRKSRC}/target/automake/.libs && ${CP} libqqwing.so.2 ${STAGEDIR}${PREFIX}/lib) - @(${LN} -fs ${PREFIX}/lib/libqqwing.so.2 ${STAGEDIR}${PREFIX}/lib/libqqwing.so.2.0.3) - @(${LN} -fs ${PREFIX}/lib/libqqwing.so.2 ${STAGEDIR}${PREFIX}/lib/libqqwing.so) - @(cd ${WRKSRC}/target/automake/ && ${CP} qqwing.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig) - @(cd ${WRKSRC}/target/automake/ && ${CP} qqwing.hpp ${STAGEDIR}${PREFIX}/include) - @(cd ${WRKSRC}/target/automake/ && ${CP} qqwing ${STAGEDIR}${PREFIX}/bin) - @(cd ${WRKSRC}/target/automake/ && ${GZIP_CMD} qqwing.1 && ${CP} qqwing.1.gz ${STAGEDIR}${PREFIX}/man/man1/) +USES= autoreconf:build gmake libtool pathfix pkgconfig +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +PATHFIX_MAKEFILEIN= Makefile.am +INSTALL_TARGET= install-strip + +CONFIGURE_WRKSRC= ${WRKSRC}/target/automake +BUILD_WRKSRC= ${WRKSRC}/target/automake +INSTALL_WRKSRC= ${WRKSRC}/target/automake + +pre-configure: + @${MKDIR} ${WRKSRC}/target/automake + @cd ${WRKSRC} && ${CP} build/configure.ac build/Makefile.am \ + build/qqwing.pc.in doc/README doc/AUTHORS doc/COPYING \ + target/automake + @cd ${WRKSRC} && ${CP} doc/qqwing.man target/automake/qqwing.1 + @cd ${WRKSRC}/target/automake && ${TOUCH} config.h.in + @cd ${WRKSRC}/target/automake && autoreconf --force --install + +pre-build: + @cd ${WRKSRC} && ${CP} src/cpp/*.cpp target/automake + @cd ${WRKSRC} && ${CP} src/cpp/*.hpp target/automake .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509061303.t86D38FU047703>