diff options
| author | makc <makc@FreeBSD.org> | 2013-10-09 18:08:19 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-10-09 18:08:19 +0800 |
| commit | 83cac038440239f36696a3039f7dc0b526b7824d (patch) | |
| tree | 8e0d5b26e7d65868e20d7e28211d09eea7e0d5a9 | |
| parent | b007c6bbe5b8c1944952df8b20c8b5aa2498fc1d (diff) | |
| download | freebsd-ports-gnome-83cac038440239f36696a3039f7dc0b526b7824d.tar.gz freebsd-ports-gnome-83cac038440239f36696a3039f7dc0b526b7824d.tar.zst freebsd-ports-gnome-83cac038440239f36696a3039f7dc0b526b7824d.zip | |
- Set DESTDIRNAME, allow staging
- Use options helpers
- Use new LIB_DEPENDS syntax
- Remove post-configure patching: CC, etc are now respected via QMAKESPEC
| -rw-r--r-- | graphics/fraqtive/Makefile | 18 | ||||
| -rw-r--r-- | net-im/psi/Makefile | 10 |
2 files changed, 8 insertions, 20 deletions
diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile index c7dec57eda7d..7f60304d8fd7 100644 --- a/graphics/fraqtive/Makefile +++ b/graphics/fraqtive/Makefile @@ -17,27 +17,15 @@ HAS_CONFIGURE= yes CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \ QMAKE_CFLAGS="${CFLAGS}" CONFIGURE_ARGS= -prefix ${PREFIX} -qmake ${QMAKE} +DESTDIRNAME= INSTALL_ROOT OPTIONS_DEFINE= SSE2 SSE2_DESC= Enable SSE2 optimization +SSE2_CONFIGURE_OFF= -no-sse2 STRIP_FILES= bin/fraqtive -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if !${PORT_OPTIONS:MSSE2} -CONFIGURE_ARGS+=-no-sse2 -.endif - -post-configure: - @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ - -e 's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|' \ - -e 's|^LINK .*|LINK=${CXX}|' \ - -e 's|^CFLAGS .*|CFLAGS=${CFLAGS} -Wall -W $$\(DEFINES\)|' \ - -e 's|^CXXFLAGS .*|CXXFLAGS=${CXXFLAGS} -Wall -W $$\(DEFINES\)|' - post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} .include <bsd.port.mk> diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index c0153decd93d..6323e80af711 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= Qt 4 based Jabber client -LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg @@ -24,6 +24,7 @@ USE_XORG= xscrnsaver CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \ --disable-growl --verbose CONFIGURE_ENV= QMAKEFLAGS='${QMAKEFLAGS}' +DESTDIRNAME= INSTALL_ROOT OPTIONS_DEFINE= ASPELL ENCHANT DBUS DEBUG OPTIONS_DEFAULT= ASPELL DBUS @@ -31,7 +32,6 @@ OPTIONS_DEFAULT= ASPELL DBUS ASPELL_DESC= Use aspell for spell checking ENCHANT_DESC= Use Enchant for spell checking -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDEBUG} @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --disable-qdbus .endif .if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell +LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \ --with-aspell-lib=${LOCALBASE}/lib .else @@ -57,12 +57,12 @@ CONFIGURE_ARGS+= --disable-aspell .endif .if ${PORT_OPTIONS:MENCHANT} -LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant +LIB_DEPENDS+= libenchant.so:${PORTSDIR}/textproc/enchant .else CONFIGURE_ARGS+= --disable-enchant .endif post-install: - ${STRIP_CMD} ${PREFIX}/bin/psi + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/psi .include <bsd.port.mk> |