Attachment #178082 for bug #215401

View | Details | Raw Unified | Return to bug 215401
Collapse All | Expand All

Lines 1107-1116 makepatch: Link Here

(-)b/Mk/bsd.port.mk (-4 / +1 lines)
1107	MAINTAINER?= ports@FreeBSD.org	1107	MAINTAINER?= ports@FreeBSD.org
1108		1108
1109	# Get the architecture	1109	# Get the architecture
1110	.if !defined(ARCH)	1110	ARCH?= ${MACHINE_ARCH}
1111	ARCH!= ${UNAME} -p
1112	.endif
1113	_EXPORTED_VARS+= ARCH
1114		1111
1115	# Get the operating system type	1112	# Get the operating system type
1116	.if !defined(OPSYS)	1113	.if !defined(OPSYS)

Lines 60-69 STRIP?= -s Link Here

(-)b/Mk/bsd.port.subdir.mk (-4 / +1 lines)
60	# to child makes explicitly, instead of recomputing them tens of thousands of times.	60	# to child makes explicitly, instead of recomputing them tens of thousands of times.
61		61
62	.if !defined(NOPRECIOUSMAKEVARS)	62	.if !defined(NOPRECIOUSMAKEVARS)
63	.if !defined(ARCH)	63	ARCH?= ${MACHINE_ARCH}
64	ARCH!= ${UNAME} -p
65	.endif
66	_EXPORTED_VARS+= ARCH
67		64
68	.if !defined(OSVERSION)	65	.if !defined(OSVERSION)
69	.if exists(/usr/include/sys/param.h)	66	.if exists(/usr/include/sys/param.h)

Lines 17-23 RESTRICTED= No commercial use Link Here

(-)b/benchmarks/nttcp/Makefile (-1 lines)
17	ALL_TARGET= nttcp	17	ALL_TARGET= nttcp
18	USES= gmake	18	USES= gmake
19	MAKE_ENV+= OPT="${CFLAGS}"	19	MAKE_ENV+= OPT="${CFLAGS}"
20	NOPRECIOUSMAKEVARS=yes
21		20
22	PLIST_FILES= bin/nttcp man/man1/nttcp.1.gz	21	PLIST_FILES= bin/nttcp man/man1/nttcp.1.gz
23		22




FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_ON=	--enable-ffmpeg

MACHINE=	${OPSYS:tu}

SUB_LIST=	PREFIX=${PREFIX}
SUB_FILES=	pkg-message
MAKE_ENV=	TK_VER=${TK_VER} TCL_VER=${TCL_VER}	\
		TCL_INCLUDEDIR="${TCL_INCLUDEDIR}"	\
		TK_INCLUDEDIR="${TK_INCLUDEDIR}"	\
		MACHINE=${OPSYS:tu} MAKE=${MAKE_CMD}

post-patch:
	@${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \

Lines 14-19 USES= readline Link Here

(-)b/devel/ald/Makefile (-1 lines)
14		14
15	PLIST_FILES= bin/ald man/man8/ald.8.gz	15	PLIST_FILES= bin/ald man/man8/ald.8.gz
16	ONLY_FOR_ARCHS= i386	16	ONLY_FOR_ARCHS= i386
17	NOPRECIOUSMAKEVARS= yes
18		17
19	.include <bsd.port.mk>	18	.include <bsd.port.mk>

Lines 5-15 Link Here

(-)b/emulators/i386-wine-devel/Makefile (-5 / +1 lines)
5	# - i386 specific port to be slave to ${PORTSDIR}/emulators/wine-devel	5	# - i386 specific port to be slave to ${PORTSDIR}/emulators/wine-devel
6	# - amd64 specific port to be normal port (based on binary package)	6	# - amd64 specific port to be normal port (based on binary package)
7		7
8	.if !defined(ARCH)	8	.if ${MACHINE_ARCH} == i386
9	ARCH!= uname -p
10	.endif
11
12	.if ${ARCH} == i386
13	.include "${.CURDIR}/Makefile.i386"	9	.include "${.CURDIR}/Makefile.i386"
14	.else	10	.else
15	.include "${.CURDIR}/Makefile.inc"	11	.include "${.CURDIR}/Makefile.inc"

Lines 13-21 OPTIONS_DEFAULT= LIBXSLT MPG123 HAL V4L X11 Link Here

(-)b/emulators/i386-wine-staging/Makefile (-3 / +1 lines)
13	SLAVEDIR= ${.CURDIR}/../i386-wine-devel	13	SLAVEDIR= ${.CURDIR}/../i386-wine-devel
14	PLIST= ${MASTERDIR}/pkg-plist	14	PLIST= ${MASTERDIR}/pkg-plist
15		15
16	.if !defined(ARCH)	16	ARCH?= ${MACHINE_ARCH}
17	ARCH!= uname -p
18	.endif
19		17
20	PKGNAMESUFFIX= -staging	18	PKGNAMESUFFIX= -staging
21	.if ${ARCH} == i386	19	.if ${ARCH} == i386

Lines 5-15 Link Here

(-)b/emulators/i386-wine/Makefile (-5 / +1 lines)
5	# - i386 specific port to be slave to ${PORTSDIR}/emulators/wine	5	# - i386 specific port to be slave to ${PORTSDIR}/emulators/wine
6	# - amd64 specific port to be normal port (based on binary package)	6	# - amd64 specific port to be normal port (based on binary package)
7		7
8	.if !defined(ARCH)	8	.if ${MACHINE_ARCH} == i386
9	ARCH!= uname -p
10	.endif
11
12	.if ${ARCH} == i386
13	.include "${.CURDIR}/Makefile.i386"	9	.include "${.CURDIR}/Makefile.i386"
14	.else	10	.else
15	.include "${.CURDIR}/Makefile.inc"	11	.include "${.CURDIR}/Makefile.inc"

Lines 22-29 LIBS+= -L${LOCALBASE}/lib Link Here

(-)b/graphics/EZWGL/Makefile (-2 lines)
22	PORTDOCS= *	22	PORTDOCS= *
23	PORTEXAMPLES= *	23	PORTEXAMPLES= *
24		24
25	NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
26
27	BROKEN_sparc64= Does not compile on sparc64	25	BROKEN_sparc64= Does not compile on sparc64
28		26
29	OPTIONS_DEFINE= DOCS EXAMPLES	27	OPTIONS_DEFINE= DOCS EXAMPLES

Lines 25-33 JDK_IMAGEDIR?= ${JDK_PORTDIR}/work/stage/usr/local/${JDK_PORT} Link Here

(-)b/java/bootstrap-openjdk/Makefile.update (-3 / +1 lines)
25	GET_REVISION= ${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}	25	GET_REVISION= ${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}
26	TAR?= /usr/bin/tar	26	TAR?= /usr/bin/tar
27		27
28	.if !defined(ARCH)	28	ARCH?= ${MACHINE_ARCH}
29	ARCH!= ${UNAME} -p
30	.endif
31	BUILD_OS!= ${UNAME} -r \| ${SED} -e 's/\..*//'	29	BUILD_OS!= ${UNAME} -r \| ${SED} -e 's/\..*//'
32	PORTREVISION!= ${GET_REVISION} 2>/dev/null \|\| ${TRUE}	30	PORTREVISION!= ${GET_REVISION} 2>/dev/null \|\| ${TRUE}
33		31

Lines 77-85 CATEGORIES+= ipv6 Link Here

(-)b/java/openjdk6/Makefile (-3 lines)
77	RUN_DEPENDS+= java-zoneinfo>0:java/java-zoneinfo	77	RUN_DEPENDS+= java-zoneinfo>0:java/java-zoneinfo
78	.endif	78	.endif
79		79
80	# avoid ARCH in MAKEFLAGS, breaks build
81	NOPRECIOUSMAKEVARS= yes
82
83	ONLY_FOR_ARCHS= amd64 i386	80	ONLY_FOR_ARCHS= amd64 i386
84		81
85	BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk6 \	82	BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk6 \

Lines 99-106 DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/r Link Here

(-)b/java/openjdk7/Makefile (-2 lines)
99		99
100	OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}	100	OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}
101		101
102	NOPRECIOUSMAKEVARS= yes
103
104	ONLY_FOR_ARCHS= i386 amd64	102	ONLY_FOR_ARCHS= i386 amd64
105		103
106	_MAKE_JOBS= #	104	_MAKE_JOBS= #

Lines 219-225 JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/armv6/arm/:S/i386/x86/} Link Here

(-)b/java/openjdk8/Makefile (-1 lines)
219	INSTALLDIR= ${PREFIX}/${PKGBASE}	219	INSTALLDIR= ${PREFIX}/${PKGBASE}
220		220
221	NO_CCACHE= yes	221	NO_CCACHE= yes
222	NOPRECIOUSMAKEVARS= yes
223		222
224	JDK_MAJOR_VERSION= 8	223	JDK_MAJOR_VERSION= 8
225	JDK_UPDATE_VERSION= 112	224	JDK_UPDATE_VERSION= 112

Lines 34-40 RUST_BOOT_VERSION= beta Link Here

(-)b/lang/rust-nightly/Makefile (-1 lines)
34	PORT_LLVM_EXTRACT_ONLY_OFF= ${DISTFILE_llvm}	34	PORT_LLVM_EXTRACT_ONLY_OFF= ${DISTFILE_llvm}
35	PORT_LLVM_GH_PROJECT_OFF= llvm:llvm	35	PORT_LLVM_GH_PROJECT_OFF= llvm:llvm
36	PORT_LLVM_GH_TAGNAME_OFF= 7ca76af:llvm	36	PORT_LLVM_GH_TAGNAME_OFF= 7ca76af:llvm
37	PORT_LLVM_VARS_OFF= NOPRECIOUSMAKEVARS=1 # ARCH
38		37
39	post-extract-PORT_LLVM-off:	38	post-extract-PORT_LLVM-off:
40	@(${RMDIR} ${WRKSRC}/src/llvm && \	39	@(${RMDIR} ${WRKSRC}/src/llvm && \

Lines 16-22 LIB_DEPENDS= libgmp.so:math/gmp \ Link Here

(-)b/lang/swi-pl/Makefile (-1 lines)
16		16
17	SWIPLDIR= ${PORTNAME:C/-//}-${PORTVERSION}	17	SWIPLDIR= ${PORTNAME:C/-//}-${PORTVERSION}
18		18
19	NOPRECIOUSMAKEVARS= yes
20	USE_XORG= xft xpm xt	19	USE_XORG= xft xpm xt
21	USES= gmake jpeg libarchive pathfix pkgconfig shebangfix ssl	20	USES= gmake jpeg libarchive pathfix pkgconfig shebangfix ssl
22	MAKE_JOBS_UNSAFE= yes	21	MAKE_JOBS_UNSAFE= yes

Lines 27-33 CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none Link Here

(-)b/multimedia/avidemux/Makefile.common (-1 lines)
27	CMAKE_ARGS+= -DQT5:BOOL=OFF	27	CMAKE_ARGS+= -DQT5:BOOL=OFF
28	CXXFLAGS+= -I${LOCALBASE}/include	28	CXXFLAGS+= -I${LOCALBASE}/include
29	MAKE_JOBS_UNSAFE= yes	29	MAKE_JOBS_UNSAFE= yes
30	NOPRECIOUSMAKEVARS= yes # ARCH
31		30
32	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils	31	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
33	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin	32	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin

Lines 22-28 USES= compiler:c11 cpe gmake localbase perl5 pkgconfig shebangfix tar:bzip2 Link Here

(-)b/multimedia/ffmpeg/Makefile (-1 lines)
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	USE_PERL5= build	23	USE_PERL5= build
24	SHEBANG_FILES= doc/texi2pod.pl	24	SHEBANG_FILES= doc/texi2pod.pl
25	NOPRECIOUSMAKEVARS= yes # ARCH
26		25
27	PORTSCOUT= limit:^3\.	26	PORTSCOUT= limit:^3\.
28		27

Lines 27-33 USES= cpe gmake perl5 pkgconfig tar:bzip2 shebangfix Link Here

(-)b/multimedia/ffmpeg0/Makefile (-1 lines)
27	USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}	27	USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
28	USE_PERL5= build	28	USE_PERL5= build
29	SHEBANG_FILES= doc/texi2pod.pl	29	SHEBANG_FILES= doc/texi2pod.pl
30	NOPRECIOUSMAKEVARS= yes # ARCH
31		30
32	FFMPEG_SUFFIX= 0	31	FFMPEG_SUFFIX= 0
33	HAS_CONFIGURE= yes	32	HAS_CONFIGURE= yes

Lines 33-39 FFMPEG_DESC?= Use system ffmpeg instead of internal libav Link Here

(-)b/multimedia/gstreamer-ffmpeg/Makefile (-1 lines)
33		33
34	FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0	34	FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0
35	FFMPEG_CONFIGURE_WITH=system-ffmpeg	35	FFMPEG_CONFIGURE_WITH=system-ffmpeg
36	FFMPEG_VARS_OFF=NOPRECIOUSMAKEVARS=yes # ARCH
37		36
38	FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav	37	FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav
39	FFMPEG_BUILD_DEPENDS_OFF=yasm:devel/yasm	38	FFMPEG_BUILD_DEPENDS_OFF=yasm:devel/yasm

Lines 68-75 MAKEFILE= GNUmakefile Link Here

(-)b/multimedia/handbrake/Makefile (-2 lines)
68	ALL_TARGET= #	68	ALL_TARGET= #
69	MAKE_JOBS_UNSAFE= yes	69	MAKE_JOBS_UNSAFE= yes
70		70
71	NOPRECIOUSMAKEVARS= yes # for ffmpeg and x264
72
73	# Enforce linking to bundled libraries instead of system libraries	71	# Enforce linking to bundled libraries instead of system libraries
74	LDFLAGS+= -L${BUILD_WRKSRC}/contrib/lib	72	LDFLAGS+= -L${BUILD_WRKSRC}/contrib/lib
75		73

Lines 80-86 USE_JAVA= yes Link Here

(-)b/multimedia/kodi/Makefile (-1 lines)
80	USE_GNOME= libxml2	80	USE_GNOME= libxml2
81	USE_LDCONFIG= yes	81	USE_LDCONFIG= yes
82	JAVA_BUILD= jre	82	JAVA_BUILD= jre
83	NOPRECIOUSMAKEVARS= yes
84	INSTALLS_ICONS= yes	83	INSTALLS_ICONS= yes
85		84
86	ONLY_FOR_ARCHS= i386 amd64	85	ONLY_FOR_ARCHS= i386 amd64

Lines 20-26 USE_XORG= x11 Link Here

(-)b/multimedia/libav/Makefile (-1 lines)
20	HAS_CONFIGURE= yes	20	HAS_CONFIGURE= yes
21	USE_PERL5= build	21	USE_PERL5= build
22	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}	22	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
23	NOPRECIOUSMAKEVARS= yes # ARCH
24		23
25	CPPFLAGS+= -I${LOCALBASE}/include	24	CPPFLAGS+= -I${LOCALBASE}/include
26	CONFIGURE_ARGS= --prefix="${PREFIX}" \	25	CONFIGURE_ARGS= --prefix="${PREFIX}" \

Lines 18-24 LIB_DEPENDS= libpng.so:graphics/png \ Link Here

(-)b/multimedia/mplayer/Makefile.common (-1 lines)
18	libfreetype.so:print/freetype2	18	libfreetype.so:print/freetype2
19		19
20	USES= compiler:c11 gmake iconv ncurses tar:xz	20	USES= compiler:c11 gmake iconv ncurses tar:xz
21	NOPRECIOUSMAKEVARS= yes # ARCH
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	CONFIGURE_ENV= TMPDIR="${WRKSRC}"	22	CONFIGURE_ENV= TMPDIR="${WRKSRC}"
24	CONFIGURE_ARGS= --cc="${CC}" \	23	CONFIGURE_ARGS= --cc="${CC}" \

Lines 29-35 GH_TAGNAME= ad97d24 Link Here

(-)b/multimedia/mythtv-frontend/Makefile (-1 lines)
29	WRKSRC_SUBDIR= ${GH_PROJECT}	29	WRKSRC_SUBDIR= ${GH_PROJECT}
30		30
31	ONLY_FOR_ARCHS= i386 amd64	31	ONLY_FOR_ARCHS= i386 amd64
32	NOPRECIOUSMAKEVARS= # don't override $(ARCH) in ffmpeg makefiles
33	USES= gmake libtool pkgconfig	32	USES= gmake libtool pkgconfig
34	USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \	33	USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \
35	moc_build qmake_build rcc_build uic_build	34	moc_build qmake_build rcc_build uic_build

Lines 31-37 WRKSRC_SUBDIR= ${PORTNAME} Link Here

(-)b/multimedia/mythtv/Makefile (-1 lines)
31		31
32	ONLY_FOR_ARCHS= i386 amd64	32	ONLY_FOR_ARCHS= i386 amd64
33	USE_PERL5= run build	33	USE_PERL5= run build
34	NOPRECIOUSMAKEVARS= # don't override $(ARCH) in ffmpeg makefiles
35	USES= gmake libtool perl5 pkgconfig pathfix shebangfix	34	USES= gmake libtool perl5 pkgconfig pathfix shebangfix
36	SHEBANG_FILES= programs/scripts/database/mythconverg_backup.pl \	35	SHEBANG_FILES= programs/scripts/database/mythconverg_backup.pl \
37	programs/scripts/database/mythconverg_restore.pl	36	programs/scripts/database/mythconverg_restore.pl

Lines 27-33 GROUPS= ${USERS} Link Here

(-)b/net-im/ejabberd/Makefile (-1 lines)
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
28	USES= cpe gmake pkgconfig shebangfix	28	USES= cpe gmake pkgconfig shebangfix
29	USE_RC_SUBR= ${PORTNAME}	29	USE_RC_SUBR= ${PORTNAME}
30	NOPRECIOUSMAKEVARS= yes
31	CPE_VENDOR= process-one	30	CPE_VENDOR= process-one
32		31
33	OPTIONS_DEFINE= ODBC PAM DOCS MYSQL PGSQL ICONV RIAK ZLIB REDIS SQLITE TOOLS FULLXML #LOGDB	32	OPTIONS_DEFINE= ODBC PAM DOCS MYSQL PGSQL ICONV RIAK ZLIB REDIS SQLITE TOOLS FULLXML #LOGDB

Lines 45-52 USE_RC_SUBR= opensips Link Here

(-)b/net/opensips/Makefile (-2 lines)
45	USES= gmake ncurses perl5 pkgconfig shebangfix ssl	45	USES= gmake ncurses perl5 pkgconfig shebangfix ssl
46	USE_GCC= yes	46	USE_GCC= yes
47		47
48	NOPRECIOUSMAKEVARS= yes
49
50	OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL PGSQL RADIUS TESTS TLS UNIXODBC	48	OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL PGSQL RADIUS TESTS TLS UNIXODBC
51	OPTIONS_DEFAULT= GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS	49	OPTIONS_DEFAULT= GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS
52	OPTIONS_SUB= yes	50	OPTIONS_SUB= yes

Lines 15-21 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here

(-)b/sysutils/and/Makefile (-1 lines)
15		15
16	USES= gmake	16	USES= gmake
17	ALL_TARGET= default	17	ALL_TARGET= default
18	NOPRECIOUSMAKEVARS= yes
19		18
20	.include <bsd.port.pre.mk>	19	.include <bsd.port.pre.mk>
21		20

Lines 87-93 PKGNAMESUFFIX?= -devel Link Here

(-)b/sysutils/cdrtools-devel/Makefile (-1 / +1 lines)
87	MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \	87	MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
88	INS_RBASE=${LOCALBASE}	88	INS_RBASE=${LOCALBASE}
89	CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc	89	CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc
90	CDRTLSXARCH!= ${UNAME} -m	90	CDRTLSXARCH= ${MACHINE}
91		91
92	.if exists(/usr/include/iconv.h)	92	.if exists(/usr/include/iconv.h)
93	USES+= iconv	93	USES+= iconv

Lines 85-91 PLIST_SUB+= RSCSI="@comment " Link Here

(-)b/sysutils/cdrtools/Makefile (-1 / +1 lines)
85	MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \	85	MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
86	INS_RBASE=${LOCALBASE}	86	INS_RBASE=${LOCALBASE}
87	CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc	87	CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc
88	CDRTLSXARCH!= ${UNAME} -m	88	CDRTLSXARCH= ${MACHINE}
89		89
90	.if exists(/usr/include/iconv.h)	90	.if exists(/usr/include/iconv.h)
91	USES+= iconv	91	USES+= iconv

Lines 75-85 X11_MAKE_ENV= USE_X11=1 Link Here

(-)b/x11-toolkits/py-kivy/Makefile (-5 / +1 lines)
75	X11_MAKE_ENV_OFF= USE_X11=0	75	X11_MAKE_ENV_OFF= USE_X11=0
76	X11_USE= XORG=x11	76	X11_USE= XORG=x11
77		77
78	.if !defined(ARCH)	78	.if ${MACHINE_ARCH} == i386
79	ARCH!= uname -p
80	.endif
81
82	.if ${ARCH} == i386
83	OPTIONS_GROUP_VIDEO+= PYGLET	79	OPTIONS_GROUP_VIDEO+= PYGLET
84	.endif	80	.endif
85		81

Lines 36-42 TEST_TARGET= do-test Link Here

(-)b/x11-toolkits/tk85/Makefile (-1 lines)
36		36
37	MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}	37	MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}
38	PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}	38	PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
39	NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
40	DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER}	39	DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER}
41	SUB_FILES= pkgIndex.tcl	40	SUB_FILES= pkgIndex.tcl
42		41

Return to bug 215401

Lines 40-53 OCC_CONFIGURE_ON= --enable-occ Link Here

(-)b/cad/netgen/Makefile (-3 / +1 lines)
40	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	40	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
41	FFMPEG_CONFIGURE_ON= --enable-ffmpeg	41	FFMPEG_CONFIGURE_ON= --enable-ffmpeg
42		42
43	MACHINE= ${OPSYS:tu}
44
45	SUB_LIST= PREFIX=${PREFIX}	43	SUB_LIST= PREFIX=${PREFIX}
46	SUB_FILES= pkg-message	44	SUB_FILES= pkg-message
47	MAKE_ENV= TK_VER=${TK_VER} TCL_VER=${TCL_VER} \	45	MAKE_ENV= TK_VER=${TK_VER} TCL_VER=${TCL_VER} \
48	TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \	46	TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
49	TK_INCLUDEDIR="${TK_INCLUDEDIR}" \	47	TK_INCLUDEDIR="${TK_INCLUDEDIR}" \
50	MACHINE=${MACHINE} MAKE=${MAKE_CMD}	48	MACHINE=${OPSYS:tu} MAKE=${MAKE_CMD}
51		49
52	post-patch:	50	post-patch:
53	@${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \	51	@${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \