diff options
author | dinoex <dinoex@FreeBSD.org> | 2013-09-21 19:06:03 +0800 |
---|---|---|
committer | dinoex <dinoex@FreeBSD.org> | 2013-09-21 19:06:03 +0800 |
commit | 2b046d64117ade41e336404023c6f8150293fc4a (patch) | |
tree | 2051ba0023bbf060fa37051dc7fc6990710a53b1 /misc | |
parent | a68540824c2afc9f423babe69b1494598b151be9 (diff) | |
download | freebsd-ports-gnome-2b046d64117ade41e336404023c6f8150293fc4a.tar.gz freebsd-ports-gnome-2b046d64117ade41e336404023c6f8150293fc4a.tar.zst freebsd-ports-gnome-2b046d64117ade41e336404023c6f8150293fc4a.zip |
- fix misplaced NO_STAGE in slaveports and ifdefs
Diffstat (limited to 'misc')
-rw-r--r-- | misc/estic/Makefile | 23 | ||||
-rw-r--r-- | misc/magicpoint/Makefile | 5 |
2 files changed, 15 insertions, 13 deletions
diff --git a/misc/estic/Makefile b/misc/estic/Makefile index 4635de837ee5..c83700b93476 100644 --- a/misc/estic/Makefile +++ b/misc/estic/Makefile @@ -3,7 +3,7 @@ PORTNAME= estic PORTVERSION= 1.61 -PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= misc comms MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dinoex @@ -13,21 +13,23 @@ DISTFILES= estic-1.60-sources.zip estic-1.61-patch-from-1.60.zip MAINTAINER= dinoex@FreeBSD.org COMMENT= Controller for ISDN TK-Anlage (PBX) made by Istec -USE_ZIP= yes -NO_WRKSUBDIR= yes +NO_STAGE= yes + +USE_ZIP= yes +NO_WRKSUBDIR= yes .if defined(WITHOUT_X11) -NOX11_SUFFIX?= -nox11 +NOX11_SUFFIX?= -nox11 X_OR_NOT= -PLIST_SUB+= WITHOUT_X="" -PLIST_SUB+= WITH_X="@comment " +PLIST_SUB+= WITHOUT_X="" +PLIST_SUB+= WITH_X="@comment " .else -USE_XORG= x11 +USE_XORG= x11 X_OR_NOT=-x -PLIST_SUB+= WITHOUT_X="@comment " -PLIST_SUB+= WITH_X="" +PLIST_SUB+= WITHOUT_X="@comment " +PLIST_SUB+= WITH_X="" .endif -AUTHOR= "Ullrich von Bassewitz" <uz@ibb.schwaben.com> +AUTHOR= "Ullrich von Bassewitz" <uz@ibb.schwaben.com> # Personal Preferences, Where to install. PBX_VAR=${PREFIX}/var/log/pbx @@ -44,7 +46,6 @@ MAKEFILE=make/freebsd${X_OR_NOT}.mak EXTRA_PATCHES+= ${FILESDIR}/dtr-off.patch .endif -NO_STAGE= yes pre-patch: @${ECHO_MSG} "===> Applying distribution patches for ${PKGNAME}" # @${PATCH} -d ${PATCH_WRKSRC}/estic --forward --quiet -E -p0 --batch < ${WRKDIR}/estic.diff diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 42c4b602096e..3f766b25fda5 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -14,13 +14,15 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ mng:${PORTSDIR}/graphics/libmng RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm +MAKE_JOBS_UNSAFE= yes +NO_STAGE= yes + USES= imake:env USE_XORG= x11 xext xmu xt sm ice xi xtst WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-vflib --enable-locale LATE_INSTALL_ARGS= install.man -MAKE_JOBS_UNSAFE= yes MAN1= mgp.1 mgp2ps.1 mgpembed.1 mgpnet.1 xwintoppm.1 xmindpath.1 @@ -44,7 +46,6 @@ OPTIONS_DEFINE=FREETYPE XFT GIF IMLIB OPTIONS_DEFAULT=FREETYPE XFT NO_OPTIONS_SORT=yes -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MFREETYPE} |