Attachment #249169 for bug #277455

Lines 1633-1639 PKG_NOTE_flavor= ${FLAVOR} Link Here

(-)b/Mk/bsd.port.mk (-1 / +2 lines)
1633	. endif	1633	. endif
1634		1634
1635	WRK_ENV+= HOME=${WRKDIR} \	1635	WRK_ENV+= HOME=${WRKDIR} \
1636	PWD="$${PWD}"	1636	PWD="$${PWD}" \
		1637	__MAKE_CONF=${NONEXISTENT}
1637	. for e in OSVERSION PATH TERM TMPDIR \	1638	. for e in OSVERSION PATH TERM TMPDIR \
1638	UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \	1639	UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \
1639	UNAME_p UNAME_r UNAME_s UNAME_U UNAME_v	1640	UNAME_p UNAME_r UNAME_s UNAME_U UNAME_v

Lines 11-17 USES= uidfix Link Here

(-)b/archivers/libcabinet/Makefile (-1 / +1 lines)
11	USE_LDCONFIG= yes	11	USE_LDCONFIG= yes
12	SRCFILE= ${WRKSRC}/listcab.cpp	12	SRCFILE= ${WRKSRC}/listcab.cpp
13	PROGFILE= ${SRCFILE:S/.cpp$//}	13	PROGFILE= ${SRCFILE:S/.cpp$//}
14	MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null	14	MAKE_ENV= WITHOUT_PROFILE=yes SRCCONF=/dev/null
15		15
16	post-build:	16	post-build:
17	${CXX} ${CXXFLAGS} -o ${PROGFILE} ${SRCFILE} -L${WRKSRC} -lcabinet -lz	17	${CXX} ${CXXFLAGS} -o ${PROGFILE} ${SRCFILE} -L${WRKSRC} -lcabinet -lz

Lines 20-25 WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather Link Here

(-)b/astro/wmspaceweather/Makefile (+1 lines)
20	SHEBANG_FILES= GetKp	20	SHEBANG_FILES= GetKp
21	USE_XORG= x11 xext xpm	21	USE_XORG= x11 xext xpm
22	ALL_TARGET= clean all	22	ALL_TARGET= clean all
		23	MAKE_ENV= OPSYS=${OPSYS}
23	MAKE_JOBS_UNSAFE= yes	24	MAKE_JOBS_UNSAFE= yes
24		25
25	PLIST_FILES= bin/GetKp bin/wmSpaceWeather \	26	PLIST_FILES= bin/GetKp bin/wmSpaceWeather \

Lines 17-23 LIB_DEPENDS= libexpat.so:textproc/expat2 Link Here

(-)b/devel/libpdel/Makefile (-1 / +1 lines)
17	USES= tar:bz2	17	USES= tar:bz2
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19		19
20	MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null	20	MAKE_ENV= WITHOUT_PROFILE=yes SRCCONF=/dev/null
21		21
22	WRKSRC_SUBDIR= pdel	22	WRKSRC_SUBDIR= pdel
23		23

Lines 13-19 LICENSE= ART10 Link Here

(-)b/devel/libshhmsg/Makefile (-1 / +1 lines)
13	USES= uidfix	13	USES= uidfix
14	MAKEFILE= ${FILESDIR}/Makefile.lib	14	MAKEFILE= ${FILESDIR}/Makefile.lib
15	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
16	MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null	16	MAKE_ENV= WITHOUT_PROFILE=yes SRCCONF=/dev/null
17		17
18	OPTIONS_DEFINE= DOCS	18	OPTIONS_DEFINE= DOCS
19		19

Lines 14-20 USES= uidfix Link Here

(-)b/devel/libxalloc/Makefile (-1 / +1 lines)
14		14
15	MAKEFILE= ${FILESDIR}/Makefile.lib	15	MAKEFILE= ${FILESDIR}/Makefile.lib
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17	MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null	17	MAKE_ENV= WITHOUT_PROFILE=yes SRCCONF=/dev/null
18		18
19	post-install:	19	post-install:
20	@${MKDIR} ${STAGEDIR}${DOCSDIR}	20	@${MKDIR} ${STAGEDIR}${DOCSDIR}




MAKE_ARGS+=	WITHOUT_PROFILE=yes
MAKE_ARGS+=	WITHOUT_SSP=yes
MAKE_ARGS+=	WITHOUT_WERROR=yes
MAKE_ARGS+=	__MAKE_CONF=""
MAKE_ENV+=	LDADD="-lrt"

.include <bsd.port.pre.mk>


do-build:
	${MKDIR} ${WRKSRC}/${LIBDIR_${ARCH}}
	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
		MAKEOBJDIR=${LIBDIR_${ARCH}} ${MAKE_CMD} ${MAKE_FLAGS} \
		${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}
.if ${ARCH} == amd64
	${MKDIR} ${WRKSRC}/lib
	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV:NCC=*} \
		CC="${CC} -m32" MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} \
		${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} \
		COMPAT_32BIT=yes
.endif

do-install:

Lines 14-20 BUILD_DEPENDS= as:devel/binutils Link Here

(-)b/emulators/vmw/Makefile (-1 / +1 lines)
14		14
15	WRKSRC= ${WRKDIR}/${PORTNAME}/src	15	WRKSRC= ${WRKDIR}/${PORTNAME}/src
16	USES= iconv	16	USES= iconv
17	MAKE_ENV+= __MAKE_CONF=/dev/null ASFLAGS="${ASFLAGS}"	17	MAKE_ENV+= ASFLAGS="${ASFLAGS}"
18	MAKE_ENV+= LD="${CC}"	18	MAKE_ENV+= LD="${CC}"
19		19
20	SBINS= vmw vmshrink vmftp	20	SBINS= vmw vmshrink vmftp

Lines 9-15 WWW= https://libstocks.sourceforge.net/ Link Here

(-)b/finance/libstocks/Makefile (-3 / +3 lines)
9		9
10	USE_LDCONFIG= yes	10	USE_LDCONFIG= yes
11	REINPLACE_ARGS= -i ""	11	REINPLACE_ARGS= -i ""
12	MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null	12	MAKE_ENV= WITHOUT_PROFILE=yes SRCCONF=/dev/null
13	MAKE_ENV+= STAGEDIR="${STAGEDIR}"	13	MAKE_ENV+= STAGEDIR="${STAGEDIR}"
14	USES= uidfix	14	USES= uidfix
15		15
Lines 23-30 post-patch: Link Here
23		23
24	do-build do-install:	24	do-build do-install:
25	.for d in lib client	25	.for d in lib client
26	cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} -j2 \	26	cd ${WRKSRC}/$d && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} \
27	-f ${FILESDIR}/Makefile.$d ${.TARGET:S/do-//}	27	${MAKEFLAGS} -j2 -f ${FILESDIR}/Makefile.$d ${.TARGET:S/do-//}
28	.endfor	28	.endfor
29		29
30	post-install:	30	post-install:

Lines 14-20 USES= xorg Link Here

(-)b/games/libshhcards/Makefile (-1 / +1 lines)
14	USE_XORG= xpm	14	USE_XORG= xpm
15	MAKEFILE= ${FILESDIR}/Makefile.lib	15	MAKEFILE= ${FILESDIR}/Makefile.lib
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17	MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null	17	MAKE_ENV= WITHOUT_PROFILE=yes SRCCONF=/dev/null
18		18
19	OPTIONS_DEFINE= DOCS	19	OPTIONS_DEFINE= DOCS
20		20

Lines 18-23 DOS2UNIX_FILES= common/bspfile.h common/cmdlib.cpp common/mathlib.h \ Link Here

(-)b/games/zhlt/Makefile (+1 lines)
18	hlvis/flow.cpp hlvis/vis.cpp hlvis/vis.h	18	hlvis/flow.cpp hlvis/vis.cpp hlvis/vis.h
19		19
20	MAKEFILE= ${FILESDIR}/Makefile	20	MAKEFILE= ${FILESDIR}/Makefile
		21	MAKE_ENV= ARCH=${ARCH}
21	NO_WRKSUBDIR= yes	22	NO_WRKSUBDIR= yes
22		23
23	PLIST_FILES= bin/hlbsp bin/hlcsg bin/hlrad bin/hlvis bin/ripent	24	PLIST_FILES= bin/hlbsp bin/hlcsg bin/hlrad bin/hlvis bin/ripent

Lines 1-5 Link Here

(-)b/graphics/tachyon/Makefile (-4 / +7 lines)
1	PORTNAME= tachyon	1	PORTNAME= tachyon
2	DISTVERSION= 0.98.9	2	DISTVERSION= 0.98.9
		3	PORTREVISION= 1
3	CATEGORIES= graphics science	4	CATEGORIES= graphics science
4	MASTER_SITES= http://jedi.ks.uiuc.edu/~johns/raytracer/files/${DISTVERSION}/	5	MASTER_SITES= http://jedi.ks.uiuc.edu/~johns/raytracer/files/${DISTVERSION}/
5		6
Lines 8-17 COMMENT= Multiproccess ray tracing system Link Here
8	WWW= http://jedi.ks.uiuc.edu/~johns/raytracer/	9	WWW= http://jedi.ks.uiuc.edu/~johns/raytracer/
9		10
10	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
11	LICENSE_FILE= ${WRKSRC}/../Copyright	12	LICENSE_FILE= ${WRKSRC}/Copyright
12		13
		14	ALL_TARGET= bsd
		15
		16	BUILD_WRKSRC= ${WRKSRC}/unix
13	WRKSRC= ${WRKDIR}/${PORTNAME}	17	WRKSRC= ${WRKDIR}/${PORTNAME}
14	WRKSRC_SUBDIR= unix
15		18
16	PLIST_FILES= bin/tachyon \	19	PLIST_FILES= bin/tachyon \
17	lib/libtachyon.a	20	lib/libtachyon.a
Lines 19-25 PLIST_FILES= bin/tachyon \ Link Here
19	.include <bsd.port.pre.mk>	22	.include <bsd.port.pre.mk>
20		23
21	do-install:	24	do-install:
22	${INSTALL_PROGRAM} ${WRKSRC}/../compile/${ARCH}/tachyon ${STAGEDIR}${PREFIX}/bin	25	${INSTALL_PROGRAM} ${WRKSRC}/compile/bsd/tachyon ${STAGEDIR}${PREFIX}/bin
23	${INSTALL_LIB} ${WRKSRC}/../compile/${ARCH}/libtachyon.a ${STAGEDIR}${PREFIX}/lib	26	${INSTALL_LIB} ${WRKSRC}/compile/bsd/libtachyon.a ${STAGEDIR}${PREFIX}/lib
24		27
25	.include <bsd.port.post.mk>	28	.include <bsd.port.post.mk>

Removed Link Here

(-)a/graphics/tachyon/files/patch-Makefile (-11 lines)
1	--- Makefile.orig 2009-04-23 15:11:55 UTC
2	+++ Makefile
3	@@ -18,6 +18,8 @@ include Make-distrib
4	COMPILEDIR=../compile
5	ARCHDIR=../compile/${ARCH}
6	OBJDIR=${ARCHDIR}/libtachyon
7	+LIBS=-L. -ltachyon -lm
8	+STRIP=strip
9
10	#
11	# Name of raytracing library file to create

Added Link Here

(-)b/graphics/tachyon/files/patch-src_threads.c (+11 lines)
1	--- src/threads.c.orig 2009-04-23 15:01:01 UTC
2	+++ src/threads.c
3	@@ -13,7 +13,7 @@
4	#include <winbase.h> /* system services headers */
5	#endif
6
7	-#if defined(SunOS) \|\| defined(Irix) \|\| defined(Linux) \|\| defined(_CRAY) \|\| defined(__osf__) \|\| defined(AIX)
8	+#if defined(SunOS) \|\| defined(Irix) \|\| defined(Linux) \|\| defined(Bsd) \|\| defined(_CRAY) \|\| defined(__osf__) \|\| defined(AIX)
9	#include<unistd.h> /* sysconf() headers, used by most systems */
10	#endif
11

Added Link Here

(-)b/graphics/tachyon/files/patch-src_threads.h (+11 lines)
1	--- src/threads.h.orig 2009-04-22 15:43:14 UTC
2	+++ src/threads.h
3	@@ -13,7 +13,7 @@
4	#endif
5
6	/* POSIX Threads */
7	-#if defined(HPUX) \|\| defined(__PARAGON__) \|\| defined(Irix) \|\| defined(Linux) \|\| defined(_CRAY) \|\| defined(__osf__) \|\| defined(AIX) \|\| defined(__APPLE__)
8	+#if defined(HPUX) \|\| defined(__PARAGON__) \|\| defined(Irix) \|\| defined(Linux) \|\| defined(Bsd) \|\| defined(_CRAY) \|\| defined(__osf__) \|\| defined(AIX) \|\| defined(__APPLE__)
9	#if !defined(USEUITHREADS) && !defined(USEPOSIXTHREADS)
10	#define USEPOSIXTHREADS
11	#endif

Added Link Here

(-)b/graphics/tachyon/files/patch-src_trace.c (+11 lines)
1	--- src/trace.c.orig 2010-01-18 06:13:18 UTC
2	+++ src/trace.c
3	@@ -88,7 +88,7 @@ void * thread_trace(thr_parms * t) {
4	* wraparound in _anyone's_ lifetime, so no need to even check....
5	* On lesser-bit platforms, we're not quite so lucky, so we have to check.
6	*/
7	-#if !defined(LP64)
8	+#if !defined(LP64) && !defined(_LP64)
9	if (local_mbox != NULL) {
10	if (t->serialno > (((unsigned long) 1) << ((sizeof(unsigned long) * 8) - 3))) {
11	memset(local_mbox, 0, sizeof(unsigned long) * scene->objgroup.numobjects);




--- unix/Make-arch.orig	2010-01-18 19:13:41 UTC
+++ unix/Make-arch
@@ -954,13 +954,12 @@ bsd:
 bsd:
 	$(MAKE) all \
 	"ARCH = bsd" \
-	"CC = gcc" \
-	"CFLAGS = -O3 -fomit-frame-pointer -ffast-math -DBsd  $(MISCFLAGS)" \
+	"CFLAGS = $(CFLAGS) -DBsd -DTHR $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
 	"STRIP = strip" \
 	"RANLIB = ranlib" \
-	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
 
 bsd-sparc:
 	$(MAKE) all \




USES=		cpe libedit lua:core,51
USE_LDCONFIG=	yes

# Overriding __MAKE_CONF makes sure that we don't re-parse
# /etc/make.conf during do-build, which would jeopardize the build
# if, for instance, the user set CFLAGS=mumble
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
# have its settings when we get here.
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}

# liblua.so requires libm, so make sure it has an explicit dependency
# so that applications need not second-guess lua's dependencies.
CPPFLAGS+=	-I${LOCALBASE}/include




USES=		cpe libedit lua:core,52
USE_LDCONFIG=	yes

# Overriding __MAKE_CONF makes sure that we don't re-parse
# /etc/make.conf during do-build, which would jeopardize the build
# if, for instance, the user set CFLAGS=mumble
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
# have its settings when we get here.
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}

# liblua.so requires libm, so make sure it has an explicit dependency
# so that applications need not second-guess lua's dependencies.
CPPFLAGS+=	-I${LOCALBASE}/include




USES=		cpe lua:core,53
USE_LDCONFIG=	yes

# Overriding __MAKE_CONF makes sure that we don't re-parse
# /etc/make.conf during do-build, which would jeopardize the build
# if, for instance, the user set CFLAGS=mumble
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
# have its settings when we get here.
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}

# using the "bsd" target rather than "freebsd" saves patching out the
# assumption of using base libedit in order to make it configurable. "bsd"
# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;




USES=		cpe lua:core,54
USE_LDCONFIG=	yes

# Overriding __MAKE_CONF makes sure that we don't re-parse
# /etc/make.conf during do-build, which would jeopardize the build
# if, for instance, the user set CFLAGS=mumble
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
# have its settings when we get here.
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}

# using the "bsd" target rather than "freebsd" saves patching out the
# assumption of using base libedit in order to make it configurable. "bsd"
# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;

Lines 18-25 GH_ACCOUNT= corecode Link Here

(-)b/mail/dma/Makefile (-2 / +1 lines)
18	GH_TAGNAME= 92937587bbfeab53653b841afe76af2fa6dad345	18	GH_TAGNAME= 92937587bbfeab53653b841afe76af2fa6dad345
19	USE_RC_SUBR= dma_flushq	19	USE_RC_SUBR= dma_flushq
20		20
21	MAKE_ENV= __MAKE_CONF=/dev/null \	21	MAKE_ENV= MANDIR=${PREFIX}/share/man/man \
22	MANDIR=${PREFIX}/share/man/man \
23	MK_WERROR=no \	22	MK_WERROR=no \
24	SRCCONF=/dev/null	23	SRCCONF=/dev/null
25		24

Lines 17-23 CONFIGURE_ARGS= --have-resn Link Here

(-)b/mail/spamilter/Makefile (-1 lines)
17	USE_RC_SUBR= spamilter	17	USE_RC_SUBR= spamilter
18		18
19	LDFLAGS+= -lpthread	19	LDFLAGS+= -lpthread
20	MAKE_ENV+= __MAKE_CONF=/dev/null
21		20
22	BINFILES= spamilter-system-report spamilter-user-report	21	BINFILES= spamilter-system-report spamilter-user-report
23	SHEBANG_FILES= ${BINFILES}	22	SHEBANG_FILES= ${BINFILES}




USES=		tar:xz uidfix

MAKE_ENV=	LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \
		SRCCONF=/dev/null SRCS="${SRCS}"

OPTIONS_DEFINE=	PROFILE EXAMPLES


		${WRKSRC}/c/sp/Makefile

do-test:
	@cd ${WRKSRC}/c; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
		XCFLAGS="${CFLAGS} -frounding-math" XINCLUDES="-I${WRKSRC}" \
		XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \
		LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} all3
.for t in d q s
	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx

Lines 11-17 WWW= https://www.netlib.org/linpack/ Link Here

(-)b/math/linpack/Makefile (-1 / +1 lines)
11		11
12	LIB_DEPENDS= libblas.so:math/blas	12	LIB_DEPENDS= libblas.so:math/blas
13		13
14	MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null	14	MAKE_ENV= WITHOUT_PROFILE=yes SRCCONF=/dev/null
15	MAKEFILE= ${FILESDIR}/Makefile.lib	15	MAKEFILE= ${FILESDIR}/Makefile.lib
16		16
17	USES= fortran uidfix	17	USES= fortran uidfix

Lines 21-27 MAKE_ARGS+= MAN1DIR=${PREFIX}/share/man/man1 Link Here

(-)b/ports-mgmt/dialog4ports/Makefile (-1 / +1 lines)
21	# CCACHE has options, so may need d4p, make d4p not ccache friendly	21	# CCACHE has options, so may need d4p, make d4p not ccache friendly
22	# to avoid circular dependency	22	# to avoid circular dependency
23	NO_CCACHE= yes	23	NO_CCACHE= yes
24	MAKE_ENV+= __MAKE_CONF=/dev/null SRCCONF=/dev/null	24	MAKE_ENV+= SRCCONF=/dev/null
25		25
26	.if !exists(/usr/lib/libdialog.so)	26	.if !exists(/usr/lib/libdialog.so)
27	BROKEN= Requires libdialog in base	27	BROKEN= Requires libdialog in base




PORTNAME=	consolehm
PORTVERSION=	1.31
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	LOCAL/fenner



USES=		uidfix
GNU_CONFIGURE=	yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
WRKSRC=		${WRKDIR}/consolehm/consolehm
MAKE_ARGS+=	-e

PLIST_FILES=	bin/chm share/man/man8/chm.8.gz

.include <bsd.port.mk>




--- Makefile.in.orig	2000-12-23 06:50:46 UTC
+++ Makefile.in
@@ -1,17 +1,13 @@ DEFINES+=	-DHAVE_CONFIG_H
 DEFINES+=	-DHAVE_CONFIG_H
-CFLAGS?=	-O2
+CFLAGS=		@CFLAGS@
 CFLAGS+=	$(DEFINES)
 
-.if ${ARCH} == "alpha"
-LDFLAGS+=      -lio
-.endif
-
 HEADERS=	chm.h
 SRCS=		chm.c
 
-PREFIX=		/usr/local
+PREFIX=		@prefix@
 BINDIR=		$(PREFIX)/bin
-MANDIR=		$(PREFIX)/man/man
+MANDIR=		@mandir@/man
 
 PROG=		chm
 MAN8=		chm.8

Lines 1-6 Link Here

(-)b/sysutils/consolehm/files/patch-configure (-3 / +11 lines)
1	--- configure.orig Fri Dec 22 22:50:52 2000	1	--- configure.orig 2000-12-23 06:50:52 UTC
2	+++ configure Mon Aug 1 04:41:04 2005	2	+++ configure
3	@@ -1096,7 +1096,7 @@	3	@@ -652,6 +652,7 @@ cat > conftest.$ac_ext << EOF
		4	#line 653 "configure"
		5	#include "confdefs.h"
		6
		7	+int
		8	main(){return(0);}
		9	EOF
		10	if { (eval echo configure:658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		11	@@ -1096,7 +1097,7 @@ done
4	fi	12	fi
5	done	13	done
6		14

Lines 18-28 PLIST_FILES= bin/dirdiff lib/libfilecmp.so.0.0 Link Here

(-)b/sysutils/dirdiff/Makefile (-5 lines)
18		18
19	CFLAGS+= -fPIC -I${TCL_INCLUDEDIR}	19	CFLAGS+= -fPIC -I${TCL_INCLUDEDIR}
20		20
21	# When bsdmake is used to build the port, the ports infrastructure should call
22	# it with MAKE_ENV+= __MAKE_CONF=/dev/null to avoid sourcing make.conf twice.
23	# This is a workaround to make sure CFLAGS are passed through.
24	MAKE_ARGS= CFLAGS="${CFLAGS}"
25
26	post-patch:	21	post-patch:
27	@${REINPLACE_CMD} -e \	22	@${REINPLACE_CMD} -e \
28	's\|.0.0\|.0\|g ; \	23	's\|.0.0\|.0\|g ; \

Lines 18-24 USES= iconv jpeg Link Here

(-)b/sysutils/pfstat/Makefile (-1 lines)
18	USE_RC_SUBR= pfstatd	18	USE_RC_SUBR= pfstatd
19		19
20	MAKE_ARGS= "LD_GD=gd"	20	MAKE_ARGS= "LD_GD=gd"
21	MAKE_ENV+= __MAKE_CONF=/dev/null
22		21
23	PLIST_FILES= bin/pfstat \	22	PLIST_FILES= bin/pfstat \
24	bin/pfstatd \	23	bin/pfstatd \

Lines 30-36 CFLAGS+= -DHAVE_ALTQ=1 Link Here

(-)b/sysutils/pftop/Makefile (-1 lines)
30	.endif	30	.endif
31		31
32	MAKE_ARGS+= CSTD=gnu89	32	MAKE_ARGS+= CSTD=gnu89
33	MAKE_ENV+= __MAKE_CONF=/dev/null
34		33
35	PLIST_FILES= sbin/pftop \	34	PLIST_FILES= sbin/pftop \
36	share/man/man8/pftop.8.gz	35	share/man/man8/pftop.8.gz

Lines 13-18 LICENSE_FILE= ${WRKSRC}/../COPYING Link Here

(-)b/x11-clocks/wmcalclock/Makefile (-1 / +1 lines)
13		13
14	USES= xorg	14	USES= xorg
15	USE_XORG= x11 xext xpm	15	USE_XORG= x11 xext xpm
		16	MAKE_ENV= OPSYS=${OPSYS}
16	WRKSRC= ${WRKDIR}/${DISTNAME}/Src	17	WRKSRC= ${WRKDIR}/${DISTNAME}/Src
17	PLIST_FILES= bin/wmCalClock man/man1/${PORTNAME}.1.gz	18	PLIST_FILES= bin/wmCalClock man/man1/${PORTNAME}.1.gz
18	PORTDOCS= BUGS CHANGES HINTS INSTALL README TODO	19	PORTDOCS= BUGS CHANGES HINTS INSTALL README TODO
19	-

Return to bug 277455

Lines 34-40 MAKE_ARGS+= LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h Link Here

(-)b/devel/linux_libusb/Makefile (-7 / +7 lines)
34	MAKE_ARGS+= WITHOUT_PROFILE=yes	34	MAKE_ARGS+= WITHOUT_PROFILE=yes
35	MAKE_ARGS+= WITHOUT_SSP=yes	35	MAKE_ARGS+= WITHOUT_SSP=yes
36	MAKE_ARGS+= WITHOUT_WERROR=yes	36	MAKE_ARGS+= WITHOUT_WERROR=yes
37	MAKE_ARGS+= __MAKE_CONF=""
38	MAKE_ENV+= LDADD="-lrt"	37	MAKE_ENV+= LDADD="-lrt"
39		38
40	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
Lines 49-62 PLIST_FILES+= usr/lib/libusb.so.3 \ Link Here
49		48
50	do-build:	49	do-build:
51	${MKDIR} ${WRKSRC}/${LIBDIR_${ARCH}}	50	${MKDIR} ${WRKSRC}/${LIBDIR_${ARCH}}
52	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} MAKEOBJDIR=${LIBDIR_${ARCH}} \	51	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
53	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} \	52	MAKEOBJDIR=${LIBDIR_${ARCH}} ${MAKE_CMD} ${MAKE_FLAGS} \
54	${MAKE_ARGS:N${DESTDIRNAME}=*}	53	${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}
55	.if ${ARCH} == amd64	54	.if ${ARCH} == amd64
56	${MKDIR} ${WRKSRC}/lib	55	${MKDIR} ${WRKSRC}/lib
57	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NCC=*} CC="${CC} -m32" \	56	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV:NCC=*} \
58	MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \	57	CC="${CC} -m32" MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} \
59	${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} COMPAT_32BIT=yes	58	${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} \
		59	COMPAT_32BIT=yes
60	.endif	60	.endif
61		61
62	do-install:	62	do-install:

Added Link Here

(-)b/graphics/tachyon/files/patch-unix_Make-arch (+18 lines)
1	--- unix/Make-arch.orig 2010-01-18 19:13:41 UTC
2	+++ unix/Make-arch
3	@@ -954,13 +954,12 @@ bsd:
4	bsd:
5	$(MAKE) all \
6	"ARCH = bsd" \
7	- "CC = gcc" \
8	- "CFLAGS = -O3 -fomit-frame-pointer -ffast-math -DBsd $(MISCFLAGS)" \
9	+ "CFLAGS = $(CFLAGS) -DBsd -DTHR $(MISCFLAGS)" \
10	"AR = ar" \
11	"ARFLAGS = r" \
12	"STRIP = strip" \
13	"RANLIB = ranlib" \
14	- "LIBS = -L. -ltachyon $(MISCLIB) -lm"
15	+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
16
17	bsd-sparc:
18	$(MAKE) all \

Lines 14-27 LICENSE= MIT Link Here

(-)b/lang/lua51/Makefile (-8 lines)
14	USES= cpe libedit lua:core,51	14	USES= cpe libedit lua:core,51
15	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
16		16
17	# Overriding __MAKE_CONF makes sure that we don't re-parse
18	# /etc/make.conf during do-build, which would jeopardize the build
19	# if, for instance, the user set CFLAGS=mumble
20	# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21	# have its settings when we get here.
22	# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23	MAKE_ARGS= __MAKE_CONF=${NONEXISTENT}
24
25	# liblua.so requires libm, so make sure it has an explicit dependency	17	# liblua.so requires libm, so make sure it has an explicit dependency
26	# so that applications need not second-guess lua's dependencies.	18	# so that applications need not second-guess lua's dependencies.
27	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include

Lines 14-27 LICENSE= MIT Link Here

(-)b/lang/lua52/Makefile (-8 lines)
14	USES= cpe libedit lua:core,52	14	USES= cpe libedit lua:core,52
15	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
16		16
17	# Overriding __MAKE_CONF makes sure that we don't re-parse
18	# /etc/make.conf during do-build, which would jeopardize the build
19	# if, for instance, the user set CFLAGS=mumble
20	# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21	# have its settings when we get here.
22	# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23	MAKE_ARGS= __MAKE_CONF=${NONEXISTENT}
24
25	# liblua.so requires libm, so make sure it has an explicit dependency	17	# liblua.so requires libm, so make sure it has an explicit dependency
26	# so that applications need not second-guess lua's dependencies.	18	# so that applications need not second-guess lua's dependencies.
27	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include

Lines 14-27 LICENSE= MIT Link Here

(-)b/lang/lua53/Makefile (-8 lines)
14	USES= cpe lua:core,53	14	USES= cpe lua:core,53
15	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
16		16
17	# Overriding __MAKE_CONF makes sure that we don't re-parse
18	# /etc/make.conf during do-build, which would jeopardize the build
19	# if, for instance, the user set CFLAGS=mumble
20	# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21	# have its settings when we get here.
22	# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23	MAKE_ARGS= __MAKE_CONF=${NONEXISTENT}
24
25	# using the "bsd" target rather than "freebsd" saves patching out the	17	# using the "bsd" target rather than "freebsd" saves patching out the
26	# assumption of using base libedit in order to make it configurable. "bsd"	18	# assumption of using base libedit in order to make it configurable. "bsd"
27	# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;	19	# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;

Lines 14-27 LICENSE= MIT Link Here

(-)b/lang/lua54/Makefile (-8 lines)
14	USES= cpe lua:core,54	14	USES= cpe lua:core,54
15	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
16		16
17	# Overriding __MAKE_CONF makes sure that we don't re-parse
18	# /etc/make.conf during do-build, which would jeopardize the build
19	# if, for instance, the user set CFLAGS=mumble
20	# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21	# have its settings when we get here.
22	# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23	MAKE_ARGS= __MAKE_CONF=${NONEXISTENT}
24
25	# using the "bsd" target rather than "freebsd" saves patching out the	17	# using the "bsd" target rather than "freebsd" saves patching out the
26	# assumption of using base libedit in order to make it configurable. "bsd"	18	# assumption of using base libedit in order to make it configurable. "bsd"
27	# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;	19	# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;

Lines 15-21 USE_LDCONFIG= yes Link Here

(-)b/math/libmissing/Makefile (-4 / +5 lines)
15	USES= tar:xz uidfix	15	USES= tar:xz uidfix
16		16
17	MAKE_ENV= LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \	17	MAKE_ENV= LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \
18	SRCCONF=/dev/null SRCS="${SRCS}" __MAKE_CONF=/dev/null	18	SRCCONF=/dev/null SRCS="${SRCS}"
19		19
20	OPTIONS_DEFINE= PROFILE EXAMPLES	20	OPTIONS_DEFINE= PROFILE EXAMPLES
21		21
Lines 61-70 post-patch: Link Here
61	${WRKSRC}/c/sp/Makefile	61	${WRKSRC}/c/sp/Makefile
62		62
63	do-test:	63	do-test:
64	@cd ${WRKSRC}/c; ${SETENV} ${MAKE_ENV} XCFLAGS="${CFLAGS} -frounding-math" \	64	@cd ${WRKSRC}/c; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
65	XINCLUDES="-I${WRKSRC}" XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \	65	XCFLAGS="${CFLAGS} -frounding-math" XINCLUDES="-I${WRKSRC}" \
		66	XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \
66	LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \	67	LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
67	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all3	68	${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} all3
68	.for t in d q s	69	.for t in d q s
69	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"	70	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
70	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx	71	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx

Lines 1-6 Link Here

(-)b/sysutils/consolehm/Makefile (-3 / +3 lines)
1	PORTNAME= consolehm	1	PORTNAME= consolehm
2	PORTVERSION= 1.31	2	PORTVERSION= 1.31
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= sysutils	4	CATEGORIES= sysutils
5	MASTER_SITES= LOCAL/fenner	5	MASTER_SITES= LOCAL/fenner
6		6
Lines 11-19 BROKEN_aarch64= fails to build: fatal error: 'machine/pio.h' file not found Link Here
11		11
12	USES= uidfix	12	USES= uidfix
13	GNU_CONFIGURE= yes	13	GNU_CONFIGURE= yes
		14	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
14	WRKSRC= ${WRKDIR}/consolehm/consolehm	15	WRKSRC= ${WRKDIR}/consolehm/consolehm
15	MAKE_ARGS+= -e
16		16
17	PLIST_FILES= bin/chm man/man8/chm.8.gz	17	PLIST_FILES= bin/chm share/man/man8/chm.8.gz
18		18
19	.include <bsd.port.mk>	19	.include <bsd.port.mk>

Added Link Here

(-)b/sysutils/consolehm/files/patch-Makefile.in (+23 lines)
1	--- Makefile.in.orig 2000-12-23 06:50:46 UTC
2	+++ Makefile.in
3	@@ -1,17 +1,13 @@ DEFINES+= -DHAVE_CONFIG_H
4	DEFINES+= -DHAVE_CONFIG_H
5	-CFLAGS?= -O2
6	+CFLAGS= @CFLAGS@
7	CFLAGS+= $(DEFINES)
8
9	-.if ${ARCH} == "alpha"
10	-LDFLAGS+= -lio
11	-.endif
12	-
13	HEADERS= chm.h
14	SRCS= chm.c
15
16	-PREFIX= /usr/local
17	+PREFIX= @prefix@
18	BINDIR= $(PREFIX)/bin
19	-MANDIR= $(PREFIX)/man/man
20	+MANDIR= @mandir@/man
21
22	PROG= chm
23	MAN8= chm.8