Attachment #218255 for bug #249626

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

Lines 17-21 IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments Link Here

(-)Mk/Uses/gmake.mk (+1 lines)
17	BUILD_DEPENDS+= gmake>=4.3:devel/gmake	17	BUILD_DEPENDS+= gmake>=4.3:devel/gmake
18	CONFIGURE_ENV+= MAKE=gmake	18	CONFIGURE_ENV+= MAKE=gmake
19	MAKE_CMD= gmake	19	MAKE_CMD= gmake
		20	#MAKE_ENV+= MAKE=${LOCALBASE}/bin/gmake
20		21
21	.endif	22	.endif




		libgnomecanvas libgnomekbd \
		libgnomeui libgsf libgtkhtml libidl librsvg2 libwnck \
		libxml2 libxslt \
		orbit2 pango pangox-compat pygobject \
		vte

# GNOME 3 components

pygobject3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
pygobject3_USE_GNOME_IMPL=	glib20

pygtk2_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
pygtk2_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
pygtk2_USE_GNOME_IMPL=	libglade2 pygobject

intltool_BUILD_DEPENDS=	${LOCALBASE}/bin/intltool-extract:textproc/intltool

intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \




#
#		Examples:
#
#			USES=python:3.6+	# Supports Python 3.6 or later
#			USES=python:3.6-3.8	# Supports Python 3.6 to 3.8
#			USES=python:-3.7	# Supports Python up to 3.7
#			USES=python:-3.6	# Supports Python up to 3.6
#			USES=python		# Supports any/all Python versions
#
# NOTE:	<version-spec> should be as specific as possible, matching the versions

#
#	Not specifying a <version-spec> should only be used when a more specific
#	<version-spec> cannot be specified due to syntax limitations, for
#	example: 3.4-3.6, but even in this case, X.Y+ (3.4+), or -X.Y (-3.6)
#	is preferred and likely more correct.
#
# patch		Python is needed at patch time. Adds dependency to PATCH_DEPENDS.

# Exported variables:
#
# PYTHON_VERSION	- The chosen Python interpreter including the version,
#			  e.g. python3.6, python3.7, etc.
#
# Variables, which can be set by the port:
#

#
#			  are linked from the prefixed version to the
#			  prefix-less original name, e.g.
#			  bin/foo-3.6 --> bin/foo.
#
#	cython		- Depend on lang/cython at build-time.
#

# PYTHON_PORTSDIR	- The port directory of the chosen Python interpreter
#
# PYTHON_REL		- The release number of the chosen Python interpreter
#			  without dots, e.g. 3401, 3709, ...
#
# PYTHON_SUFFIX		- The major-minor release number of the chosen Python
#			  interpreter without dots, e.g. 36, 37, ...
#			  Used for prefixes and suffixes.
#
# PYTHON_MAJOR_VER	- The major release version of the chosen Python
#			  interpreter, e.g. 3, ...
#
# PYTHON_VER		- The major-minor release version of the chosen Python
#			  interpreter, e.g. 3.6, 3.7, ...
#
# PYTHON_ABIVER		- Additional ABI flags set by the chosen Python
#			  interpreter, e.g. md

#	PYTHON_VER=${PYTHON_VER}
#	PYTHON_VERSION=${PYTHON_VERSION}
#
# and PYTHON2 and PYTHON3 will be set according to the Python version:
#
#	PYTHON2="" PYTHON3="@comment " for Python 2.x
#	PYTHON2="@comment " PYTHON3="" for Python 3.x
#
# PYDISTUTILS_INSTALLNOSINGLE
#			- Deprecated without replacement
#

# What Python version and what Python interpreters are currently supported?
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
_PYTHON_VERSIONS=		3.7 3.8 3.6 # preferred first
_PYTHON_PORTBRANCH=		3.7		# ${_PYTHON_VERSIONS:[1]}
_PYTHON_BASECMD=		${LOCALBASE}/bin/python
_PYTHON_RELPORTDIR=		lang/python


_PYTHON_TEST_DEP=	yes
.endif

.if ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
WARNING+=	"PYTHON_DEFAULT must be a version present in PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
.endif

.if ${_PYTHON_ARGS} == 3
DEV_WARNING+=		"lang/python27 reached End of Life and will be removed on 2020-12-31, consider converting to a modern version of python"
.elif ${_PYTHON_ARGS} == 2
DEV_ERROR+=		"USES=python:2 is no longer supported, use USES=python:2.7"
.elif ${_PYTHON_ARGS} == 3
DEV_ERROR+=		"USES=python:3 is no longer supported, use USES=python:3.6+ or an appropriate version range"
.endif

_PYTHON_VERSION:=	${PYTHON_DEFAULT}


# If we have an unsupported version of Python, try another.
.if defined(_PYTHON_VERSION_NONSUPPORTED)
.undef _PYTHON_VERSION
.for ver in ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
__VER=		${ver}
.if !defined(_PYTHON_VERSION) && \
	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \

.endfor
.if !defined(_PYTHON_VERSION)
IGNORE=		needs an unsupported version of Python
# Set this to not bail out too early
_PYTHON_VERSION=	${PYTHON_DEFAULT}
.endif
.endif	# defined(_PYTHON_VERSION_NONSUPPORTED)

# Automatically generates FLAVORS if empty
.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
.  undef _VALID_PYTHON_VERSIONS
.  for ver in ${PYTHON_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
__VER=		${ver}
.    if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
		${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \

.  if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS)
FLAVORS=	${_ALL_PYTHON_FLAVORS}
.  else
.    for _v in ${PYTHON_DEFAULT} ${PYTHON3_DEFAULT}
_f=	py${_v:S/.//}
.      if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}
.if !empty(FLAVORS)

.  endif
.endif

.if ${FLAVOR:Mpy[3][0-9]}
_PYTHON_VERSION=	${FLAVOR:S/py//:C/(.)/\1./}
.endif



# Might be overridden by calling ports
PYTHON_CMD?=		${_PYTHON_BASECMD}${_PYTHON_VERSION}
.if ${PYTHON_VER} != 2.7
.if exists(${PYTHON_CMD}-config)
PYTHON_ABIVER!=		${PYTHON_CMD}-config --abiflags
.elif ${PYTHON_REL} < 3800
# Default ABI flags for lang/python3[67] ports
PYTHON_ABIVER=		m
.endif
.endif

.if ${PYTHON_MAJOR_VER} == 2
DEPRECATED?=	Uses Python 2.7 which is EOLed upstream
EXPIRATION_DATE?=	2020-12-31
.endif

.if !defined(PYTHONBASE)
PYTHONBASE!=	(${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \

_PYTHONPKGLIST=	${WRKDIR}/.PLIST.pymodtmp

# PEP 0488 (https://www.python.org/dev/peps/pep-0488/)
.if ${PYTHON_REL} < 3500
PYTHON_PYOEXTENSION=	pyo
.else
PYTHON_PYOEXTENSION=	opt-1.pyc
.endif

# Ports bound to a certain python version SHOULD
# - use the PYTHON_PKGNAMEPREFIX

PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR}

# Common Python modules that can be needed but only for some versions of Python.
.if ${PYTHON_REL} < 3500
PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR}
PY_PYGMENTS=	${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1:textproc/py-pygments-25@${PY_FLAVOR}
PY_SPHINX=	${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR}
PY_TYPING=	${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR}
.else
PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
PY_PYGMENTS=	${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1:textproc/py-pygments@${PY_FLAVOR}
PY_SPHINX=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
PY_TYPING=
.endif

# old compat stuff, remove from ports
PY_TYPING=
PY_PATHLIB=	${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR}
.else
PY_ENUM34=
PY_PATHLIB=
.endif

.if ${PYTHON_REL} < 3300
PY_IPADDRESS=	${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.23:net/py-ipaddress@${PY_FLAVOR}
.else
PY_IPADDRESS=
.endif

.if ${PYTHON_REL} < 3200
PY_FUTURES=	${PYTHON_PKGNAMEPREFIX}futures>=3.2:devel/py-futures@${PY_FLAVOR}
.else
PY_FUTURES=
.endif

.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
PY_MERCURIAL=	${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}

		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
		PYTHON_VER=${PYTHON_VER} \
		PYTHON_VERSION=${PYTHON_VERSION}
.if ${PYTHON_REL} < 3000
PLIST_SUB+=	PYTHON2="" PYTHON3="@comment "
.else
PLIST_SUB+=	PYTHON2="@comment " PYTHON3=""
.endif

_USES_POST+=	python
.endif # _INCLUDE_USES_PYTHON_MK




#
# Feature:	scons
# Usage:	USES=scons[:ARGS]
# Valid ARGS:	python3
#
# python2:	Use default python 2.x to run scons
# python3:	Use default python 3.x to run scons (default)
#
# MAINTAINER: python@FreeBSD.org


.if ${scons_ARGS} == python3
_SCONS_PYTHON_VER=	${PYTHON3_DEFAULT}
.elif ${scons_ARGS} == python2
_SCONS_PYTHON_VER=	${PYTHON2_DEFAULT}
DEPRECATED?=	Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
EXPIRATION_DATE?=	2020-12-31
.else
IGNORE=		Incorrect 'USES+= scons:${scons_ARGS}' usage
.endif

Lines 31-37 Link Here

(-)Mk/Uses/shebangfix.mk (-1 / +1 lines)
31	# To override a definition, for example replacing /usr/bin/perl by	31	# To override a definition, for example replacing /usr/bin/perl by
32	# /usr/bin/env perl, add the following:	32	# /usr/bin/env perl, add the following:
33	#	33	#
34	# perl_CMD= ${SETENV} perl	34	# perl_CMD= /usr/bin/env perl
35	#	35	#
36	# MAINTAINER: portmgr@FreeBSD.org	36	# MAINTAINER: portmgr@FreeBSD.org
37		37




LOCALBASE?=	/usr/local

.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
	JAVA JULIA LAZARUS LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON \
	PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
.if defined(${lang}_DEFAULT)
ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"

PGSQL_DEFAULT?=		12
# Possible values: 7.2, 7.3, 7.4
PHP_DEFAULT?=		7.4
# Possible values: 3.6, 3.7, 3.8
PYTHON_DEFAULT?=	3.7
# Possible values: 2.7
PYTHON2_DEFAULT?=	2.7
# Possible values: 3.6, 3.7, 3.8
PYTHON3_DEFAULT?=	3.7
# Possible values: 2.5, 2.6, 2.7

Lines 210-216 LDFLAGS+= -B${LOCALBASE}/bin Link Here

(-)Mk/bsd.gecko.mk (-1 / +1 lines)
210	.endif	210	.endif
211		211
212	.if ${PORT_OPTIONS:MCANBERRA}	212	.if ${PORT_OPTIONS:MCANBERRA}
213	RUN_DEPENDS+= libcanberra>0:audio/libcanberra	213	RUN_DEPENDS+= libcanberra-gtk3>0:audio/libcanberra-gtk3
214	.endif	214	.endif
215		215
216	.if ${PORT_OPTIONS:MDBUS}	216	.if ${PORT_OPTIONS:MDBUS}

Lines 1692-1708 _WRKDIR= work-${FLAVOR} Link Here

(-)Mk/bsd.port.mk (-6 / +15 lines)
1692		1692
1693	WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR}	1693	WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR}
1694	BINARY_LINKDIR= ${WRKDIR}/.bin	1694	BINARY_LINKDIR= ${WRKDIR}/.bin
1695	PATH:= ${BINARY_LINKDIR}:${PATH}	1695	PATH:= ${BINARY_LINKDIR}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:${LOCALBASE}/sbin:${LOCALBASE}/bin:/root/bin
1696	.if !${MAKE_ENV:MPATH=} && !${CONFIGURE_ENV:MPATH=}
1697	MAKE_ENV+= PATH=${PATH}
1698	CONFIGURE_ENV+= PATH=${PATH}
1699	.endif
1700		1696
1701	.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)	1697	.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)
1702	.if defined(WRKSRC)	1698	.if defined(WRKSRC)
1703	DEV_WARNING+= "You are using USE_GITHUB and WRKSRC is set which is wrong. Set GH_PROJECT correctly, set WRKSRC_SUBDIR or remove WRKSRC entirely."	1699	DEV_WARNING+= "You are using USE_GITHUB and WRKSRC is set which is wrong. Set GH_PROJECT correctly, set WRKSRC_SUBDIR or remove WRKSRC entirely."
1704	.endif	1700	.endif
1705	WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}	1701	# PR 246196
		1702	#WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
		1703	WRKSRC?= ${WRKDIR}/${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}
1706	.endif	1704	.endif
1707		1705
1708	.if !default(IGNORE_MASTER_SITE_GITLAB) && defined(USE_GITLAB) && empty(USE_GITLAB:Mnodefault)	1706	.if !default(IGNORE_MASTER_SITE_GITLAB) && defined(USE_GITLAB) && empty(USE_GITLAB:Mnodefault)
Lines 2046-2051 NONEXISTENT?= /nonexistent Link Here
2046	CHECKSUM_ALGORITHMS?= sha256	2044	CHECKSUM_ALGORITHMS?= sha256
2047		2045
2048	DISTINFO_FILE?= ${MASTERDIR}/distinfo	2046	DISTINFO_FILE?= ${MASTERDIR}/distinfo
		2047	# _TIMESTAMP= 0
		2048	# .if exists(${DISTINFO_FILE})
		2049	# _TIMESTAMP!= ${AWK} -F= -v ts=0 '/^TIMESTAMP/ { gsub(" ", "", $$2); ts=$$2 } END { print ts}' ${DISTINFO_FILE}
		2050	# .endif
2049		2051
2050	MAKE_FLAGS?= -f	2052	MAKE_FLAGS?= -f
2051	MAKEFILE?= Makefile	2053	MAKEFILE?= Makefile
Lines 2058-2063 MAKE_ENV+= PREFIX=${PREFIX} \ Link Here
2058	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \	2060	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
2059	MANPREFIX="${MANPREFIX}"	2061	MANPREFIX="${MANPREFIX}"
2060		2062
		2063	# .if ${_TIMESTAMP} != 0
		2064	# MAKE_ENV+= SOURCE_DATE_EPOCH="${_TIMESTAMP}"
		2065	# .endif
		2066
2061	# Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.	2067	# Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
2062	# gcc 4.x enable strict aliasing optimization with -O2 which is known to break	2068	# gcc 4.x enable strict aliasing optimization with -O2 which is known to break
2063	# a lot of ports.	2069	# a lot of ports.
Lines 3428-3433 _EXTRA_PACKAGE_TARGET_DEP+= ${WRKDIR_PKGFILE} Link Here
3428		3434
3429	.if !target(do-package)	3435	.if !target(do-package)
3430	PKG_CREATE_ARGS= -r ${STAGEDIR}	3436	PKG_CREATE_ARGS= -r ${STAGEDIR}
		3437	# .if ${_TIMESTAMP} != 0
		3438	# PKG_CREATE_ARGS+= -t ${_TIMESTAMP}
		3439	# .endif
3431	. if defined(PKG_CREATE_VERBOSE)	3440	. if defined(PKG_CREATE_VERBOSE)
3432	PKG_CREATE_ARGS+= -v	3441	PKG_CREATE_ARGS+= -v
3433	. endif	3442	. endif




  upgrade will do the right thing.  For the other people, follow the
  instructions in entry 20161103, it should still be the same.

20200802:
  AFFECTS: users of databases/mdbtools
  AUTHOR: rhurlin@gwdg.de

  In MDBTools the build process is broken, if mdbtools is installed
  already, because it picks up some files from ${LOCALBASE} instead of
  the ports working directory.

  If you are using a tool like portmaster or portupgrade, please first
  deinstall (any version) of mdbtools, then follow the normal upgrade
  method.

  # pkg delete -f mdbtools
  # rm -R /var/db/pkg/mdbtools-*

20200726:
  AFFECTS: users of net-mgmt/librenms
  AUTHOR:  dvl@FreeBSD.org





OPTIONS_DEFINE=	DOCS

post-extract: .SILENT
	${REINPLACE_CMD} -e 's/ifdef BIG_ENDIAN/if BYTE_ORDER == BIG_ENDIAN/' \
		-e 's/ifndef BIG_ENDIAN/if BYTE_ORDER == LITTLE_ENDIAN/' \
			${WRKSRC}/dzip.h ${WRKSRC}/conmain.c
	${REINPLACE_CMD} -e '4s,^,#include <machine/endian.h>,' \
		${WRKSRC}/dzip.h
	${REINPLACE_CMD} -e '21d;23d' ${WRKSRC}/dzipcon.h

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin






USES=		libtool
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
		--enable-shared \
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG=	yes

OPTIONS_DEFINE=	DOCS EXAMPLES

DOCS_INSTALL_TARGET_OFF=	install-exec install-pkgincludeHEADERS \
				install-pkgconfigDATA

post-build:
.if !defined(WITHOUT_CHECKS)

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblzo2.so.2
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,doc/,,' NEWS README
.for i in AUTHORS BUGS COPYING NEWS README THANKS
	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
.endfor

Lines 79-88 post-extract: Link Here

(-)archivers/paq/Makefile (-4 lines)
79		79
80	.endif	80	.endif
81		81
82	post-patch:
83	@${REINPLACE_CMD} -e 's\|c:\\res\\zpaq\\\|\|' ${WRKSRC}/bwt[12].cfg \
84	${WRKSRC}/bwtrle[12].cfg
85
86	do-build:	82	do-build:
87	@cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo lazy2 lzpre \	83	@cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo lazy2 lzpre \
88	lzppre; do \	84	lzppre; do \

Lines 28-35 MAKE_ARGS= PROG=${PORTNAME} CXX="${CXX}" LIB="-pthread" Link Here

(-)archivers/ppmd-7z/Makefile (-2 lines)
28	TEST_TARGET= test	28	TEST_TARGET= test
29		29
30	post-patch:	30	post-patch:
31	@${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\
32	${WRKSRC}/CPP/7zip/Common/FileStreams.h
33	@${REINPLACE_CMD} -e 's\|^CFLAGS =\|CFLAGS +=\|;s\|-o \|${CFLAGS} -o \|'\	31	@${REINPLACE_CMD} -e 's\|^CFLAGS =\|CFLAGS +=\|;s\|-o \|${CFLAGS} -o \|'\
34	${BUILD_WRKSRC}/${MAKEFILE}	32	${BUILD_WRKSRC}/${MAKEFILE}
35		33




BUILD_DEPENDS=	cmake:devel/cmake \
		sbt:devel/sbt

USES=		dos2unix gmake
DOS2UNIX_FILES=	Makefile
USE_JAVA=	yes
USE_LDCONFIG=	yes
MAKE_ARGS+=	CXX="${CXX}"

		${PORTVERSION:R}:google \
		${BITSHUFFLE_V}:masui

PLIST_FILES=	${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so

post-extract:
	@${MKDIR} ${WRKSRC}/target
	@${RM} ${WRKSRC}/sbt

Lines 20-30 PORTDOCS= *.txt Link Here

(-)archivers/szip/Makefile (-5 lines)
20		20
21	OPTIONS_DEFINE= DOCS	21	OPTIONS_DEFINE= DOCS
22		22
23	post-patch:
24	@${REINPLACE_CMD} -e 's,more logfile,cat logfile,' \
25	-e "s,^CFLAGS.*,CFLAGS= ${CFLAGS}," \
26	${WRKSRC}/makefile
27
28	do-install:	23	do-install:
29	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	24	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
30		25

Lines 23-31 NO_BUILD= yes Link Here

(-)archivers/unfoo/Makefile (-3 lines)
23	NO_ARCH= yes	23	NO_ARCH= yes
24	PLIST_FILES= bin/${PORTNAME}	24	PLIST_FILES= bin/${PORTNAME}
25		25
26	post-patch:
27	@${REINPLACE_CMD} -e '1s\|/.*\|/bin/sh\|;s\|==\|=\|' ${WRKSRC}/${PORTNAME}
28
29	do-install:	26	do-install:
30	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin	27	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
31		28




MAINTAINER=	ports@FreeBSD.org
COMMENT=	Efficient compressor for XML

WRKSRC=		${WRKDIR}/${PORTNAME}

USES=		dos2unix zip
DOS2UNIX_FILES=	${MAKEFILE} XMill/*.cpp
MAKEFILE=	makefile

WRKSRC=		${WRKDIR}/${PORTNAME}
DOS2UNIX_FILES=	${MAKEFILE} XMill/*.cpp XMill/*.hpp xmillinspect/exprinfo.cpp \
		xmillinspect/xmillinspect.h
MAKEFILE=	makefile
PORTDOCS=	*
PORTEXAMPLES=	*
PLIST_FILES=	bin/ppmzip \
		bin/xcmill \
		bin/xdemill \
		bin/xmillexample \
		bin/xmillinspect \
		bin/xmilltest

OPTIONS_DEFINE=	DOCS EXAMPLES

post-patch:
# Allow to build with modern GCC
	@${REINPLACE_CMD} -e 's,friend,& class,' ${WRKSRC}/XMill/*.?pp \
		${WRKSRC}/xmillinspect/xmillinspect.h

do-install:
.for p in ${PLIST_FILES:T}
	(cd ${WRKSRC}/unix && ${INSTALL_PROGRAM} ${p} ${STAGEDIR}${PREFIX}/bin)




./xmillinspect/exprinfo.cpp:64:10: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
                return NULL;
                       ^~~~
/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
#define NULL    nullptr
                ^~~~~~~

--- xmillinspect/exprinfo.cpp.orig	2003-03-23 15:06:16 UTC
+++ xmillinspect/exprinfo.cpp
@@ -61,7 +61,7 @@ int ExprInfo::getSubContainerType(int sub)
 	if (expr) {
 		return expr->getContainerType();
 	} else {
-		return NULL;
+		return 0;
 	}
 }
 

Lines 1-4 Link Here

(-)astro/saoimage/files/patch-btnlib_makefile (-2 / +2 lines)
1	--- btnlib/makefile.orig 1995-12-06 20:51:17 UTC	1	--- btnlib/makefile.orig 2020-01-26 19:05:22 UTC
2	+++ btnlib/makefile	2	+++ btnlib/makefile
3	@@ -8,7 +8,7 @@	3	@@ -8,7 +8,7 @@
4	# the library would build. It is preferable to build btnlib as part of the	4	# the library would build. It is preferable to build btnlib as part of the
Lines 9-15 Link Here
9		9
10	LINT = lint	10	LINT = lint
11	RANLIB = ranlib	11	RANLIB = ranlib
12	@@ -27,7 +27,7 @@ OBJS = attach.o draw.o event.o border.	12	@@ -27,7 +27,7 @@ OBJS = attach.o draw.o event.o border.o \
13	press.o remote.o resize.o util.o	13	press.o remote.o resize.o util.o
14		14
15	LIB = libbtn.a	15	LIB = libbtn.a

Lines 1-4 Link Here

(-)astro/saoimage/files/patch-disppsct.c (-1 / +1 lines)
1	--- disppsct.c.orig 2003-09-03 18:23:08 UTC	1	--- disppsct.c.orig 2020-01-26 19:05:22 UTC
2	+++ disppsct.c	2	+++ disppsct.c
3	@@ -599,7 +599,7 @@ static char *make_label()	3	@@ -599,7 +599,7 @@ static char *make_label()
4	char *getenv();	4	char *getenv();




--- btnlib/border.c.orig	1995-05-04 17:21:13 UTC
+++ btnlib/border.c
@@ -35,6 +35,10 @@ static char SccsId[] = "%W%  %G%";
  * Note:	For each byte, bit 0 (0x01) appears on the left.
  * Note:	For each byte, bit 7 (0x80) appears on the right.
  */
+
+static unsigned char btn_ReverseByte();
+static void btn_MakeBdrLine();
+
 void btn_MakeBdrBitmap ( buttonmap, width, height, byte_width, form, inverse )
      unsigned char *buttonmap;	/* i,o: pointer to bitmap of button */
      int width, height;		/* i: dimensions of button window (to cover) */
@@ -52,8 +56,6 @@ void btn_MakeBdrBitmap ( buttonmap, widt
   int right_form_bit;		/* l: bit in first right form byte to use */
   int right_bdr_byte;		/* l: index of first line byte for right bdr */
   int right_bdr_bit;		/* l: bit in first line byte for right bdr */
-  static unsigned char btn_ReverseByte();
-  static void btn_MakeBdrLine();
 
   /* portion of pattern form used (clip overlap if button very small) */
   /* middle overlap on odd size counted for height, omitted for width */
@@ -119,6 +121,9 @@ void btn_MakeBdrBitmap ( buttonmap, widt
  * Subroutine:	btn_MakeBdrLine
  * Purpose:	set the bits for one line of the button's border
  */
+
+static void btn_RightBorder();
+
 static void btn_MakeBdrLine ( line, form, byte_width, inverse,
 			      right_bdr_byte, right_bdr_bit,
 			      right_form_byte, right_form_bit )
@@ -131,7 +136,6 @@ static void btn_MakeBdrLine ( line, form
      int right_bdr_byte;	/* l: index of first line byte for right bdr */
      int right_bdr_bit;		/* l: bit in first line byte for right bdr */
 {
-  static void btn_RightBorder();
   /* copy in top left, store reverse for top right */
   *line = *form;
   *(line+1) = *(++form);
--- btnlib/create.c.orig	1990-04-28 20:17:46 UTC
+++ btnlib/create.c
@@ -53,6 +53,9 @@ static GC def_gc = NULL;
  * Note:	Buttonboxes must later be combined into menus and panels
  * Note:	Call TouchButton to activate buttons and submenus when ready
  */
+
+static void btn_CreateWindows();
+
 ButtonBox MakeButtonBox ( parent, gc, visual, background, geo, defs, borders )
      BoxParent *parent;		/* i: Parent window info */
      GC gc;			/* i: graphics context for drawing labels */
@@ -70,7 +73,6 @@ ButtonBox MakeButtonBox ( parent, gc, vi
   int x, y;			/* l: coordinates of box in parent */
   int i;			/* l: loop counter */
   char *btn_Alloc();
-  static void btn_CreateWindows();
   void btn_LabelButtons(), btn_Dimensions();
 
   /* allocate the space for the new record */
--- btnlib/draw.c.orig	1991-06-21 23:40:21 UTC
+++ btnlib/draw.c
@@ -103,11 +103,13 @@ void btn_PutImage ( button, phase )
  * Xlib calls:	none
  * Method:	Dim this box and all co-menu boxes
  */
+
+static void btn_DimButtons();
+
 void btn_DelightButtons ( buttonbox )
      ButtonBox buttonbox;
 {
   int i;
-  static void btn_DimButtons();
 
   btn_DimButtons(buttonbox);
   for( i=0; i < buttonbox->co_menu_count; i++ ) {
@@ -153,11 +155,13 @@ static void btn_DimButtons ( buttonbox )
  * Uses:	btn_LightButtons() below
  * Xlib calls:	none
  */
+
+static void btn_LightButtons();
+
 void btn_RelightButtons ( buttonbox )
      ButtonBox buttonbox;
 {
   int i;
-  static void btn_LightButtons();
 
   btn_LightButtons(buttonbox);
   for( i=0; i < buttonbox->co_menu_count; i++ ) {
--- btnlib/event.c.orig	1995-05-04 17:27:33 UTC
+++ btnlib/event.c
@@ -52,12 +52,14 @@ static int select_size=0;
  *		with their active submenus.
  * Note:	Must be called with a buttonbox at the base of the menu tree
  */
+
+static int btn_Event();
+
 int ButtonEvent ( buttonbox, event )
      ButtonBox buttonbox;	/* i: top handle for button menu group */
      XEvent *event;		/* i: pointer to filled event record */
 {
   int i;			/* l: loop counter */
-  static int btn_Event();
 
   /* is the event in the primary buttonbox (or its sub-menus) */
   if( btn_Event(buttonbox, event) != 0 ) {
@@ -139,6 +141,10 @@ static int btn_Event ( buttonbox, event 
  *		with their active submenus.
  * Note:	Must be called with a buttonbox at the base of the menu tree
  */
+
+static int btn_Event();
+static int btn_Control();
+
 int ButtonControl ( buttonbox, event, response )
      ButtonBox buttonbox;	/* i: top handle for button menu group */
      XEvent *event;		/* i: pointer to filled event record */
@@ -147,8 +153,6 @@ int ButtonControl ( buttonbox, event, re
   int status;		/* o: reason for return code (-1,0,1) */
   int not_found;	/* l: event search status */
   int i;		/* l: loop counter */
-  static int btn_Event();
-  static int btn_Control();
 
   status = 1;
   *response = NULL;
@@ -206,6 +210,9 @@ int ButtonControl ( buttonbox, event, re
  *		until one fields it.  If still not, return NULL, else (it
  *		was fielded) get the next event and loop again.
  */
+
+static int btn_Event();
+
 static int btn_Control ( buttonbox, event, response )
      ButtonBox buttonbox;	/* i: top handle for button menu tree */
      XEvent *event;		/* i: pointer to filled event record */
@@ -218,7 +225,6 @@ static int btn_Control ( buttonbox, even
   int type;		/* l: temp for button response type */
   int id;		/* l: temp for button id */
   int mask[2];		/* l: temp store for select mask (select changes it) */
-  static int btn_Event();
   int btn_PushButton();
   void btn_PutImage(), btn_DrawButton(), btn_ReleaseButton();
 
--- btnlib/image.c.orig	1991-08-03 22:42:11 UTC
+++ btnlib/image.c
@@ -38,6 +38,9 @@ static char SccsId[] = "%W%  %G%";
  * Post-state:	off_out, off_in, on_out, on_in XImage's set in button record.
  * Exception:	Only labels present are installed.
  */
+
+static void btn_AddLabel();
+
 void btn_MakeXImages ( button, width, height, byte_width, visual,
 		       off_out, off_in, on_out, on_in, mapsz, off, on, motf )
      ButtonRecord *button;	/* i: main structure describing button */
@@ -56,7 +59,6 @@ void btn_MakeXImages ( button, width, he
   unsigned char *data;		/* l: pointer to bitmap currently processing */
   XImage *ximage;
   char *btn_Alloc();
-  static void btn_AddLabel();
 
 #ifdef ALLIANT
   extern int nbutton;
@@ -173,6 +175,9 @@ void btn_MakeXImages ( button, width, he
  * Exception:	Label is not stenciled if one dimension would be zero.
  * Method:	Get basic alignment parameters and call btn_StencilLabel();
  */
+
+static int btn_LabelX(), btn_LabelY();
+
 static void btn_AddLabel ( label, width, height, byte_width, bitmap, inverse )
      ButtonLabel *label;	/* i: record of label bitmap to stencil in */
      int width;			/* i: width in pixels of button */
@@ -185,7 +190,6 @@ static void btn_AddLabel ( label, width,
   int dst_x, dst_y;	/* l: coords of start of stencil in dst (button) */
   int xwdth;		/* l: width (cols) to stencil */
   int yhght;		/* l: number of lines (rows) to stencil */
-  static int btn_LabelX(), btn_LabelY();
   void btn_StencilLabel();
 
   if( ((xwdth = btn_LabelX(label, width, &src_x, &dst_x)) > 0) &&
--- btnlib/label.c.orig	1995-05-04 17:19:37 UTC
+++ btnlib/label.c
@@ -42,6 +42,10 @@ static unsigned char lmask[8] = { 0x01,0
  * Note:	For each byte, bit 0 (0x01) appears on the left.
  * Note:	For each byte, bit 7 (0x80) appears on the right.
  */
+
+static void btn_Stencil(), btn_StencilInv();
+static void btn_StencilAlligned(),btn_StencilAllignedInv();
+
 void btn_StencilLabel ( src, msk, dst, src_byte_width, dst_byte_width,
 		        src_x, src_y, dst_x, dst_y, width, height, inverse )
      unsigned char *src;	/* i: ptr to first byte of pattern */
@@ -66,9 +70,6 @@ void btn_StencilLabel ( src, msk, dst, s
   int first_mask;		/* l: bit mask, with coded sign (see above) */
   int last_mask;		/* l: bit mask, with coded sign (see above) */
 
-  static void btn_Stencil(), btn_StencilInv();
-  static void btn_StencilAlligned(),btn_StencilAllignedInv();
-
   /* advance src and msk to their first used bytes */
   byte_offset = (src_y * src_byte_width) + (src_x / 8);
   src += byte_offset;
--- btnlib/mount.c.orig	1990-04-20 21:56:27 UTC
+++ btnlib/mount.c
@@ -35,11 +35,13 @@ static char SccsId[] = "%W%  %G%";
  * Xlib calls:	none
  * Note:	This routine moves latterally to cover co-menus
  */
+
+static void btn_MapButtonbox();
+
 void MountButtonMenu ( buttonbox )
      ButtonBox buttonbox;
 {
   int i;
-  static void btn_MapButtonbox();
 
   btn_MapButtonbox(buttonbox);
   for( i = 0; i < buttonbox->co_menu_count; i++ )
@@ -109,6 +111,9 @@ static void btn_UnmapButtonbox ( buttonb
  *		map submenus of new button.
  * Note:	Unmapping submenus is harmless if they were not mapped.
  */
+
+static void btn_UnmapButtonbox(), btn_MapButtonbox();
+
 void btn_ReplaceSubmenus ( buttonbox, btn, op_num, mapping )
      ButtonBox buttonbox;
      int btn;
@@ -116,7 +121,6 @@ void btn_ReplaceSubmenus ( buttonbox, bt
      int mapping;		/* i: switch allows suppression of mapping */
 {
   int i;
-  static void btn_UnmapButtonbox(), btn_MapButtonbox();
 
   /* clear out the old submenus */
   for( i=0; i < buttonbox->submenu_count; i++ )
@@ -149,6 +153,9 @@ void btn_ReplaceSubmenus ( buttonbox, bt
  * Note:	Requires search through co-menus
  * Note:	Unmapping cosubmenus is harmless if they were not mapped.
  */
+
+static void btn_UnmapButtonbox(), btn_MapButtonbox();
+
 void btn_ReplaceCosubmenus ( buttonbox, btn, op_num, mapping )
      ButtonBox buttonbox;
      int btn;
@@ -156,7 +163,6 @@ void btn_ReplaceCosubmenus ( buttonbox, 
      int mapping;		/* i: switch allows suppression of mapping */
 {
   int i, j;
-  static void btn_UnmapButtonbox(), btn_MapButtonbox();
 
   /* check to see if we have the co-mode submenus */
   if( buttonbox->cosubmenu_count > 0 ) {
--- btnlib/resize.c.orig	1990-04-20 22:15:57 UTC
+++ btnlib/resize.c
@@ -33,12 +33,14 @@ static char SccsId[] = "%W%  %G%";
  * Post-state:	All buttonboxes having given parent are resized to fill
  * Method:	Call btn_ChkResize with this menu and then its co-menus.
  */
+
+static void btn_ChkResize();
+
 void ResizeButtons ( buttonbox, parent )
      ButtonBox buttonbox;	/* i: top handle for button menu group */
      BoxParent *parent;		/* i: record describing parent window */
 {
   int i;		/* l: loop counter */
-  static void btn_ChkResize();
 
   /* check this buttonbox */
   btn_ChkResize(buttonbox, parent);
--- clralloc.c.orig	1999-05-12 18:40:45 UTC
+++ clralloc.c
@@ -39,12 +39,14 @@ static unsigned long overlay_mask;	/* fo
  * Method:	Try for at least min cells in default colormap, if failed
  *		try to create a private colormap.
  */
+
+static Colormap create_colormap();
+static int alloc_color_cells();
+
 int alloc_colors( color )
      struct colorRec *color;
 {
   int verify_pseudocolor();
-  static Colormap create_colormap();
-  static int alloc_color_cells();
 
   if( (color->map.default_permit != NO) &&
       (color->map.default_enable == YES) &&
--- clrctrl.c.orig	1990-04-20 14:43:37 UTC
+++ clrctrl.c
@@ -36,13 +36,15 @@ extern struct cgraphRec cgraph;
  * Subroutine:	select_color
  * Purpose:	Things to do when a buttonbox color menu button is selected
  */
+
+static void new_color_table();
+
 void select_color ( )
 {
   static int overlay = 0;
   static int cells = 0;
   static int mode = VOP_PseudoColor;
   void invert_rgb(), reinit_color();
-  static void new_color_table();
 
   if( control.response[0] == VOP ) {
     switch( control.response[1] ) {
@@ -218,10 +220,12 @@ static void new_color_table ( map_code )
  * Purpose:	Reverse all colors at once (respond to invert button)
  * Xlib call:	XStoreColors()
  */
+
+static void invert_table();
+
 void invert_rgb ( )
 {
   void make_cellstore_from_cellmaps(), draw_cgraph();
-  static void invert_table();
 
   /* invert color tables and remake storemap */
   invert_table(&color.ctable.red);
--- clrhard.c.orig	1990-04-20 13:54:21 UTC
+++ clrhard.c
@@ -29,11 +29,13 @@ static char SccsId[] = "%W%  %G%";
  * Subroutine:	init_hard_colors
  * Purpose:	Set up basic hardware colors
  */
+
+static int get_hard_color();
+
 void init_hard_colors ( color, colormap )
      struct colorRec *color;
      Colormap colormap;
 {
-  static int get_hard_color();
 
   color->hard.red =
     get_hard_color(color->display, colormap, "red", 63000, 0, 0);
@@ -58,12 +60,14 @@ void init_hard_colors ( color, colormap 
  * Subroutine:	lookup_cursor_colors
  * Purpose:	Get color parameters from named cursor colors
  */
+
+static void lookup_color();
+
 void lookup_cursor_colors ( color, colormap, init )
      struct colorRec *color;
      Colormap colormap;
      int init;
 {
-  static void lookup_color();
 
   /* update xcolor structs if needed */
   if( init || (color->cur.desired_cur != NULL) ) {
@@ -90,12 +94,14 @@ void lookup_cursor_colors ( color, color
  * Pre-state:	XColor for cur, one, and two, initialized
  * Post-state:	Pixel values for one and two set, that for cur returned.
  */
+
+static int alloc_hard_color();
+
 int alloc_cursor_cell_color ( color, colormap )
      struct colorRec *color;
      Colormap colormap;
 {
   int val;
-  static int alloc_hard_color();
 
   if( (color->cur.disp_one =
       alloc_hard_color(color->display, colormap, &color->cur.color_one)) < 0 )
@@ -113,10 +119,12 @@ int alloc_cursor_cell_color ( color, col
  * Subroutine:	free_cursor_cell_color
  * Purpose:	Free cell color overlay colors
  */
+
+static void free_readonly_color();
+
 void free_cursor_cell_color ( color )
      struct colorRec *color;
 {
-  static void free_readonly_color();
 
   free_readonly_color(color, (int)color->cur.color_one.pixel);
   free_readonly_color(color, (int)color->cur.color_two.pixel);
--- clrinit.c.orig	2001-12-14 23:17:55 UTC
+++ clrinit.c
@@ -38,6 +38,9 @@ static Display *display;
  * Subroutine:	init_color
  * Purpose:	Claim and set up colors (and do any needed initial work)
  */
+
+static int init_visual();
+
 void init_color ( color, init )
      struct colorRec *color;
      int init;
@@ -46,7 +49,6 @@ void init_color ( color, init )
   void exit_errmsg(), init_hard_colors(), init_halftone();
   void free_color_cells(), lookup_cursor_colors(), free_cursor_cell_color();
   void init_overlay_color(), init_cell_color(), init_halftone_color();
-  static int init_visual();
 
   if( init ) {
     display = color->display;
--- clrmenu.c.orig	1990-04-28 22:40:14 UTC
+++ clrmenu.c
@@ -35,14 +35,16 @@ EditStruct *color_edit;	/* key to popup 
  * Purpose:	Get a new pre-defined color table and load it for use
  * Returns:	1 if succeeded, else 0
  */
+
+static void load_newtable(), write_color_file();
+static ColorTable *read_color_file();
+
 int fetch_colortable ( color, table_code, imagefile )
      struct colorRec *color;
      int table_code;
      char *imagefile;		/* i: imagefile name to print in output file */
 {
   ColorTable *newtable;
-  static void load_newtable(), write_color_file();
-  static ColorTable *read_color_file();
 
   switch( table_code ) {
   case MOP_Init_A:
@@ -111,13 +113,15 @@ static ColorTable *read_color_file ( )
  * Subroutine: write_color_file
  * Purpose:    Open and write a color table file
  */
+
+static void print_one_color();
+
 static void write_color_file ( imagefile, color )
      char *imagefile;
      struct colorRec *color;
 {
   FILE *fp;
   int error;
-  static void print_one_color();
   EditStruct *init_edit_popup();
   int open_output_file();
   void timestamp();
@@ -189,11 +193,13 @@ static void print_one_color ( fp, table 
  * Subroutine:	load_newtable
  * Purpose:	Load an internally stored color table for use
  */
+
+static void load_subtable();
+
 static void load_newtable ( ctable, new )
      struct colorTable *ctable;
      ColorTable *new;
 {
-  static void load_subtable();
 
   load_subtable(&ctable->red, &new->red);
   load_subtable(&ctable->green, &new->green);
--- clrread.c.orig	1990-04-28 23:30:35 UTC
+++ clrread.c
@@ -25,6 +25,9 @@ static char SccsId[] = "%W%  %G%";
  * Subroutine:	parse_color_file
  * Purpose:	Parse values after color identifier
  */
+
+static int parse_color_table(), advance_to_ascii();
+
 int parse_color_file ( fp, ctable, max_entries )
      ColorTable *ctable;
      int max_entries;
@@ -35,7 +38,6 @@ int parse_color_file ( fp, ctable, max_e
   char line[SZ_LINE];
   char cbuf[SZ_LINE];
   struct SubTable *table;
-  static int parse_color_table(), advance_to_ascii();
 
   line_num = 0;
   /* advance to first non-comment line */
@@ -95,6 +97,9 @@ int parse_color_file ( fp, ctable, max_e
  * Purpose:	Read color table entries for one color
  * Note:	Values may start with word "gamma" and its value
  */
+
+static int advance_to_ascii(), prep_alpha();
+
 static int parse_color_table ( fp, line, cbuf, i, len, line_num,
 			       farb, max_entries, color_cnt )
      FILE *fp;
@@ -110,7 +115,6 @@ static int parse_color_table ( fp, line,
   float level, intensity;
   char *level_token, *intensity_token;
   int status, entry;
-  static int advance_to_ascii(), prep_alpha();
   int check_parens();
   char *next_token();
 
@@ -227,6 +231,9 @@ static int parse_color_table ( fp, line,
  *		Negative val if string starts with a number or paren
  *		0 if file ended, or first character was neither char nor num
  */
+
+static int find_token(), prep_alpha();
+
 static int advance_to_ascii ( fp, line, scratch, len, line_num, dont_end )
      FILE *fp;		/* i: file descriptor */
      char *line;	/* i: buffer to get entire line */
@@ -236,7 +243,6 @@ static int advance_to_ascii ( fp, line, 
      int dont_end;	/* flag that more is definitely expected */
 {
   int i;
-  static int find_token(), prep_alpha();
   int check_parens();
 
   /* advance to first non-comment line */
--- clrsetup.c.orig	1990-06-03 04:07:29 UTC
+++ clrsetup.c
@@ -29,12 +29,14 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Set up color parameters unique to overlay type usage
  * Xlib calls:	XStoreColors()
  */
+
+static void set_cursor_overlay_color(), copy_xcolor_rgb(), init_cellstore();
+
 void init_overlay_color ( color )
      struct colorRec *color;
 {
   int ncolors;
   void make_cellstore_from_tables();
-  static void set_cursor_overlay_color(), copy_xcolor_rgb(), init_cellstore();
 
   init_cellstore(color->cellstore, color->pixvalmap, color->ncolors);
   /* color in the cursor range of the color map */
@@ -75,12 +77,14 @@ void init_overlay_color ( color )
  * Purpose:	Set up color parameters unique to cell usage without overlay
  * Xlib calls:	XStoreColors()
  */
+
+static void init_cellstore();
+
 void init_cell_color ( color )
      struct colorRec *color;
 {
   void make_cellstore_from_tables();
   int alloc_cursor_cell_color();
-  static void init_cellstore();
 
   init_cellstore(color->cellstore, color->pixvalmap, color->ncolors);
   /* Not cursor plane */
--- clrvary.c.orig	1990-04-20 13:57:20 UTC
+++ clrvary.c
@@ -130,6 +130,9 @@ void vary_colors ( event, mode, track, x
  * Subroutine:	vary_contrast_and_bias
  * Purpose:	change color table cell_levels as per new contrast and bias
  */
+
+static void invert_table();
+
 void vary_contrast_and_bias ( table, contrast, bias )
      struct subtableRec *table;
      double contrast;		/* i: normal = 1.0 */
@@ -137,7 +140,6 @@ void vary_contrast_and_bias ( table, con
 {
   double *base_level, *cell_level;
   int vertex_cnt;
-  static void invert_table();
 
   base_level = table->base_level;
   cell_level = table->cell_level;
--- cmdnew.c.orig	1997-06-06 14:52:04 UTC
+++ cmdnew.c
@@ -73,9 +73,11 @@ static char *prompt = "Enter new image f
  * Called by:	key_response() in MainKey.c
  * Called by:	select_environment() in MainSelect.c
  */
+
+static int new_command();
+
 void get_new_cmd ( )
 {
-  static int new_command();
   int get_edit_input();
   EditStruct *init_edit_popup();
 
@@ -95,6 +97,11 @@ void get_new_cmd ( )
  * Purpose:	Given a new command line, parse it and do what is called for
  * Returns:	1 = success, 0 = user decided not to do anything, -1 = error
  */
+
+static char **make_argv();
+static int new_file(), form_tokens();
+static void redo_displays(), clear_params(), reset_dispparams(), free_argv();
+
 static int new_command ( input_line )
      char *input_line;
 {
@@ -104,9 +111,6 @@ static int new_command ( input_line )
   int headersize;
   int parse_cmdline(), check_image();
   void reinit_color(), redraw_magnifier(), touch_submenu_button();
-  static char **make_argv();
-  static int new_file(), form_tokens();
-  static void redo_displays(), clear_params(), reset_dispparams(), free_argv();
 
   /* store some key initial values */
   headersize = img.headersize;
--- cmdparse.c.orig	2002-04-08 19:26:55 UTC
+++ cmdparse.c
@@ -47,6 +47,9 @@ extern int bad_buttons;
  * Purpose:	Process options to set filename and change defaults
  * Returns:	-1 on error, 0 OK but no filename, 1 OK and new filename given
  */
+
+static int parse_etc();
+
 int parse_cmdline ( argc, argv, displayname )
      int argc;
      char *argv[];
@@ -58,7 +61,6 @@ int parse_cmdline ( argc, argv, displayn
   int parse_rotate(), parse_scale(), parse_color(), parse_fileread(), usage();
   int parse_cursor();
   void init_cmdline();
-  static int parse_etc();
 
   if( displayname != NULL ) {
     /* if initial program command line, strip off program name, store line */
--- crdinvrt.c.orig	1990-04-20 14:00:26 UTC
+++ crdinvrt.c
@@ -28,12 +28,14 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Compute parameters of the inverse transform
  * Method:	Uses LU decomposition method
  */
+
+static void lu_decompose(), lu_backsub();
+
 void invert_matrix ( old, new )
      Transform *old, *new;
 {
   float scratch[3][3], column[3];
   int pivots[3];
-  static void lu_decompose(), lu_backsub();
 
   scratch[0][0] = old->inx_outx;
   scratch[1][0] = old->iny_outx;
@@ -65,13 +67,15 @@ void invert_matrix ( old, new )
  * Purpose:	Compute the offsets used for integer transforms
  * Method:	Uses matrix inversion
  */
+
+static void lu_decompose(), lu_backsub();
+
 void compute_iadd_invert ( old, new, ioff )
      Transform *old, *new;
      float ioff;
 {
   float scratch[3][3], column[3];
   int pivots[3];
-  static void lu_decompose(), lu_backsub();
 
   /* set transform equations in matrix form */
   scratch[0][0] = old->inx_outx;
--- crdrot.c.orig	1990-04-20 14:00:51 UTC
+++ crdrot.c
@@ -55,6 +55,9 @@ static char SccsId[] = "%W%  %G%";
  * As each transform is applied to the front, we apply them in reverse order
  *  the result is, from img->A,B,C,imgtofile(as given)->file
  */
+
+static void move_mtrx(), flip_mtrx(), turn_mtrx();
+
 void rotate_transform ( img, imgtofile, flip, rotcode )
      Coordsys *img;
      Transform *imgtofile;
@@ -63,7 +66,6 @@ void rotate_transform ( img, imgtofile, 
 {
   double xmove, ymove;
   int angle;
-  static void move_mtrx(), flip_mtrx(), turn_mtrx();
 
   /* if no rotation, do nothing */
   if( (rotcode == 0) && (flip == 0) ) return;
@@ -93,6 +95,9 @@ void rotate_transform ( img, imgtofile, 
  * Note:	ioff is not used for turn or flip, as it is assumed that both
  * 		will be bracketed between two moves (to place origin at center)
  */
+
+static void mult_mtrx();
+
 static void move_mtrx ( mtrx, xtran, ytran, ioff, prior )
      Transform *mtrx;
      double xtran, ytran;
@@ -100,7 +105,6 @@ static void move_mtrx ( mtrx, xtran, ytr
      int prior;
 {
   Transform translate;
-  static void mult_mtrx();
 
   bzero((char *)(&translate), sizeof(Transform));
   translate.inx_outx = 1.0;
@@ -119,12 +123,14 @@ static void move_mtrx ( mtrx, xtran, ytr
  * Subroutine:	flip_mtrx
  * Purpose:	Apply a mirror reflection to the passed Transform
  */
+
+static void mult_mtrx();
+
 static void flip_mtrx ( mtrx, prior )
      Transform *mtrx;
      int prior;		/* i: 1: move, transform, move, 0: transform, move */
 {
   Transform reflect;
-  static void mult_mtrx();
 
   bzero((char *)(&reflect), sizeof(Transform));
   reflect.inx_outx = 1.0;
@@ -141,6 +147,9 @@ static void flip_mtrx ( mtrx, prior )
  * Note:	the pivot is 0,0 of the passed Transform's coordinate system
  * Exception:	only multiples of 90 degrees are allowed
  */
+
+static void mult_mtrx();
+
 static void turn_mtrx ( mtrx, angle, prior )
      Transform *mtrx;
      int angle;
@@ -148,7 +157,6 @@ static void turn_mtrx ( mtrx, angle, pri
 {
   Transform rotate;
   void exit_errmsg();
-  static void mult_mtrx();
 
   while( angle >= 360 ) angle -= 360;
   while( angle < 0 ) angle += 360;
--- crdsynth.c.orig	1990-04-20 14:01:55 UTC
+++ crdsynth.c
@@ -147,11 +147,13 @@ void combine_transform ( new, first, sec
  * Subroutine:	set_trans_speed
  * Purpose:	Set parameters for fast integer computation
  */
+
+static int integer_test();
+
 void set_trans_speed ( trans )
      Transform *trans;
 {
   int xzm, yzm;
-  static int integer_test();
 
   trans->ixzoom = 0;
   trans->iyzoom = 0;
--- crdtemp.c.orig	1996-02-26 20:14:19 UTC
+++ crdtemp.c
@@ -126,6 +126,9 @@ void set_disptran ( coord )
  * Purpose:	set up zoom given edges of desired display and
  *		appropriate img transform
  */
+
+static int choose_zoom();
+
 void panedge_zoom ( coord, wintoimgtrans, win_x, win_y )
      struct coordRec *coord;	/* i: collected coords */
      Transform *wintoimgtrans;	/* i: transform from mouse's window to img */
@@ -134,7 +137,6 @@ void panedge_zoom ( coord, wintoimgtrans
   float imgX, imgY;
   int box_width, box_height;
   void i_transform();
-  static int choose_zoom();
 
   /* calculate image coordinates of win_x and win_y */
   i_transform(wintoimgtrans, win_x, win_y, &imgX, &imgY);
--- csrarea.c.orig	1990-04-20 14:07:03 UTC
+++ csrarea.c
@@ -28,13 +28,15 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Calculate area, in float units file pixels, enclosed by cursor
  * Method:	Use mathematical formula appropriate to cursor type
  */
+
+static int test_cross();
+
 double cursor_area ( cursor, user_info )
      struct cursorRec *cursor;
      int user_info;		/* flag, data is for user info */
 {
   double area;
   int i, j;
-  static int test_cross();
 
   switch( cursor->type ) {
   case COP_Circle:
@@ -83,13 +85,15 @@ static double x11, y11, x12, y12;
  *		are not tested since neighbors cannot cross but neighbors do
  *		share a common point.
  */
+
+static int intercept();
+
 static int test_cross ( pt, cnt, j, i )
      PolyPoint *pt;	/* list of vertices */
      int cnt;		/* number of vertices */
      int j, i;		/* two vertices at ends of edge being tested */
 {
   int k;
-  static int intercept();
 
   if( (i+2) >= cnt ) {
     return( 0 );
--- csrgrab.c.orig	1990-04-20 14:08:42 UTC
+++ csrgrab.c
@@ -38,12 +38,14 @@ extern struct colorRec color;	/* need to
  * Purpose:	Change size of cursor to intersect current mouse cursor
  *		while keeping aspect ratio of cursor constant
  */
+
+static void size_annulus(), grab_annulus();
+
 void size_annuli ( cursor, event )
      struct cursorRec *cursor;
      XEvent *event;		/* i: event for location of mouse */
 {
   void draw_cursor(), make_cursor();
-  static void size_annulus(), grab_annulus();
 
   /* if this event is initiating tracking, don't erase the cursor */
   if( event->type == MotionNotify )
@@ -64,13 +66,15 @@ void size_annuli ( cursor, event )
  * Purpose:	Respond to a mouse request to delete an annulus
  *
  */
+
+static int on_annulus();
+static void size_annulus(), remove_annulus();
+
 void delete_annulus ( cursor, event )
      struct cursorRec *cursor;
      XEvent *event;		/* i: XMotionEvent or XButtonEvent */
 {
   struct cursorRec *parent;
-  static int on_annulus();
-  static void size_annulus(), remove_annulus();
 
   /* if there are two or more annuli */
   if( (cursor->next_annulus != 0) &&
@@ -169,14 +173,16 @@ static void remove_annulus ( parent )
  * Purpose:	Set up cursor to for a size annulus interaction
  * Called by:	size_annuli()
  */
+
+static int on_annulus();
+static void remove_annulus();
+
 static void grab_annulus ( cursor )
      struct cursorRec *cursor;
 {
   double inc;
   int code;
   struct cursorRec *parent, *annulus;
-  static int on_annulus();
-  static void remove_annulus();
 
   code = on_annulus(cursor, &parent);
   /* decide what to draw */
--- csrpoly1.c.orig	1990-04-20 14:11:54 UTC
+++ csrpoly1.c
@@ -36,6 +36,9 @@ extern struct colorRec color;	/* need to
  *		Used when initiating a move or size action
  * Called by:	control_cursor() in CursorCtrl.c
  */
+
+static int on_polygon_vertex();
+
 void grab_polygon_vertex ( cursor, event, size )
      struct cursorRec *cursor;
      XEvent *event;		/* i: XbuttonEvent (ButtonPress) for x & y */
@@ -45,7 +48,6 @@ void grab_polygon_vertex ( cursor, event
   int pt;			/* l: index of polygon vertex */
   int closest_polygon_line();
   void draw_cursor(), add_polygon_vertex();
-  static int on_polygon_vertex();
 
   /* erase existing cursor */
   draw_cursor(cursor, &color.gcset.undraw);
@@ -84,13 +86,15 @@ void grab_polygon_vertex ( cursor, event
  * Returns:	1 if image must be redrawn, else 0
  * Called by:	control_cursor() in CursorCtrl.c
  */
+
+static int on_polygon_vertex();
+
 int request_delete_polygon_vertex ( cursor, event )
      struct cursorRec *cursor;
      XEvent *event;		/* i: XbuttonEvent (ButtonPress) for x & y */
 {
   int i;
   void delete_polygon_vertex(), draw_cursor();
-  static int on_polygon_vertex();
 
   i = on_polygon_vertex((int)event->xbutton.x, (int)event->xbutton.y,
 			cursor->points, cursor->poly_cnt);
--- csrpoly2.c.orig	1998-07-09 16:29:27 UTC
+++ csrpoly2.c
@@ -72,12 +72,14 @@ void collapse_polygon ( cursor )
  * Subroutine:	start_polygon
  * Purpose:	Install polygon drawing stuff for the active cursor
  */
+
+static void init_polygon();
+
 void start_polygon ( cursor, coord )
      struct cursorRec *cursor;
      struct coordRec *coord;
 {
   void set_polygon_from_file_coords();
-  static void init_polygon();
 
   if( polysz == 0 )
     init_polygon();
--- csrpoly3.c.orig	1990-04-20 14:11:40 UTC
+++ csrpoly3.c
@@ -28,6 +28,9 @@ static char SccsId[] = "%W%  %G%";
  *		vector from pointer to closest point on segment
  * Method:	top down search
  */
+
+static double distance_from_segment(), cos_to_segment();
+
 int closest_polygon_line ( x, y, vertex, cnt )
      int x, y;
      XPoint *vertex;
@@ -38,7 +41,6 @@ int closest_polygon_line ( x, y, vertex,
   int min_endpoint, endpoint;
   int min_j;
   int i, j;
-  static double distance_from_segment(), cos_to_segment();
 
   min_distance = 1.0E30;
   min_j = 0;
--- csrshape.c.orig	1998-10-19 18:46:41 UTC
+++ csrshape.c
@@ -31,9 +31,6 @@ static char SccsId[] = "%W%  %G%";
 
 #include "defs/circle.def"	/*  Define Unit_circles  */
 
-#ifdef ANSIC
-/*  Exported declarations must be centralized before ANSI C can be used  */
-
 void		make_cursor(	struct cursorRec *cursor);
 static int	make_arrow(	double xtip, double ytip, double xray,
 				double rotsin, double rotcos, XPoint *points);
@@ -41,28 +38,20 @@ static int	make_boxcur(	double xcen, dou
 				double xray, double yray,
 				double rotsin, double rotcos, XPoint *points);
 static int	make_circur(	double xcen, double ycen, double radius,
-				XPoint *points )
+				XPoint *points );
 static int	make_sqrcur(	double xcen, double ycen, double radius,
-				XPoint *points )
+				XPoint *points );
 static int	make_diacur(	double xcen, double ycen, double radius,
-				XPoint *points )
+				XPoint *points );
 static int	make_crosscur(	double xcen, double ycen, double radius,
-				XPoint *points )
+				XPoint *points );
 static int	make_excur(	double xcen, double ycen, double radius,
-				XPoint *points )
+				XPoint *points );
 static int	make_ellipse(	double xcen, double ycen,
 				double xradius, double yradius,
 				double rotsin, double rotcos, XPoint *points);
 static int	make_piecur(	double xcen, double ycen, double radius,
-				XPoint *points )
-
-#else
-
-  static int make_arrow(), make_boxcur(), make_circur();
-  static int make_ellipse(), make_piecur();
-
-#endif
-
+				XPoint *points );
 
 /*  Declare and initialize drawing tools  */
 double *UnitPieX = Circle12X;
--- ctrlcntn.c.orig	1998-07-09 16:29:00 UTC
+++ ctrlcntn.c
@@ -61,6 +61,9 @@ void init_connections ()
  * Purpose:	Open a connection to a remote process and update event handlers
  * Returns:	-1 on failure, else IPC number
  */
+
+static void init_select();
+
 int open_connection ( connection )
      struct connectRec *connection;
 {
@@ -71,7 +74,6 @@ int open_connection ( connection )
   extern int ButtonSelectMask(), open_pipe();
   extern int open_socket_listener();
   extern struct connectRec *accept_socket_connection();
-  static void init_select();
 #endif
 
 #ifdef NOPIPEFLUSH
--- ctrlfile.c.orig	1990-04-20 13:49:12 UTC
+++ ctrlfile.c
@@ -40,6 +40,9 @@ extern int errno;
  * Post state:	Sets pointer to file, open and ready for writing
  * Returns:	2 = append, 1 = new file, 0 = user decided not to, -1 = error
  */
+
+static int file_exists();
+
 int open_output_file ( fd, edit, one_popup_row, prompt )
      FILE **fd;
      EditStruct *edit;
@@ -56,7 +59,6 @@ int open_output_file ( fd, edit, one_pop
   int get_edit_input();
   EditStruct *init_edit_popup();
   void clear_edit_buf(), unmap_popwin();
-  static int file_exists();
 
   open_type[0] = 0;
   if( (get_edit_input(edit, one_popup_row, 1, 0, prompt) <= 0) ||
@@ -137,6 +139,9 @@ int open_output_file ( fd, edit, one_pop
  * Note:	Sets pointer of file open and ready for reading
  * Returns:	1 on success, 0 if user decided not to, -1 on error
  */
+
+static int file_exists();
+
 int open_input_file ( fd, edit, one_popup_row, prompt )
      FILE **fd;
      EditStruct *edit;
@@ -146,7 +151,6 @@ int open_input_file ( fd, edit, one_popu
   char filename[132];
   int exist;
   int get_edit_input();
-  static int file_exists();
 
   if( get_edit_input(edit, one_popup_row, 1, 1, prompt) <= 0 )
     return( 0 );
--- ctrlgc.c.orig	1990-05-02 08:19:55 UTC
+++ ctrlgc.c
@@ -237,10 +237,12 @@ GC set_edit_gc ( font, foreground, backg
  * Subroutine:	get_fontstruct
  * Returns:	Pointer to the specified fontstruct
  */
+
+static int init_font();
+
 XFontStruct *get_fontstruct ( app_code )
      int app_code;	/* i: see comments above */
 {
-  static int init_font();
 
   if( (app_font[app_code] == NULL) && (init_font(app_code) == NULL) )
     return( NULL );
@@ -253,11 +255,13 @@ XFontStruct *get_fontstruct ( app_code )
  * Purpose:	Load the fonts used by this program
  * Returns:	Font on success, else 0
  */
+
+static int open_font();
+
 static int init_font ( app_code )
      int app_code;	/* i: font application type index */
 {
   int i, name_index;
-  static int open_font();
 
   for( i=0; i<OPTION_COUNT; i++ ) {
     name_index = preference[app_code][i];
--- dispblnk.c.orig	1990-04-20 14:23:14 UTC
+++ dispblnk.c
@@ -181,13 +181,15 @@ static int display_blink ( index )
  * For each button release, if it is on top of stack, release it and display
  *  one below, else just release it
  */
+
+static int display_blink();
+
 void control_blink ()
 {
   static int oldmode;
   static int buttons = 0;
   static int btnstack[4];
   int i;
-  static int display_blink();
 
   if( control.event.type == ButtonPress ) {
     /* don't respond if it's with a meta key (window resize) */
--- dispbtmp.c.orig	1991-06-21 22:58:15 UTC
+++ dispbtmp.c
@@ -55,9 +55,11 @@ void init_halftone ()
  * Subroutine:	select_halftone
  * Purpose:	Respond to halftone selection command
  */
+
+static void new_halftone();
+
 void select_halftone ()
 {
-  static void new_halftone();
 
   switch( control.response[1] ) {
   case 0:
--- editctrl.c.orig	1990-06-03 04:07:48 UTC
+++ editctrl.c
@@ -61,6 +61,9 @@ extern int  XZ_efn;
  * Subroutine:	init_edit_popup
  * Purpose:	Get everything ready for running editor sessions
  */
+
+static void init_popwin();
+
 EditStruct *init_edit_popup ( string, max_chars )
      char *string;
      int max_chars;
@@ -69,7 +72,6 @@ EditStruct *init_edit_popup ( string, ma
   int len;
   EditStruct *get_edit_struct();
   void init_edit_struct(), load_edit_struct();
-  static void init_popwin();
 
   if( init_window ) {
     init_popwin(color.gcset.menu.foreground, color.gcset.menu.background);
@@ -91,6 +93,9 @@ EditStruct *init_edit_popup ( string, ma
  *		(but expose is fielded and configure is saved for end).
  * Returns:	1 if user returns with a response, 0 if user cancels session
  */
+
+static void map_popwin();
+
 int get_edit_input ( edit, one_row, map, unmap, prompt )
      EditStruct *edit;
      int one_row;	/* i: put-edit-after-prompt-on-same-line */
@@ -104,7 +109,6 @@ int get_edit_input ( edit, one_row, map,
   int emacs_response();
   void draw_new_string(), redraw_edit_string();
   void adjust_desktop(), redraw_window(), unmap_popwin();
-  static void map_popwin();
 
   map_popwin(edit, one_row, prompt, map);
   if( !map ) {
--- grphbtmp.c.orig	1990-04-20 14:31:04 UTC
+++ grphbtmp.c
@@ -27,6 +27,9 @@ extern struct colorRec color;
  * Subroutine:	make_halftone_panimage
  * Purpose:	Make halftone bitmap for pan window (panbox)
  */
+
+static void byte_dither_sample(), byte_diffuse_sample();
+
 void make_halftone_colorbar ( bytedata, bitdata,
 			      width, height, bytes_per_line )
      unsigned char *bytedata;
@@ -34,7 +37,6 @@ void make_halftone_colorbar ( bytedata, 
      int width, height;
      int bytes_per_line;
 {
-  static void byte_dither_sample(), byte_diffuse_sample();
 
   bzero((char *)bitdata, bytes_per_line * height);
   if( color.halftone.mode == BOP_Dither ) {
--- grphgrab.c.orig	1990-04-20 14:33:27 UTC
+++ grphgrab.c
@@ -30,10 +30,12 @@ extern struct cgraphRec cgraph;
  * Subroutine:	grab_cgraph_vertex
  * Purpose:	When a mouse button is pressed, assign a vertex to that button
  */
+
+static void get_color_vertex();
+
 void get_cgraph_vertex ( event )
      XEvent *event;
 {
-  static void get_color_vertex();
 
   switch( event->xbutton.button ) {
   case Button1:
@@ -58,10 +60,12 @@ void get_cgraph_vertex ( event )
  *		event
  * Returns:	1 if a vertex was dropped, else 0
  */
+
+static int drop_color_vertex();
+
 int drop_cgraph_vertex ( event )
      XEvent *event;
 {
-  static int drop_color_vertex();
 
   switch( event->xbutton.button ) {
   case Button1:
@@ -83,13 +87,15 @@ int drop_cgraph_vertex ( event )
  * Purpose:	Handle grab vertex event for single color 
  * Method:	Grab old vertex or make new vertex - under mouse pointer
  */
+
+static int grab_old_color_vertex();
+static void install_new_color_vertex();
+
 static void get_color_vertex ( x, y, col )
      int x, y;
      struct colgRec *col;
 {
   void install_draw_queue_end();
-  static int grab_old_color_vertex();
-  static void install_new_color_vertex();
 
   /* clip against limits */
   if( x < cgraph.graph.xzero )
@@ -151,6 +157,9 @@ static int grab_old_color_vertex ( x, y,
  * Subroutine:	install_new_color_vertex
  * Purpose:	Given hash position, install a new vertex, and make active
  */
+
+static void add_color_vertex(), add_color_vertex_hash();
+
 static void install_new_color_vertex ( x, y, col )
      int x, y;			/* i: position of ULcorner of new hash mark */
      struct colgRec *col;	/* i: color info structure for one color */
@@ -158,7 +167,6 @@ static void install_new_color_vertex ( x
   double intensity, cell_level;
   int match;
   int select_best_hash_position();
-  static void add_color_vertex(), add_color_vertex_hash();
 
   col->active_hash = select_best_hash_position(x, y, col->hash, col->hash_cnt,
 					       &match, cgraph.vertical);
@@ -251,11 +259,13 @@ static void add_color_vertex_hash ( col,
  * Purpose:	Delete a color table vertex if one is under the mouse position
  * Returns:	1 if vertex was dropped, else 0
  */
+
+  static int grab_old_color_vertex();
+
 static int drop_color_vertex ( col, x, y )
      struct colgRec *col;
      int x, y;
 {
-  static int grab_old_color_vertex();
 
   /* hash mark positions are upper left corner of hash box */
   x -= HASH_RAY;
--- grphinit.c.orig	1990-04-20 14:40:44 UTC
+++ grphinit.c
@@ -46,9 +46,11 @@ extern int  XZ_efn;
  * Subroutine:	init_colorbox
  * Purpose:	Handle program init-time color bar and graph initialization
  */
+
+static void init_main_colorbar();
+
 void init_colorbox ( )
 {
-  static void init_main_colorbar();
 
   cgraph.ncolors = color.ncolors;
   cgraph.red.table = &color.ctable.red;
@@ -68,10 +70,12 @@ void init_colorbox ( )
  * Purpose:	Initialize color bar and related params
  * Xlib calls:	XCreateSimpleWindow(), XMapSubwindows()
  */
+
+static void set_colorbar_image(), set_colorbar_params();
+
 static void init_main_colorbar ( )
 {
   char *calloc_errchk();
-  static void set_colorbar_image(), set_colorbar_params();
 
   colorbar.display = colorbox.display;
   colorbar.ref_width = colorbox.width;
@@ -92,10 +96,12 @@ static void init_main_colorbar ( )
  * Subroutine:	adjust_main_colorbar
  * Purpose:	Adjust color bar size params and/or color data if needed
  */
+
+static void set_colorbar_image(), set_colorbar_params();
+
 void adjust_main_colorbar ( )
 {
   char *calloc_errchk();
-  static void set_colorbar_image(), set_colorbar_params();
 
   if( (colorbox.width != colorbar.ref_width) ||
       (colorbox.height != colorbar.ref_height) ) {
@@ -113,11 +119,13 @@ void adjust_main_colorbar ( )
  * Purpose:	Initialize color bar and related params
  * Xlib calls:	XMapSubwindows()
  */
+
+static void set_colorbar_image(), set_colorbar_params();
+
 void init_graph_colorbar ( )
 {
   Window create_cgraph_box();
   char *calloc_errchk();
-  static void set_colorbar_image(), set_colorbar_params();
 
   cgraph.bar.display = graphbox.display;
   cgraph.bar.ref_width = graphbox.width;
@@ -149,11 +157,13 @@ void init_graph_colorbar ( )
  * Subroutine:	adjust_graph_colorbar
  * Purpose:	Adjust color bar size params and/or color data if needed
  */
+
+static void set_colorbar_image(), set_colorbar_params();
+
 void adjust_graph_colorbar ( )
 {
   int resize = 0;
   char *calloc_errchk();
-  static void set_colorbar_image(), set_colorbar_params();
 
   if( cgraph.vertical ) {
     if( graphbox.height != cgraph.bar.ref_height ) {
--- grphmove.c.orig	1990-04-20 14:37:26 UTC
+++ grphmove.c
@@ -26,12 +26,14 @@ extern struct cgraphRec cgraph;
  * Purpose:	Change values (and position) of designated vertices in
  *		response to mouse movement
  */
+
+static void move_color_vertex();
+
 void move_cgraph_vertices ( x, y )
      int x, y;
 {
   double cell_level, intensity;
   int hash_x, hash_y;
-  static void move_color_vertex();
 
   /* clip against limits */
   if( x < cgraph.graph.xzero )
--- grpholap.c.orig	1990-04-20 14:36:00 UTC
+++ grpholap.c
@@ -28,13 +28,15 @@ extern struct cgraphRec cgraph;
  * Subroutine:	mark_colorline_overlap
  * Purpose:	Make line representing more than one color black (or white)
  */
+
+static void mark_hashmark_overlap();
+
 void mark_colorline_overlap ( )
 {
   int i, j;
   int x, y;
   int x1, y1;
   XSegment line[256];
-  static void mark_hashmark_overlap();
 
   j = 0;
   if( cgraph.vertical ) {
--- grphtext.c.orig	1990-04-20 14:39:37 UTC
+++ grphtext.c
@@ -33,6 +33,9 @@ extern struct cgraphRec cgraph;
  * Purpose:	Set labeling pieces according to the graph window size
  * Xlib calls:	XMoveWindow(), XResizeWindow(), XMapWindow()
  */
+
+static void init_colorbar_label();
+
 void init_color_graph_label ( )
 {
   int new = 0;
@@ -40,7 +43,6 @@ void init_color_graph_label ( )
   int resize = 0;
   Window create_cgraph_box();
   void init_color_graph_label();
-  static void init_colorbar_label();
 
   if( cgraph.graphlabel.active == 0 )
     return;
--- histdist.c.orig	1998-07-28 18:56:45 UTC
+++ histdist.c
@@ -24,6 +24,9 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Distribute the levels among histogram sub-groups
  * Returns:	number of groups with no assigned color levels
  */
+
+static int excess_zgroup(), excess_nzgroup(), range_zgroup();
+
 int distribute_levels ( linklist, pixel_area, color_levels,
 		        pmin, pmax, ncolor )
      SubrangeLink *linklist;
@@ -39,7 +42,6 @@ int distribute_levels ( linklist, pixel_
 #ifdef DEBUG
   int census = 0;
 #endif
-  static int excess_zgroup(), excess_nzgroup(), range_zgroup();
 
   /* if all one group (no strong peaks), allocation is simple */
   if( linklist->next == 0 ) {
--- histeql.c.orig	1990-04-20 14:59:27 UTC
+++ histeql.c
@@ -24,6 +24,10 @@ static char SccsId[] = "%W%  %G%";
  *		output level optimization accounts for large cell counts
  *		for single levels (e.g. half of all pixels with value 0)
  */
+
+static int count_nonzero_histogram_entries(), rescan_histogram();
+static void unmark_peak_links();
+
 void histogram_equalize ( scalemap, histogram, area, pmin, pmax,
 			  color_levels, pixels )
      unsigned char *scalemap;	/* i/o: scalemap (for signed indexing) */
@@ -42,8 +46,6 @@ void histogram_equalize ( scalemap, hist
   char *calloc_errchk();
   int distribute_levels();
   void generate_scalemap(), scan_histogram_for_peaks(), resolve_zeroes();
-  static int count_nonzero_histogram_entries(), rescan_histogram();
-  static void unmark_peak_links();
 
   /* initialize link list */
   linklist = (SubrangeLink *)calloc_errchk(10, sizeof(int), "HElink");
--- histlist.c.orig	1991-06-21 22:58:44 UTC
+++ histlist.c
@@ -29,6 +29,12 @@ static char SccsId[] = "%W%  %G%";
  * Subroutine:	make_equalized_list
  * Purpose:	Distributing levels for a subrange section of the histogram
  */
+
+static int equalize_simply();
+#ifdef JIGGLE
+static void adjust_list();
+#endif
+
 void make_equalized_list ( histogram, list, low_entry, high_entry,
 			   pixel_area, color_levels )
      int *histogram;
@@ -47,10 +53,6 @@ void make_equalized_list ( histogram, li
   int best_levels_under;
   int best_average_over = 0;	/* average_area used to get best_levels */
   int best_average_under = 0;
-  static int equalize_simply();
-#ifdef JIGGLE
-  static void adjust_list();
-#endif
 
   /* else allocation distribution must first be determined */
   /* run through histgram section making basic allocation and taking notes */
--- histmap.c.orig	1990-04-20 15:00:13 UTC
+++ histmap.c
@@ -28,6 +28,9 @@ static char SccsId[] = "%W%  %G%";
  *		safely be applied.
  * Note:	The original link-list of groups is freed.
  */
+
+static void make_subrange_scalemap();
+
 void generate_scalemap ( hist, subrange, scalemap, pixels )
      int *hist;				/* i: histogram (for signed offsets) */
      SubrangeLink *subrange;	/* i: linklist of subranges */
@@ -36,7 +39,6 @@ void generate_scalemap ( hist, subrange,
 {
   int baselevel;
   SubrangeLink *trash;
-  static void make_subrange_scalemap();
 
   baselevel = 0;
   while( subrange != 0 ) {
@@ -54,6 +56,9 @@ void generate_scalemap ( hist, subrange,
  * Purpose:	Make a section of scale map using histgroup link as guide 
  * Called by:	make_HE_scalemap() in HistEqual.c
  */
+
+static void make_gapped_list(), list_to_map();
+
 static void
   make_subrange_scalemap ( histogram, subrange, scalemap, baselevel, pixels )
      int *histogram;
@@ -67,7 +72,6 @@ static void
   unsigned char dispval;
   char *calloc_errchk();
   void make_equalized_list();
-  static void make_gapped_list(), list_to_map();
 
   /* if only one level, make map section */
   if( subrange->color_levels <= 1 ) {
@@ -135,6 +139,10 @@ static void list_to_map ( scalemap, hist
  * Purpose:	Allocate levels for a histogram subrange.  Special process
  * 		for situation when more levels than actually used values.
  */
+
+static int first_shortlist_pass();
+static void add_level_to_short_list();
+
 static void make_gapped_list ( histogram, list, low, high, levels )
      int *histogram;
      SubrangeList *list;
@@ -142,8 +150,6 @@ static void make_gapped_list ( histogram
 {
   int range_j, max_range;
   int levels_used;
-  static int first_shortlist_pass();
-  static void add_level_to_short_list();
 
   levels_used =
     first_shortlist_pass(histogram, list, low, high, levels,
--- histscan.c.orig	1990-04-20 15:00:36 UTC
+++ histscan.c
@@ -21,6 +21,10 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Scan the image histogram picking out large cell count values
  *		make sub-groups of the histogram between the large count levels
  */
+
+static SubrangeLink *get_new_subrange_record();
+static void fill_subrange_record();
+
 void scan_histogram_for_peaks ( subrange, histogram,
 			        pixel_area, map_levels, average )
      SubrangeLink *subrange;	/* i/o: link (initially covers range) */
@@ -36,8 +40,6 @@ void scan_histogram_for_peaks ( subrange
   int sr_nzentries;		/* l: number of non-zero entries in subrange */
   int sr_pixel_area;		/* l: number of pixels in current subrange */
   int sr_max_peak;		/* l: highest peak within current  subrange */
-  static SubrangeLink *get_new_subrange_record();
-  static void fill_subrange_record();
 
   /* set initial pixel_count values */
   sr_pixel_area = 0;
--- histzero.c.orig	1990-04-20 15:01:03 UTC
+++ histzero.c
@@ -23,13 +23,15 @@ static char SccsId[] = "%W%  %G%";
  * Note:	Adjoining groups are large count single level groups
  * Called by:	histrogram_equalize() above
  */
+
+static void merge_links();
+
 void resolve_zeroes ( PriorLink, zeroes )
      SubrangeLink *PriorLink;
      int zeroes;
 {
   SubrangeLink *ThisLink, *NextLink;
   int a_count, b_count, z1count, z2count;
-  static void merge_links();
 
   /* if very first entry is a zero allocated link */
   if( PriorLink->color_levels == 0 ) {
--- imgcheck.c.orig	2001-03-12 21:31:30 UTC
+++ imgcheck.c
@@ -46,13 +46,15 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Do some consistency checks on image type and size
  * Returns:	0 if no errors found, else -1
  */
+
+static int check_array();
+
 int check_image ( img, got_status )
      struct imageRec *img;
      int got_status;
 {
   int len;
   char *ext, *mwcs, cext;
-  static int check_array();
   extern int isfits();
 
   ext = NULL;
@@ -148,6 +150,9 @@ int check_image ( img, got_status )
  * Purpose:	Check array size vs file size etc
  * Returns:	0 if size determined and/or OK, else -1
  */
+
+static long size_imagefile();
+
 static int check_array ( img )
      struct imageRec *img;
 {
@@ -156,7 +161,6 @@ static int check_array ( img )
   float posdim;		/* possible dimension */
   int headersize;	/* size in bytes of header */
   int rawsize;
-  static long size_imagefile();
 
   /* get header size */
   headersize = img->headersize;
--- imglogo.c.orig	1990-04-26 16:31:48 UTC
+++ imglogo.c
@@ -372,13 +372,15 @@ static unsigned char logo[LOGO_SZ] = {
  * Subroutine:	load_logo
  * Purpose:	place logo image in image buffer
  */
+
+static void make_logo();
+
 void load_logo ( shortbuf, bufwd, bufht )
      short *shortbuf;
      int bufwd, bufht;
 {
   register short *bufpt, *bufend;
   register short bkgd;
-  static void make_logo();
 
   /* fill buffer with background color */
   bufpt = shortbuf;
--- imgnew.c.orig	1998-10-14 23:01:58 UTC
+++ imgnew.c
@@ -52,6 +52,9 @@ extern struct windowRec desktop;
  *  Purpose:	Create all image coordinate parameters from the beginning
  * 		and take care of all that might be affected
  */
+
+static void  load_mainbuf();
+
 void new_display ( dispnow, clear, load, scale )
      int dispnow;	/* i: put-display-in-window-now flag */
      int clear;		/* i: clear img buf before reading flag */
@@ -61,7 +64,6 @@ void new_display ( dispnow, clear, load,
   void set_disptran(), new_pancursor(), new_scalemap();
   void combine_transform(), set_edges(), set_dispoff(), set_magnifier();
   void adjust_cursor_coords(), map_dispbox(), disp_dispbox();
-  static void  load_mainbuf();
 
   /*  Set disp to img and disp to file transforms  */
   set_disptran(&coord);
--- imgtrans.c.orig	1990-04-20 15:13:46 UTC
+++ imgtrans.c
@@ -26,6 +26,9 @@ static char SccsId[] = "%W%  %G%";
  * 	4-7 = flip y axis then rotate clockwise by (code - 4) * 90 degrees
  * Called by:	load_image() in ImageRead.c
  */
+
+static void square_buf(), unsquare_buf();
+
 void rotate_buf ( buf, flip, rotcode, width, height, buf_squared, buf_doubled )
      short *buf;
      int flip;
@@ -36,7 +39,6 @@ void rotate_buf ( buf, flip, rotcode, wi
   int maxdim;
   void xflip_buf(), yflip_buf(), zflip_buf(), cwturn_buf(), ccwturn_buf();
   void transfer_buf();
-  static void square_buf(), unsquare_buf();
 
   if( flip )
     rotcode += 4;
--- irafcrd.c.orig	1990-04-20 15:16:02 UTC
+++ irafcrd.c
@@ -45,13 +45,15 @@ static char SccsId[] = "%W%  %G%";
  *		If found and parsed, compute new transform for file coord.
  * Returns:	1 if subsection found and parsed successfully, else 0
  */
+
+static int parse_iraf_subsection();
+
 int guess_true_file_coords ( title )
      char *title;
 {
   int xoff, yoff, block;
   float fblock;
   Transform imgtoaux;
-  static int parse_iraf_subsection();
   void set_trans_speed(), combine_transform(), clear_coord_area();
 
   if( parse_iraf_subsection(title, &xoff, &yoff, &block) == 0 ) {
@@ -92,6 +94,10 @@ int guess_true_file_coords ( title )
  * Purpose:	Parse for subsection and blocking from the image name
  * Returns:	1 if subsection or blocking was used, else 0
  */
+
+static char *fn_substr();	/* look for a substr */
+static void get_subsection_offsets();
+
 static int parse_iraf_subsection ( s, xoff, yoff, block )
      char *s;			/* i: file name */
      int *xoff;			/* o: x offset */
@@ -99,8 +105,6 @@ static int parse_iraf_subsection ( s, xo
      int *block;		/* o: block */
 {
   char *t, *u;			/* temp char pointers */
-  static char *fn_substr();	/* look for a substr */
-  static void get_subsection_offsets();
 
   /* seed the default values */
   *xoff = 1;
@@ -139,6 +143,9 @@ static int parse_iraf_subsection ( s, xo
  * Subroutine:	get_subsection_offsets
  * Purpose:	parse subsection syntax for x and y offsets of subsection
  */
+
+static char *fn_substr();
+
 static void get_subsection_offsets ( s, xoff, yoff, is_qp )
      char *s;
      int *xoff, *yoff;
@@ -147,7 +154,6 @@ static void get_subsection_offsets ( s, 
   int x1, x2;
   int y1, y2;
   char *sy, *s2, *st;
-  static char *fn_substr();
 
   /* if not qp, grab the initial x offset right after the '[' */
   sy = fn_substr(s, ",");
--- irafimtl.c.orig	1998-02-25 19:52:37 UTC
+++ irafimtl.c
@@ -46,6 +46,9 @@ static char wcsbuf[SZ_WCSBUF];
  * Subroutine:	imtool_response
  * Purpose:	Read imtool messages from iraf (return 1 if pipe trouble)
  */
+
+static int get_frame_no();
+
 void imtool_response ( port, imhead, ndatabytes )
      struct connectRec *port;	/* i: struct of port for IRAF input */
      struct imtoolRec *imhead;	/* i: packet header, already read in */
@@ -60,7 +63,6 @@ void imtool_response ( port, imhead, nda
   void set_curpos_to_iraf_trigger(), set_cursor_from_iraf(), imtool_output();
   void set_imtool_scale(), set_cursor_to_iraf(), disp_subpiece();
   void map_panbox(), disp_panbox(), send_curpos_to_iraf(), flush_connection();
-  static int get_frame_no();
 
   switch( imhead->subunit & 077 ) {
   case FEEDBACK:
@@ -189,6 +191,9 @@ void imtool_response ( port, imhead, nda
  * Purpose:	Reset buffer sizes, coordinate systems and parameters as
  *		needed.
  */
+
+static int get_frame_no();
+
 void imtool_newimage ( is_wcs, imhead )
      int is_wcs;
      struct imtoolRec *imhead;
@@ -199,7 +204,6 @@ void imtool_newimage ( is_wcs, imhead )
   void set_disptran(), combine_transform(), set_edges(), set_dispoff();
   void adjust_cursor_coords(), set_magnifier(), disp_subpiece(), set_tdisp();
   void set_imtool_scale(), imtool_reinit(), new_pancursor();
-  static int get_frame_no();
 
   /* set size and frame */
   if( is_wcs )
--- irafio.c.orig	1992-10-12 17:17:50 UTC
+++ irafio.c
@@ -102,6 +102,9 @@ void rename_imtool_connection ( name, in
  * Subroutine:	imtool_output
  * Purpose:	Write image data back to iraf device channel
  */
+
+static int compact_short_to_byte();
+
 void imtool_output ( imhead, odev, imagebuf, width, height )
      struct imtoolRec *imhead;
      struct connectRec *odev;
@@ -116,7 +119,6 @@ void imtool_output ( imhead, odev, image
   int buferr = 0;
   char fifobuf[SZ_FIFOBUF + 4];
   int write_connection();
-  static int compact_short_to_byte();
 
   ndatabytes = -(int)imhead->thingct;
   x = imhead->x & 077777;
@@ -153,6 +155,9 @@ void imtool_output ( imhead, odev, image
  * Called by:	imtool_response() in RemoteImtool.c
  * Returns:	-1 if read no bytes, 1 if trouble, else 0
  */
+
+static void expand_byte_to_short();
+
 int imtool_input ( imhead, idev, readbuf, iwdth, owdth, y1, y2,
 		   imagebuf, imbufsz )
      struct imtoolRec *imhead;
@@ -171,7 +176,6 @@ int imtool_input ( imhead, idev, readbuf
   int got, try, gotten;
   short *obuf;
   int read_connection();
-  static void expand_byte_to_short();
 
   /* get data count and packing type */
   ndatavals = -(int)imhead->thingct;
--- irafpipe.c.orig	1998-02-25 19:52:26 UTC
+++ irafpipe.c
@@ -33,6 +33,9 @@ static char SccsId[] = "%W%  %G%";
  * Subroutine:	read_imtool_packet()
  * Purpose:	event handler for packet input from iraf
  */
+
+static int check_packet_sum();
+
 void read_imtool_packet( port )
      struct connectRec *port;
 {
@@ -48,7 +51,6 @@ void read_imtool_packet( port )
 #endif
   int read_connection();
   void imtool_response(), swap_bytes();
-  static int check_packet_sum();
 
   /* read the header */
   bytes = read_connection(port, (char *)&imhead, sizeof(struct imtoolRec));
--- maininit.c.orig	2003-12-01 23:21:35 UTC
+++ maininit.c
@@ -76,11 +76,13 @@ Display *display;		/* display connection
  * Xlib calls:	XSetErrorHandler()
  * UNIX calls:	setrlimit()
  */
+
+static void init_params(), init_packages();
+
 main(argc, argv)
   int argc;
   char **argv;
 {
-  static void init_params(), init_packages();
   void crash_on_error(), control_event_loop();
   void say_goodbye();
   
@@ -141,13 +143,15 @@ void say_goodbye ( code )
  * Purpose:	Initialize parameters in the records
  * Note:	Resource or default file not yet used
  */
+
+static void init_server();
+
 static void init_params ( argc, argv )
      int argc;
      char **argv;
 {
   char *name;		/* l: both flag for init and return display name */
   int parse_stat;
-  static void init_server();
   int parse_cmdline(), check_image();
   void say_goodbye(), init_connections();
 
--- mainkey.c.orig	2003-09-24 22:38:25 UTC
+++ mainkey.c
@@ -87,6 +87,9 @@ static double oldypix = 0.0;
 
 static double oldxpos, oldypos;
 
+static void PrintFITSHead();
+static int new_image();
+
 void
 key_response()
 {
@@ -110,7 +113,6 @@ key_response()
   void print_center(), print_cursor();
   void move_pointer();
   void get_cursor_pos();
-  static void PrintFITSHead();
   void toggle_region_visibility(), toggle_region_labeling();
   double xbuf, ybuf, xfile, yfile;
   double newxpos, newypos, distance;
--- mgfyctrl.c.orig	1999-05-06 19:47:12 UTC
+++ mgfyctrl.c
@@ -45,12 +45,14 @@ extern struct magRec magset;
  * Purpose:	Magnify location of a dispbox event
  * Xlib calls:	XCheckWindowEvent(), XSync()
  */
+
+static void label_file_coords(), label_file_coords_proportional();
+
 void magnify_disp ( event, view, text )
      XEvent *event;		/* i: XEvent for location of mouse */
      int view, text;
 {
   void draw_magnifier();
-  static void label_file_coords(), label_file_coords_proportional();
 
   /* get only the most recent mouse moved event */
   XSync(dispbox.display, 0);
@@ -132,6 +134,9 @@ void redraw_magnifier ( )
  * Purpose:	Show pointer coordinates and image value in display window
  * Xlib calls:	XDrawImageString()
  */
+
+static void draw_proportional_coord();
+
 static void label_file_coords ( bufX, bufY )
      double bufX, bufY;
 {
@@ -142,7 +147,6 @@ static void label_file_coords ( bufX, bu
   float fileX, fileY;
   GC gc, set_edit_gc();
   void d_transform();
-  static void draw_proportional_coord();
   static int lwcs0 = 0;
   static int lpix0 = 0;
   int i;
@@ -289,6 +293,9 @@ void clear_coord_area ()
  *		but has not been refined for the val section.
  * Xlib call:	XDrawImageString()
  */
+
+static void draw_proportional_number();
+
 static void label_file_coords_proportional ( bufX, bufY )
      double bufX, bufY;
 {
@@ -297,7 +304,6 @@ static void label_file_coords_proportion
   float fileX, fileY;
   GC gc, set_edit_gc();
   void d_transform();
-  static void draw_proportional_number();
 
   gc = set_edit_gc(magset.text.font,
 		   magset.text.foreground, magset.text.background);
--- mgfytabl.c.orig	1998-07-09 16:28:28 UTC
+++ mgfytabl.c
@@ -30,6 +30,10 @@ static char SccsId[] = "%W%  %G%";
  *		coordinates
  * Note:	Uses event coords in control struct (control.event.xkey)
  */
+
+static int get_key_buf_coords(), set_table_params();
+static void output_column_labels(), output_pixval_table();
+
 void print_table ()
 {
   int bufx, bufy;
@@ -39,8 +43,6 @@ void print_table ()
   int table_size;
   int col_width;
   int rot;
-  static int get_key_buf_coords(), set_table_params();
-  static void output_column_labels(), output_pixval_table();
 
   /* determine the buffer coordinates of the event */
   if( get_key_buf_coords(&control.event.xkey, &bufx, &bufy) == 0 ) {
--- pancrsr.c.orig	1990-05-02 06:49:17 UTC
+++ pancrsr.c
@@ -45,13 +45,15 @@ void draw_pancursor ( )
  * Subroutine:	new_pancursor
  * Purpose:	Create and draw panbox cursor given image coordinates
  */
+
+static void set_pancursor();
+
 void new_pancursor ( track )
      int track;
 {
   float panX1, panX2, panY1, panY2;
   GC gc, set_gc();
   void disp_window(), i_transform();
-  static void set_pancursor();
 
   if( pancur_present ) {
     /* erase the old box if it was visible */
--- panimage.c.orig	1990-04-20 16:17:38 UTC
+++ panimage.c
@@ -45,12 +45,14 @@ void disp_panbox ( )
  * Subroutine:	map_panbox
  * Purpose:	Fill the panbox display buffer, mapping from its short buffer
  */
-void map_panbox ( )
-{
-  static void map_panbuf();
+
+static void map_panbuf();
 #ifdef SUMBLOCK
-  static void map_adj_panbuf();
+static void map_adj_panbuf();
 #endif
+
+void map_panbox ( )
+{
   void panimage_halftone();
 
   if( color.ncolors <= 1 ) {
--- prntcent.c.orig	1999-08-20 22:18:40 UTC
+++ prntcent.c
@@ -36,6 +36,11 @@ static char SccsId[] = "%W%  %G%";
  *		Returns 1 if successful, else 0
  * Note:	Uses event coords in control struct (control.event.xkey)
  */
+
+static int set_center_param();
+static int get_key_buf_coord();
+static void comp_center ();
+
 void
 print_center ( xc, yc )
 
@@ -59,9 +64,6 @@ double *xc, *yc;		/* Returned centroided
   int xfile, yfile;
   char string[64];
   int lstr = 48;
-  static int set_center_param();
-  static int get_key_buf_coord();
-  static void comp_center ();
   void d_trans();
   int iswcs();
 
--- prntcurs.c.orig	2002-01-16 22:54:18 UTC
+++ prntcurs.c
@@ -31,12 +31,14 @@ static char SccsId[] = "%W%  %G%";
  * Subroutine:	print_cursor
  * Purpose:	print location of a dispbox event
  */
+
+static void print_file_value();
+
 void print_cursor ( event )
   XEvent *event;		/* XEvent for location of mouse */
 {
   double bufx, bufy, filex, filey;
   void get_cursor_pos();
-  static void print_file_value();
 
   (void)get_cursor_pos (event, &bufx, &bufy, &filex, &filey );
   (void)print_file_value ( bufx, bufy, filex, filey );
--- readarr.c.orig	1999-02-23 14:05:41 UTC
+++ readarr.c
@@ -28,6 +28,9 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Read array data from a file
  * Note:	Assumes file was tested benignly, exits here if trouble
  */
+
+static int read_data();
+
 void read_array ( fd, img, imgbuf, filebuf, width, height, X, Y, block,
 		  verbose )
      int fd;			/* if >=0 handle to open & ready image file */
@@ -40,7 +43,6 @@ void read_array ( fd, img, imgbuf, fileb
      int verbose;		/* whether to print explanatory messages */
 {
   int vals;
-  static int read_data();
   int image_start;
   int open_disk(), lseek_disk();
   void close_disk();
--- readfith.c.orig	1998-09-29 15:40:06 UTC
+++ readfith.c
@@ -46,6 +46,9 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Find important FITS parameters in FITS header
  * Returns:	1 if success, else 0
  */
+
+static int get_keyint(), get_keyfloat();
+
 int read_fitsheader ( header, length, bitpix, naxis, naxes, scale, bias )
      char *header;
      int length;
@@ -55,7 +58,6 @@ int read_fitsheader ( header, length, bi
      float *scale;
      float *bias;
 {
-  static int get_keyint(), get_keyfloat();
   struct WorldCoor *wcsinit();
   char *header0;
   header0 = header;
@@ -144,6 +146,9 @@ static int get_keyint ( header, keyword,
  * Purpose:	Return the float value in the data field for a given FITS
  *		header keyword.  If key not found, return 0.
  */
+
+static void fix_exponent();
+
 static int get_keyfloat ( header, keyword, length, val, report_error)
      char *header;	/* buffer start */
      char *keyword;	/* keyword to match */
@@ -153,7 +158,6 @@ static int get_keyfloat ( header, keywor
 {
   int key_not_end;
   int i;
-  static void fix_exponent();
   void no_fitscomment();
 
   key_not_end = (strncmp(keyword, "END     ", 8) != 0);
--- rgnanli.c.orig	1990-04-20 16:25:03 UTC
+++ rgnanli.c
@@ -89,14 +89,16 @@ void new_annulus_edge ( cursor )
  * Note:	"vala valb valc ..." and "val1 val2 n=int" are both
  *		permitted syntax forms
  */
+
+static int expand_radii();
+static char *got_nequal();
+
 int parse_radii ( line, radius, maxcnt )
      char *line;	/* i: string with first radius as next token */
      float *radius;	/* o: buffer for float radius vals */
      int maxcnt;	/* i: size of radius buffer */
 {
   int i, cnt;
-  static int expand_radii();
-  static char *got_nequal();
   char *next_token();
 
   i = 0;
--- rgndraw.c.orig	1998-11-30 21:46:40 UTC
+++ rgndraw.c
@@ -115,12 +115,14 @@ void disp_regions ( cursor )
  * Subroutine:	disp_region
  * Purpose:	Draw one saved cursor region and its labels
  */
+
+static GC set_region_gc();
+static void label_annuli(), label_region(), draw_region();
+
 void disp_region ( region )
      struct cursorRec *region;
 {
   GC gc;
-  static GC set_region_gc();
-  static void label_annuli(), label_region(), draw_region();
 
   if( rgdraw.visible && (region != NULL) ) {
     gc = set_region_gc(region);
@@ -215,11 +217,13 @@ static void draw_region_label ( string, 
  * Purpose:	Draw one saved cursor region outline or point index
  * Note:	gc is already set, hence NULL GCspec in draw calls
  */
+
+static void draw_region_label();
+
 static void draw_region ( region, gc )
      struct cursorRec *region;
      GC gc;
 {
-  static void draw_region_label();
   void draw_annuli(), draw_cursor();
 
   if( region->type != COP_Point ) {
@@ -246,12 +250,14 @@ static void draw_region ( region, gc )
 /*
  * Subroutine:	label_annuli
  */
+
+static void label_region();
+
 static void label_annuli ( region, gc )
      struct cursorRec *region;
      GC gc;
 {
   struct cursorRec *annulus;
-  static void label_region();
 
   /* apply label to outer annulus */
   annulus = region;
@@ -268,6 +274,10 @@ static void label_annuli ( region, gc )
  * Purpose:	Draw one region's label line and text for center and edge
  * Xlib calls:	XDrawLine()
  */
+
+static int mark_include();
+static void draw_region_label();
+
 static void label_region ( region, gc )
      struct cursorRec *region;
      GC gc;
@@ -277,8 +287,6 @@ static void label_region ( region, gc )
   char edge_string[132];
   int len;
   int exclude;
-  static int mark_include();
-  static void draw_region_label();
 
   /* if label not requested or don't know how to label or will another part */
   if( (!rgdraw.label) || (region->type == COP_Polygon) )
--- rgndrop.c.orig	1990-04-20 16:31:38 UTC
+++ rgndrop.c
@@ -64,14 +64,16 @@ void unsave_region ( cursor, dead_meat )
  *		cursors enclose one or two digit label but have 0 area).
  *		In case of equal areas (i.e. points), closer center is used.
  */
+
+static int pointer_is_inside_region();
+static int closer_to_center();
+
 struct cursorRec *region_indicated_by_pointer ( cursor, x, y, point_only )
      struct cursorRec *cursor;
      int x, y;
      int point_only;
 {
   struct cursorRec *region, *chosen;
-  static int pointer_is_inside_region();
-  static int closer_to_center();
 
   chosen = NULL;
   region = cursor->next_region;
@@ -115,13 +117,15 @@ static int closer_to_center ( challenger
  * Subroutine:	is_inside_region
  * Purpose:	Determine if mouse is within a region
  */
+
+static int pointer_is_inside_polygon();
+
 static int pointer_is_inside_region ( x, y, region )
      int x, y;
      struct cursorRec *region;
 {
   double rayX, rayY, ray;
   int inside;
-  static int pointer_is_inside_polygon();
 
   if( region->type == COP_Polygon )
     return( pointer_is_inside_polygon((double)x, (double)y,
--- rgnwpros.c.orig	1991-01-09 03:57:30 UTC
+++ rgnwpros.c
@@ -45,11 +45,13 @@ static char SccsId[] = "%W%  %G%";
  * Purpose:	Write ROSAT PROS style region description to file
  * Method:	Recurse first to start writing from end of link list
  */
+
+static void cat_annulus(), write_annuli(), cat_shape();
+
 void write_region_pros ( fd, region )
      FILE *fd;
      struct cursorRec *region;
 {
-  static void cat_annulus(), write_annuli(), cat_shape();
 
   /*  Check for pointer before doing anything  */
   if( region == NULL )
@@ -84,13 +86,15 @@ void write_region_pros ( fd, region )
 /*  Subroutine:	cat_shape
  *  Purpose:	Put simple PROS description of given cursor in line buffer
  */     
+
+static void cat_polypts(), cat_cen(), cat_params();
+
 static void cat_shape ( region, line )
      struct cursorRec *region;
      char *line;
 {
   int params;
   void write_text_region();
-  static void cat_polypts(), cat_cen(), cat_params();
 
   switch( region->type ) {
   case COP_Box:
@@ -205,12 +209,14 @@ static void cat_cen ( region, line )
  * Subroutine:	cat_polypts
  * Purpose:	Add list of point coordinates to line buffer (for polygon)
  */
+
+static void cat_pt();
+
 static void cat_polypts ( region, line )
      struct cursorRec *region;
      char *line;
 {
   int i;
-  static void cat_pt();
 
   cat_pt((double)region->poly[0].fileX, (double)region->poly[0].fileY,
 	 line, 0);
@@ -254,12 +260,14 @@ static void cat_pt ( x, y, line, comma )
  * Purpose:	Put a PROS style description of circular annuli on the
  *		line buffer
  */
+
+static void cat_cen();
+
 static void cat_annulus ( region, line )
      struct cursorRec *region;
      char *line;
 {
   char radius[16];
-  static void cat_cen();
 
   (void)strcat(line, "ANNULUS(");
   cat_cen(region, line);
@@ -275,14 +283,16 @@ static void cat_annulus ( region, line )
  * Subroutine:	write_annuli
  * Purpose:	Write PROS type description to produce annuli of given shapes
  */
+
+static struct cursorRec *cat_annular();
+static void cat_shape();
+
 static void write_annuli ( region, line, fd )
      struct cursorRec *region;
      char *line;
      FILE *fd;
 {
   struct cursorRec *annulus;
-  static struct cursorRec *cat_annular();
-  static void cat_shape();
 
   /* annuli start with next_annulus (base region is not one of them) */ 
   if( (annulus = region->next_annulus) != NULL ) {
@@ -309,11 +319,13 @@ static void write_annuli ( region, line,
  * Purpose:	Add outer shape anded with not of inner shape to make
  *		an annular ring
  */
+
+static void cat_shape();
+
 static struct cursorRec *cat_annular ( region, line )
      struct cursorRec *region;
      char *line;
 {
-  static void cat_shape();
 
   if( region->next_annulus != NULL ) {
     if( region->exclude_region )
--- rgnwrite.c.orig	1995-09-08 22:29:19 UTC
+++ rgnwrite.c
@@ -58,6 +58,9 @@ EditStruct *region_edit;
  * Subroutine:	write_regions
  * Purpose:	Write region info to a file
  */
+
+static void write_region_imtool();
+
 void write_regions ( cursor, image, output_type )
      struct cursorRec *cursor;
      struct imageRec *image;
@@ -66,7 +69,6 @@ void write_regions ( cursor, image, outp
   FILE *fd;
   static int last_output_type = 0;
   char fname[SZ_FNAME];
-  static void write_region_imtool();
   int open_output_file();
   EditStruct *init_edit_popup();
   void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp();
@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, re
  * Subroutine:	timestamp
  * Purpose:	Write date and filename (if known) to region file
  */
+
+static void set_time_string();
+
 void timestamp ( fd, imagename )
      FILE *fd;
      char *imagename;
 {
   char  line[SZ_LINE];
   int len;
-  static void set_time_string();
 
   /* timestamp the first entry in the output file. */
   set_time_string (line);
--- sclctrl.c.orig	1996-10-10 15:55:57 UTC
+++ sclctrl.c
@@ -70,6 +70,9 @@ void select_scalemap ()
  * Subroutine:	new_scalemap
  * Purpose:	Scalemap calculation for a new image
  */
+
+static void new_histogram();
+
 void new_scalemap ( )
 {
   static double cmdMin = 0.0;
@@ -78,7 +81,6 @@ void new_scalemap ( )
   static int max_given = 0;
   static int imtool_200 = 0;
   static int init = 1;		/* identify first time called */
-  static void new_histogram();
   void make_scalemap(), color_logo();
 #ifdef IMTOOL
   void set_imtool_colors();
--- sclmap.c.orig	1994-10-25 15:25:02 UTC
+++ sclmap.c
@@ -36,11 +36,13 @@ static char SccsId[] = "%W%  %G%";
  * Note:	Map goes from image value to hardware value (through ideal
  *		map value using pixels array from XAllocColors)
  */
+
+static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
+
 void make_scalemap ( image_min, image_max )
      int image_min, image_max;	/* i: range of mapping for image data input */
 {
   void histogram_equalize();
-  static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
 
   /* note the range of data for which mapping is to be calculated */
   if( image_max == image_min )
@@ -105,6 +107,9 @@ void make_scalemap ( image_min, image_ma
  * Subroutine:	linear_scale
  * Purpose:	Distribute color levels in the map evenly
  */
+
+static void get_histogram_range();
+
 static void linear_scale ( image_min, image_max )
   int image_min, image_max;		/* i: limits of values in display */
 {
@@ -118,7 +123,6 @@ static void linear_scale ( image_min, im
   register int imageval;
   register int pixval;
   register int imagelim;
-  static void get_histogram_range();
 
   range_min = image_min;
   range_max = image_max;
--- wndwconf.c.orig	1995-01-21 00:27:13 UTC
+++ wndwconf.c
@@ -55,9 +55,11 @@ static unsigned int geo_width, geo_heigh
  * Method:	The size can be given or set to norm.  If given but less
  *		than min (i.e. 0,0) it becomes the minimum configuration.
  */
+
+static void set_parsed_geometry();
+
 void init_desktop ( )
 {
-  static void set_parsed_geometry();
 
   desktop.hints.min_width =
     (2 * desktop.xzero) + (2 * dispbox.bdrwidth) + dispbox.hints.min_width;
--- wndwinit.c.orig	2001-12-14 23:19:23 UTC
+++ wndwinit.c
@@ -53,11 +53,13 @@ static char **cmd_argv;		/* i: command l
  * Uses:	create_window() in WndwCreate.c
  * Xlib calls:	DisplayWidth(), DisplayHeight();
  */
+
+static void set_window_basics();
+
 void init_windows1 ( argc, argv )
      int argc;			/* i: command line arg count param */
      char **argv;		/* i: command line args */
 {
-  static void set_window_basics();
   void init_desktop(), create_window();
 
   /* set display screen parameters for all to see */
@@ -81,9 +83,11 @@ void init_windows1 ( argc, argv )
  * Uses:	configure_windows() in WndwConfig.c
  * Uses:	get_window_dimensions(), create_window() in WndwCreate.c
  */
+
+static void init_window_basics(), set_border_color();
+
 void init_windows2 ( )
 {
-  static void init_window_basics(), set_border_color();
   void get_window_dimensions(), configure_windowgroup(), create_window();
 
   /* install runtime environment parameters for all windows */
@@ -175,11 +179,13 @@ void raise_windows ( )
  * Subroutine:	init_window_basics, set_window_basics
  * Purpose:	Set the runtime environment parameters
  */
+
+static void set_window_basics();
+
 static void init_window_basics ( border_pixel )
      int border_pixel;
 {
   XImage *ximage;
-  static void set_window_basics();
 
   ximage = XCreateImage(desktop.display, color.visual, color.screen_depth,
 			dispbox.image.format, 0, malloc(4), 2, 2,
--- wndwmaus.c.orig	2001-12-19 22:06:46 UTC
+++ wndwmaus.c
@@ -61,11 +61,13 @@ static Cursor keycursor;
  * Subroutine:	init_mousepointers
  * Purpose:	Set up the various mouse pointer icons for all windows
  */
+
+static Cursor make_mouse_cursor();
+
 void init_mousepointers ( dispdisplay, auxdisplay )
      Display *dispdisplay;	/* i: display for the dispbox */
      Display *auxdisplay;	/* i: display for the auxiliary windows */
 {
-  static Cursor make_mouse_cursor();
 
   /* create special btnbox cursor for button menu window */
   btnbox.attrs.cursor =




--- makefile.FreeBSD.orig	2020-01-26 19:05:22 UTC
+++ makefile.FreeBSD
@@ -36,9 +36,9 @@
 # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of

 # Uncomment these two lines to compile with gcc (add any optimizers you wish).
 #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce
 #  Delayed branches could win big on RISC: many inner loops have branches
@@ -64,24 +64,24 @@ CC = cc
 
 IFLAGS = -DFITS -DOIF -DIMTOOL
 
-# MFLAGS: machine or library specific code.
+# MYMFLAGS: machine or library specific code.
 #   -DSUN - SunOS temp file name, IEEE floating point debug, and Sun keyboard
 #   -DLSB - byte swap for FITS (VAX and DECstations)
 #   -DSYSV - substitutes for getdtablesize() and setrlimit() not widely known
 #   -DPSCRIPT - hard copy output to a PostScript printer (else no hardcopy)
 #   -DMIRIAD - extras
 
-MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
+MYMFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
 
 # OFLAGS: compiler optimization/debug options.
 
 #OFLAGS = -g -DDEBUG

 #XLIB = -L/usr/X11R6/lib -lX11	# ATTENTION: OpenWindows users...
 #F77LIB = -lF77 -lI77 -lU77
 F77LIB = -lf2c
@@ -106,7 +106,7 @@ RANLIB = ranlib
 RM     = rm -f
 SHELL  = /bin/sh
 
-CFLAGS = $(OFLAGS) $(ADFLAGS) $(MFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
+CFLAGS = $(OFLAGS) $(ADFLAGS) $(MYMFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
 
 # SAOimage libraries that live in subdirectories with their own makefiles.
 # This definition must be kept in correspondence with the DEPLIBS target.
@@ -241,10 +241,10 @@ $(PROGRAM):	$(DEPLIBS) $(OBJS)
 
 $(DEPLIBS):
 	@echo Building $(DEPLIBS)...
-	cd btnlib; $(MAKE) CFLAGS="-c $(OFLAGS) $(ADFLAGS) $(MFLAGS)" CC=$(CC)
+	cd btnlib; $(MAKE) CFLAGS="-c $(OFLAGS) $(ADFLAGS) $(MYMFLAGS)" CC=$(CC)
 
 lint:
-	$(LINT) -DDEBUG $(MFLAGS) $(IFLAGS) $(SRCS)
+	$(LINT) -DDEBUG $(MYMFLAGS) $(IFLAGS) $(SRCS)
 
 clean:
 	cd btnlib; $(MAKE) clean
@@ -307,7 +307,7 @@ tape:
 	$(MAKE) ARCFILE=$(TAPEDEV) tar
 

 STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
 	 hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
 WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
@@ -419,8 +419,8 @@ maininit.o	: $(XLIBH) $(STRUCT) hfiles/constant.h hfil
 		defs/dispbox.def defs/magnibox.def defs/panbox.def \
 		defs/btnbox.def defs/colorbox.def defs/graphbox.def \
 		defs/desktop.def defs/cursor.def




--- rgnwrite.c.orig	2020-01-26 19:05:22 UTC
+++ rgnwrite.c
@@ -58,6 +58,9 @@ EditStruct *region_edit;
  * Subroutine:	write_regions
  * Purpose:	Write region info to a file
  */
+
+static void write_region_imtool();
+
 void write_regions ( cursor, image, output_type )
      struct cursorRec *cursor;
      struct imageRec *image;
@@ -66,7 +69,6 @@ void write_regions ( cursor, image, output_type )
   FILE *fd;
   static int last_output_type = 0;
   char fname[SZ_FNAME];
-  static void write_region_imtool();
   int open_output_file();
   EditStruct *init_edit_popup();
   void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp();
@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, region, image )
  * Subroutine:	timestamp
  * Purpose:	Write date and filename (if known) to region file
  */
+
+static void set_time_string();
+
 void timestamp ( fd, imagename )
      FILE *fd;
      char *imagename;
 {
   char  line[SZ_LINE];
   int len;
-  static void set_time_string();
 
   /* timestamp the first entry in the output file. */
   set_time_string (line);
@@ -183,7 +187,7 @@ static void set_time_string ( time_string )
 #ifdef LONG64
   int time();
 #else





GNU_CONFIGURE=	yes
USES=		iconv localbase xorg
USE_XORG=	xscrnsaver xt
CONFIGURE_ARGS=	--with-map-extension=jpg
CPPFLAGS+=	-I${LOCALBASE}/include/netpbm
LIBS+=		-lm

OPTIONS_DEFINE=		FREETYPE GIF JPEG PANGO PNG PNM TIFF
OPTIONS_DEFAULT=	FREETYPE GIF JPEG PANGO PNG PNM TIFF

FREETYPE_CONFIGURE_WITH=	--with-freetype
FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
PANGO_CONFIGURE_WITH=		pango
PANGO_USES=			gnome
PANGO_USE=			GNOME=pango
GIF_CONFIGURE_WITH=		gif
GIF_LIB_DEPENDS=		libgif.so:graphics/giflib
JPEG_CONFIGURE_WITH=		jpeg
JPEG_USES=			jpeg
PNG_CONFIGURE_WITH=		png
PNG_LIB_DEPENDS+=		libpng.so:graphics/png
PNM_CONFIGURE_WITH=		pnm
PNM_LIB_DEPENDS=		libnetpbm.so:graphics/netpbm
TIFF_CONFIGURE_WITH=		tiff
TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff

post-patch:
	@${REINPLACE_CMD} -e "s/default/default.sample/g" ${WRKSRC}/Makefile.in
	@${MV} ${WRKSRC}/xplanet/config/default ${WRKSRC}/xplanet/config/default.sample

.include <bsd.port.mk>




--- src/libprojection/ProjectionBonne.cpp.orig	2006-03-26 05:03:20 UTC
+++ src/libprojection/ProjectionBonne.cpp
@@ -7,6 +7,8 @@
   http://www.atnf.csiro.au/~mcalabre/WCS
  */
 
+#include <stdio.h>
+
 #include <cmath>
 #include <cstdio>
 #include <sstream>
--- src/libprojection/ProjectionGnomonic.cpp.orig	2006-03-26 05:03:20 UTC
+++ src/libprojection/ProjectionGnomonic.cpp
@@ -7,6 +7,8 @@
   http://www.atnf.csiro.au/~mcalabre/WCS
 */
 
+#include <stdio.h>
+
 #include <cmath>
 #include <cstdio>
 #include <sstream>
--- src/libprojection/ProjectionMercator.cpp.orig	2006-03-26 05:03:20 UTC
+++ src/libprojection/ProjectionMercator.cpp
@@ -1,4 +1,6 @@
 #include <cmath>
+#include <stdio.h>
+
 #include <cstdio>
 #include <sstream>
 using namespace std;




Index: src/libmultiple/RayleighScattering.cpp
===================================================================
--- src/libmultiple/RayleighScattering.cpp	(revision 206)
+++ src/libmultiple/RayleighScattering.cpp	(revision 207)
@@ -369,7 +369,7 @@
 
     diskTemplate_.clear();
     limbTemplate_.clear();
-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
     {
         int i = 0;
         while (isDelimiter(line[i]))
@@ -439,7 +439,7 @@
     values.clear();
 
     char line[MAX_LINE_LENGTH];
-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
     {
         int i = 0;
         while (isDelimiter(line[i]))
@@ -470,7 +470,7 @@
                               double &value)
 {
     char line[MAX_LINE_LENGTH];
-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
     {
         int i = 0;
         while (isDelimiter(line[i]))
Index: src/libmultiple/drawStars.cpp
===================================================================
--- src/libmultiple/drawStars.cpp	(revision 206)
+++ src/libmultiple/drawStars.cpp	(revision 207)
@@ -41,7 +41,7 @@
     ifstream inFile(starMap.c_str());
 
     char line[MAX_LINE_LENGTH];
-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
     {
         if (line[0] == '#') continue;
 
Index: src/readConfig.cpp
===================================================================
--- src/readConfig.cpp	(revision 206)
+++ src/readConfig.cpp	(revision 207)
@@ -550,7 +550,7 @@
 
         ifstream inFile(configFile.c_str());
         char *line = new char[256];
-        while (inFile.getline(line, 256, '\n') != NULL)
+        while (inFile.getline(line, 256, '\n'))
             readConfig(line, planetProperties);
         
         // This condition will only be true if [default] is the only
Index: src/libannotate/addArcs.cpp
===================================================================
--- src/libannotate/addArcs.cpp	(revision 206)
+++ src/libannotate/addArcs.cpp	(revision 207)
@@ -258,7 +258,7 @@
         {
             ifstream inFile(arcFile.c_str());
             char *line = new char[MAX_LINE_LENGTH];
-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
                 readArcFile(line, planet, view, projection,
                             planetProperties, annotationMap);
             
@@ -292,7 +292,7 @@
         {
             ifstream inFile(arcFile.c_str());
             char *line = new char[256];
-            while (inFile.getline (line, 256, '\n') != NULL)
+            while (inFile.getline (line, 256, '\n'))
                 readArcFile(line, NULL, view, NULL, NULL, annotationMap);
 
             inFile.close();
Index: src/libannotate/addMarkers.cpp
===================================================================
--- src/libannotate/addMarkers.cpp	(revision 206)
+++ src/libannotate/addMarkers.cpp	(revision 207)
@@ -429,7 +429,7 @@
         {
             ifstream inFile(markerFile.c_str());
             char *line = new char[MAX_LINE_LENGTH];
-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
             {
                 unsigned char color[3];
                 memcpy(color, planetProperties->MarkerColor(), 3);
@@ -475,7 +475,7 @@
         {
             ifstream inFile(markerFile.c_str());
             char *line = new char[MAX_LINE_LENGTH];
-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
             {
                 unsigned char color[3];
                 memcpy(color, options->Color(), 3);
Index: src/libannotate/addSatellites.cpp
===================================================================
--- src/libannotate/addSatellites.cpp	(revision 206)
+++ src/libannotate/addSatellites.cpp	(revision 207)
@@ -488,10 +488,10 @@
         {
             ifstream inFile(tleFile.c_str());
             char lines[3][80];
-            while (inFile.getline(lines[0], 80) != NULL)
+            while (inFile.getline(lines[0], 80))
             {
-                if ((inFile.getline(lines[1], 80) == NULL) 
-                    || (inFile.getline(lines[2], 80) == NULL))
+                if ((!inFile.getline(lines[1], 80)) 
+                    || (!inFile.getline(lines[2], 80)))
                 {
                     ostringstream errStr;
                     errStr << "Malformed TLE file (" << tleFile << ")?\n";
@@ -542,7 +542,7 @@
         {
             ifstream inFile(satFile.c_str());
             char *line = new char[MAX_LINE_LENGTH];
-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
                 readSatelliteFile(line, planet, view, projection,
                                   planetProperties, annotationMap);
             
Index: src/libannotate/addSpiceObjects.cpp
===================================================================
--- src/libannotate/addSpiceObjects.cpp	(revision 206)
+++ src/libannotate/addSpiceObjects.cpp	(revision 207)
@@ -524,7 +524,7 @@
         {
             ifstream inFile(kernelFile.c_str());
             char *line = new char[MAX_LINE_LENGTH];
-            while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+            while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
             {
                 int ii = 0;
                 while (isDelimiter(line[ii]))
@@ -576,7 +576,7 @@
         {
             ifstream inFile(spiceFile.c_str());
             char *line = new char[MAX_LINE_LENGTH];
-            while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+            while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
                 readSpiceFile(line, planetsFromSunMap, view, projection,
                               annotationMap);
             inFile.close();




--- src/libimage/gif.c.orig	2020-01-26 19:25:24 UTC
+++ src/libimage/gif.c
@@ -28,6 +28,314 @@
   distribution. 

 int
 read_gif(const char *filename, int *width, int *height, unsigned char **rgb)
 {
@@ -42,11 +350,15 @@ read_gif(const char *filename, int *width, int *height
     int color_index;
     unsigned char *ptr = NULL;
 

         return(0);
     }
 
@@ -54,7 +366,11 @@ read_gif(const char *filename, int *width, int *height
     {
         if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) 
         {

             return(0);
         }
 
@@ -63,7 +379,11 @@ read_gif(const char *filename, int *width, int *height
         case IMAGE_DESC_RECORD_TYPE:
             if (DGifGetImageDesc(infile) == GIF_ERROR)
             {

                 return(0);
             }
 
@@ -107,14 +427,22 @@ read_gif(const char *filename, int *width, int *height
             GifByteType *ext;
             if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) 
             {

                     return(0);
                 }
             }
@@ -154,7 +482,11 @@ read_gif(const char *filename, int *width, int *height
     
     free(buffer);
 

     return(1);
 }
 
@@ -178,7 +510,11 @@ write_gif(const char *filename, int width, int height,
         return(0);
     }
 

 
     for (i = 0; i < width * height; i++)
     {
@@ -190,7 +526,7 @@ write_gif(const char *filename, int width, int height,
     if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,   
                        buffer, colormap->Colors) == GIF_ERROR)
     {

         return(0);
     }
 
@@ -198,24 +534,36 @@ write_gif(const char *filename, int width, int height,
     free(green);
     free(blue);
 

         return(0);
     }
 
@@ -224,7 +572,11 @@ write_gif(const char *filename, int width, int height,
     {
         if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
         {

             return(0);
         }
         ptr += width;
@@ -232,8 +584,12 @@ write_gif(const char *filename, int width, int height,
 
     EGifSpew(outfile);
 

Lines 1-4 Link Here

(-)astro/xplanet/files/patch-src_libprojection_ProjectionIcosagnomonic.cpp (-1 / +1 lines)
1	--- src/libprojection/ProjectionIcosagnomonic.cpp.orig 2009-04-16 15:10:08 UTC	1	--- src/libprojection/ProjectionIcosagnomonic.cpp.orig 2020-01-26 19:25:24 UTC
2	+++ src/libprojection/ProjectionIcosagnomonic.cpp	2	+++ src/libprojection/ProjectionIcosagnomonic.cpp
3	@@ -26,6 +26,19 @@ using namespace std;	3	@@ -26,6 +26,19 @@ using namespace std;
4	#define THIGH 3	4	#define THIGH 3




 static void
 readConfig(const char *line, PlanetProperties *planetProperties[])
 {
@@ -49,7 +52,7 @@ readConfig(const char *line, PlanetProperties *planetP
             int r, g, b;
             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
             {

                 currentProperties->ArcColor(color);
             }
             else
@@ -179,7 +182,7 @@ readConfig(const char *line, PlanetProperties *planetP
             int r, g, b;
             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
             {

                 currentProperties->Color(color);
             }
             else
@@ -244,7 +247,7 @@ readConfig(const char *line, PlanetProperties *planetP
             int r, g, b;
             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
             {

                 currentProperties->GridColor(color);
             }
             else
@@ -296,7 +299,7 @@ readConfig(const char *line, PlanetProperties *planetP
             int r, g, b;
             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
             {

                 currentProperties->MarkerColor(color);
             }
             else
@@ -403,7 +406,7 @@ readConfig(const char *line, PlanetProperties *planetP
             int r, g, b;
             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
             {

                 currentProperties->OrbitColor(color);
             }
             else
@@ -473,7 +476,7 @@ readConfig(const char *line, PlanetProperties *planetP
             int r, g, b;
             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
             {

                 currentProperties->TextColor(color);
             }
             else
@@ -550,7 +553,7 @@ readConfigFile(string configFile, PlanetProperties *pl
 
         ifstream inFile(configFile.c_str());
         char *line = new char[256];
-        while (inFile.getline(line, 256, '\n') != NULL)
+        while (inFile.getline(line, 256, '\n'))
             readConfig(line, planetProperties);
         
         // This condition will only be true if [default] is the only

Lines 33-39 WRKSRC= ${WRKDIR}/${PORTNAME} Link Here

(-)audio/aacplusenc/Makefile (-1 lines)
33		33
34	post-patch:	34	post-patch:
35	@${REINPLACE_CMD} -e 's\|-O3 -ftree-vectorize\|${CFLAGS}\| ; s\|-lfftw3f\|-L${LOCALBASE}/lib -lfftw3f\| ; s\|INSTDIR=.*\|INSTDIR=${PREFIX}\|' ${WRKSRC}/Makefile	35	@${REINPLACE_CMD} -e 's\|-O3 -ftree-vectorize\|${CFLAGS}\| ; s\|-lfftw3f\|-L${LOCALBASE}/lib -lfftw3f\| ; s\|INSTDIR=.*\|INSTDIR=${PREFIX}\|' ${WRKSRC}/Makefile
36	@${REINPLACE_CMD} -e 's\|<endian.h>\|<sys/endian.h>\| ; s\|__BYTE\|_BYTE\|' ${WRKSRC}/au_channel.h
37	@${REINPLACE_CMD} -e 's\|gcc\|${CC}\|' ${WRKSRC}/configure	36	@${REINPLACE_CMD} -e 's\|gcc\|${CC}\|' ${WRKSRC}/configure
38		37
39	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 25-33 OPTIONS_SUB= yes Link Here

(-)audio/blop/Makefile (-5 lines)
25	NLS_USES= gettext	25	NLS_USES= gettext
26	NLS_CONFIGURE_ENABLE= nls	26	NLS_CONFIGURE_ENABLE= nls
27		27
28	post-patch:
29	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
30	's\|$$(LIBS)$$\|$$(LIBS) $$(LDFLAGS)\|g ; \
31	s\|-lc \| \|g'
32
33	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Lines 24-33 ALL_TARGET= targets Link Here

(-)audio/cmt/Makefile (-4 lines)
24		24
25	PLIST_FILES= lib/ladspa/cmt.so	25	PLIST_FILES= lib/ladspa/cmt.so
26		26
27	post-patch:
28	@${FIND} ${BUILD_WRKSRC} -name '*.cpp' \| ${XARGS} \
29	${REINPLACE_CMD} -e "s\|<malloc.h>\|<stdlib.h>\|g"
30
31	do-install:	27	do-install:
32	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ladspa	28	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ladspa
33	${INSTALL_LIB} ${WRKSRC}/plugins/cmt.so ${STAGEDIR}${PREFIX}/lib/ladspa/	29	${INSTALL_LIB} ${WRKSRC}/plugins/cmt.so ${STAGEDIR}${PREFIX}/lib/ladspa/




--- dpf/Makefile.base.mk.orig	2019-07-07 08:30:45 UTC
+++ dpf/Makefile.base.mk
@@ -12,6 +12,8 @@ CXX ?= g++
 # Auto-detect OS if not defined
 
 ifneq ($(BSD),true)
+ifneq ($(FREEBSD),true)
+ifneq ($(FREEBSDPPC),true)
 ifneq ($(HAIKU),true)
 ifneq ($(HURD),true)
 ifneq ($(LINUX),true)
@@ -22,6 +24,12 @@ TARGET_MACHINE := $(shell $(CC) -dumpmachine)
 ifneq (,$(findstring bsd,$(TARGET_MACHINE)))
 BSD=true
 endif
+ifneq (,$(findstring freebsd,$(TARGET_MACHINE)))
+FREEBSD=true
+ifneq (,$(findstring powerpc,$(TARGET_MACHINE)))
+FREEBSDPPC=true
+endif
+endif
 ifneq (,$(findstring haiku,$(TARGET_MACHINE)))
 HAIKU=true
 endif
@@ -44,6 +52,8 @@ endif
 endif
 endif
 endif
+endif
+endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set PKG_CONFIG (can be overridden by environment variable)
@@ -107,7 +117,13 @@ endif
 
 BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
 BASE_OPTS  = -O3 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
-
+ifeq ($(FREEBSD),true)
+ifeq ($(FREEBSDPPC),true)
+BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections
+else
+BASE_OPTS  = -O3 -ffast-math -msse -msse2 -fdata-sections -ffunction-sections
+endif
+endif
 ifeq ($(MACOS),true)
 # MacOS linker flags
 LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs

Lines 13-20 COMMENT= Curses MOD/FNK music tracker Link Here

(-)audio/funktrackergold/Makefile (-2 / +2 lines)
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	BROKEN_armv6= fails to compile: function definition is not allowed here	16	BROKEN_armv6= fails to compile: function definition is not allowed here
17	BROKEN_armv7= fails to compile: function definition is not allowed here	17	BROKEN_armv7= fails to compile: function definition is not allowed here
18		18
19	USES= compiler:nestedfct ncurses tar:tgz	19	USES= compiler:nestedfct ncurses tar:tgz
20		20

Lines 1-6 Link Here

(-)audio/funktrackergold/files/patch-Makefile (-10 / +10 lines)
1	--- Makefile.orig Mon Jun 22 20:24:17 1998	1	--- Makefile.orig 2020-01-26 19:53:24 UTC
2	+++ Makefile Sun Apr 1 20:44:19 2001	2	+++ Makefile
3	@@ -5,53 +5,10 @@	3	@@ -5,61 +5,18 @@
4	# FunktrackerGOLD now comes under the GNU General Public License. Please	4	# FunktrackerGOLD now comes under the GNU General Public License. Please
5	# read the COPYING notice in this distribution.	5	# read the COPYING notice in this distribution.
6	############################################################################	6	############################################################################
Lines 20-26 Link Here
20	- OPTIONS += -DLinux	20	- OPTIONS += -DLinux
21	- endif	21	- endif
22	-endif	22	-endif
23	-	23	+all: funkgold
		24
24	-HOST_SAFE = 0	25	-HOST_SAFE = 0
25	-	26	-
26	-ifeq ($(HOSTTYPE),i386)	27	-ifeq ($(HOSTTYPE),i386)
Lines 39-45 Link Here
39	- HOST_SAFE = 1	40	- HOST_SAFE = 1
40	-endif	41	-endif
41	-	42	-
42	-###############################	43	###############################
43	-all:	44	-all:
44	- @if [ $(HOST_SAFE) = '1' ]; then \	45	- @if [ $(HOST_SAFE) = '1' ]; then \
45	- make funkgold; \	46	- make funkgold; \
Lines 53-63 Link Here
53	- echo "Refer to INSTALL file."; \	54	- echo "Refer to INSTALL file."; \
54	- echo "***********************************************"; \	55	- echo "***********************************************"; \
55	- fi	56	- fi
56	+all: funkgold	57	-
57		58	-###############################
58	###############################
59	OBJ_FT = dsp_mixxer.o funktracker.o funkload.o funkgold_misc.o \	59	OBJ_FT = dsp_mixxer.o funktracker.o funkload.o funkgold_misc.o \
60	@@ -59,7 +16,7 @@	60	funkgold_dir.o funkgold_sm.o funkgold_se.o funkgold_pe.o \
61	funkgold_trac.o funkgold.o	61	funkgold_trac.o funkgold.o
62		62
63	funkgold: $(OBJ_FT)	63	funkgold: $(OBJ_FT)
Lines 66-72 Link Here
66	strip funkgold	66	strip funkgold
67		67
68	###############################	68	###############################
69	@@ -69,7 +26,3 @@	69	@@ -69,7 +26,3 @@ clean:
70	release:	70	release:
71	make	71	make
72	rm -f *.o	72	rm -f *.o




--- dsp_mixxer.c.orig	Mon Jun 22 12:39:39 1998
+++ dsp_mixxer.c	Sat Jul 14 21:55:28 2007
@@ -15,15 +15,11 @@
 ***************************************************************************/
 #include <stdio.h>
 #include <math.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#ifdef Linux
- #include <sys/soundcard.h>
-#elif FreeBSD
- #include <machine/soundcard.h>
-#endif
+#include <sys/soundcard.h>
 #include "funktracker_defs.h"
 #include "funktracker.h"
 #include "funkload.h"
@@ -301,12 +297,12 @@
 
   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
   {
-    if(chmix[chan_no].funkctrl & 0x2)
+    if(chmix[chan_no].funkctrl & 0x2) {
 #pragma pack(1)
       sam = *((sDB *)chmix[chan_no].sample_addr +
             (unsigned long)chmix[chan_no].sample_ptr);
 #pragma pack()
-    else
+    } else
       sam = 0;
 
 #ifdef DIGITAL_ECHOING
@@ -363,12 +359,12 @@
   shift_t = 8 + shift_table[funk_info.no_active_channels];
   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
   {
-    if(chmix[chan_no].funkctrl & 0x2)
+    if(chmix[chan_no].funkctrl & 0x2) {
 #pragma pack(1)
       sam = *((sDW *)chmix[chan_no].sample_addr +
             (unsigned long)chmix[chan_no].sample_ptr);
 #pragma pack()
-    else
+    } else
       sam = 0;
 #ifdef DIGITAL_ECHOING
     sam_reverb = *(chmix[chan_no].echo_buffer +

Lines 1-6 Link Here

(-)audio/funktrackergold/files/patch-funkgold__misc.c (-3 / +11 lines)
1	--- funkgold_misc.c.orig Thu Apr 14 17:48:48 2005	1	--- funkgold_misc.c.orig 2020-01-26 19:53:24 UTC
2	+++ funkgold_misc.c Thu Apr 14 17:49:42 2005	2	+++ funkgold_misc.c
3	@@ -30,22 +30,7 @@	3	@@ -17,7 +17,6 @@
		4	#include <stdlib.h>
		5	#include <string.h>
		6	#include <sys/time.h>
		7	-#include <malloc.h>
		8	#include "funktracker_defs.h"
		9	#include "dsp_mixxer.h"
		10	#include "funktracker.h"
		11	@@ -30,22 +29,7 @@
4		12
5	void get_environment(void)	13	void get_environment(void)
6	{	14	{




--- ../funkgold-orig/funkgold.c	Sun Jun 21 22:10:54 1998
+++ funkgold.c	Sun Apr  1 17:53:18 2001
@@ -23,7 +23,7 @@
 ***************************************************************************/
 #include <curses.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <sys/time.h>
--- ../funkgold-orig/funkgold_dir.c	Wed Dec  2 22:01:23 1998
+++ funkgold_dir.c	Sun Apr  1 18:05:59 2001
@@ -18,7 +18,6 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "funktracker_defs.h"
--- ../funkgold-orig/funkgold_misc.c	Sun Jun 21 15:56:46 1998
+++ funkgold_misc.c	Sun Apr  1 17:53:30 2001
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
-#include <malloc.h>
 #include "funktracker_defs.h"
 #include "dsp_mixxer.h"
 #include "funktracker.h"
--- ../funkgold-orig/funkgold_sm.c	Sun Jun 21 15:57:07 1998
+++ funkgold_sm.c	Sun Apr  1 17:53:44 2001
@@ -16,7 +16,7 @@
 ***************************************************************************/
 #include <curses.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "funktracker_defs.h"
 #include "dsp_mixxer.h"
 #include "funktracker.h"
--- ../funkgold-orig/funkload.c	Sun Jun 21 15:57:21 1998
+++ funkload.c	Sun Apr  1 17:53:51 2001
@@ -15,7 +15,7 @@
 ***************************************************************************/
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "funktracker_defs.h"
 #include "dsp_mixxer.h"
 #include "funktracker.h"

Lines 27-33 CPPFLAGS+= -I${LOCALBASE}/include Link Here

(-)audio/libcanberra/Makefile (-1 / +1 lines)
27	LDFLAGS+= -L${LOCALBASE}/lib	27	LDFLAGS+= -L${LOCALBASE}/lib
28	INSTALL_TARGET= install-strip	28	INSTALL_TARGET= install-strip
29		29
30	.if defined(SLAVEPORT)	30	.if !defined(SLAVEPORT)
31	OPTIONS_DEFINE= PULSEAUDIO GSTREAMER	31	OPTIONS_DEFINE= PULSEAUDIO GSTREAMER
32	.endif	32	.endif
33		33





CONFLICTS=	libaudiofile-[0-9]*

post-patch:
	@${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -E \
	    's|iostream.h|iostream|; \
	     s|[[:space:]]cout| std::cout|g; \
	     s|[[:space:]]endl| std::endl|g; \
	     s|[[:space:]]cerr| std::cerr|g;'

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaflib-${PORTVERSION}.so \
	    ${STAGEDIR}${PREFIX}/lib/aflib/lib*-${PORTVERSION}.so




 
 #include "aflibMemCache.h"
 #include "aflibMemNode.h"
@@ -559,7 +560,7 @@ aflibMemCache::fillDataFromCache(
    // IF we need data at the end then get the data
    if (num_samples != orig_num_samples)
    {
-      cerr << "NOT YET IMPLEMENTED!" << endl;
+      std::cerr << "NOT YET IMPLEMENTED!" << endl;
    }
 #endif
 

Lines 17-25 MAKE_ARGS= CFLAGS="${CFLAGS}" MANDIR="${PREFIX}/man/ja/man" BINDIR="${PREFIX}/bi Link Here

(-)audio/play/Makefile (-5 lines)
17		17
18	PLIST_FILES= bin/play man/ja/man1/play.1.gz	18	PLIST_FILES= bin/play man/ja/man1/play.1.gz
19		19
20	post-patch:
21	.for file in play_audio.c mixer_ctl.c encode_sun.c encode_riff.c speed.c
22	@${REINPLACE_CMD} '/soundcard\.h/s,machine,sys,' ${WRKSRC}/${file}
23	.endfor
24
25	.include <bsd.port.mk>	20	.include <bsd.port.mk>

Lines 23-29 LIB_DEPENDS= libsndfile.so:audio/libsndfile \ Link Here

(-)audio/pulseaudio/Makefile (-1 / +1 lines)
23	libltdl.so:devel/libltdl \	23	libltdl.so:devel/libltdl \
24	libck-connector.so:sysutils/consolekit2	24	libck-connector.so:sysutils/consolekit2
25		25
26	USES= compiler:c11 cpe gettext gmake gnome iconv libtool \	26	USES= compiler:c11 cpe gettext gmake gnome iconv libtool:build \
27	pathfix pkgconfig python:run shebangfix ssl tar:xz xorg	27	pathfix pkgconfig python:run shebangfix ssl tar:xz xorg
28		28
29	USE_GNOME= glib20	29	USE_GNOME= glib20

Lines 22-31 MAKE_ARGS= CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS}" \ Link Here

(-)audio/rawrec/Makefile (-4 lines)
22		22
23	PLIST_FILES= bin/rawplay bin/rawrec share/man/man1/rawplay.1.gz share/man/man1/rawrec.1.gz	23	PLIST_FILES= bin/rawplay bin/rawrec share/man/man1/rawplay.1.gz share/man/man1/rawrec.1.gz
24		24
25	post-patch:
26	@${FIND} ${WRKSRC} -name '*.[ch]' \| ${XARGS} ${REINPLACE_CMD} -e \
27	's\|<linux/soundcard.h>\|<sys/soundcard.h>\|g'
28
29	do-install:	25	do-install:
30	${INSTALL_PROGRAM} ${WRKSRC}/rawrec ${STAGEDIR}${PREFIX}/bin	26	${INSTALL_PROGRAM} ${WRKSRC}/rawrec ${STAGEDIR}${PREFIX}/bin
31	${LN} -sf rawrec ${STAGEDIR}${PREFIX}/bin/rawplay	27	${LN} -sf rawrec ${STAGEDIR}${PREFIX}/bin/rawplay





OPTIONS_DEFINE=	DOCS

post-patch:
	${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.orig
	${SED} -E "s:-ldl::g; \
		s:^CFLAGS:XCFLAGS:g; \
		s:^CXXFLAGS:XCXXFLAGS:g; \
		s:-O3::g; \
		s:CFLAGS =:CFLAGS +=:g; \
		s:CXXFLAGS=:CXXFLAGS+=:g; \
		s:-lm:-lpthread -lm:g; \
		s:/usr/X11R6:${LOCALBASE}:g; \
		s:gcc:${CC}:; s:g\+\+:${CXX}:" \
		< ${WRKSRC}/Makefile.in.orig > ${WRKSRC}/Makefile.in

	@${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" | ${XARGS} \
	   ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; /^#include "FL/s|.h"$$|.H"|; \
	   s|fl_file_chooser.H|Fl_File_Chooser.H|g; s|iostream.h|iostream|; s|fstream.h|fstream|'

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${STAGEDIR}${PREFIX}/bin





patch by Stephen Paskaluk to enable compilation with fltk 1.1.2

--- GUI/Widgets/Fl_Knob.H.orig	Thu Apr 19 16:48:10 2001
+++ GUI/Widgets/Fl_Knob.H	Sat Mar  1 12:36:19 2003
@@ -4,6 +4,7 @@
 #define Fl_Knob_H
 #include <FL/Fl.H>
 #include <FL/Fl_Valuator.H>
+#include <FL/Fl_Group.H>
 
 class Fl_Knob : public Fl_Valuator {
 public:




patch by Stephen Paskaluk to enable compilation with fltk 1.1.2

--- GUI/Widgets/Fl_LED_Button.H.orig	Thu Apr 19 16:48:11 2001
+++ GUI/Widgets/Fl_LED_Button.H	Sat Mar  1 12:39:19 2003
@@ -4,6 +4,7 @@
 #define Fl_LED_Button_H
 #include <FL/Fl.H>
 #include <FL/Fl_Light_Button.H>
+#include <FL/Fl_Group.H>
 
 class Fl_LED_Button : public Fl_Light_Button {
 public:




--- GUI/Widgets/Fl_LED_Button.cxx.orig	Thu Apr 19 22:48:11 2001
+++ GUI/Widgets/Fl_LED_Button.cxx	Wed Nov 22 13:16:40 2006
@@ -3,7 +3,7 @@
 #include "Fl_LED_Button.H"
 #include <FL/fl_draw.H>
 
-Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l=0):Fl_Light_Button(x,y,w,h,l) {
+Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l):Fl_Light_Button(x,y,w,h,l) {
   box(FL_NO_BOX);
 	down_box(FL_ROUND_DOWN_BOX);
 	selection_color(FL_RED);
@@ -15,7 +15,7 @@
 void Fl_LED_Button::draw() {
   uchar r,g,b;
 
-	if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
+	if (box()) draw_box(this==Fl::pushed() ? down_box() : box(), color());
 	Fl_Color col = value() ? selection_color() : color();
 	Fl::get_color((Fl_Color)selection_color(),r,g,b);
 	int d = h()/6;




--- GUI/Widgets/Fl_Trigger.h.orig	2001-04-20 00:48:10.000000000 +0400
+++ GUI/Widgets/Fl_Trigger.h	2014-02-13 05:50:41.290374838 +0400
@@ -24,6 +24,9 @@
 #ifndef TRIGGERWIDGET
 #define TRIGGERWIDGET
 
+using std::istream;
+using std::ostream;
+
 class Fl_Trigger : public Fl_Widget
 {
 public:

Lines 1-6 Link Here

(-)audio/spiralloops/files/patch-GUI_OutputGUI.C (-3 / +12 lines)
1	--- GUI/OutputGUI.C.orig Wed Nov 22 13:13:17 2006	1	--- GUI/OutputGUI.C.orig 2001-04-19 20:48:10 UTC
2	+++ GUI/OutputGUI.C Wed Nov 22 13:13:32 2006	2	+++ GUI/OutputGUI.C
3	@@ -26,7 +26,7 @@	3	@@ -18,7 +18,7 @@
		4
		5	#include "OutputGUI.h"
		6
		7	-#include <FL/fl_file_chooser.h>
		8	+#include <FL/Fl_File_Chooser.H>
		9
		10	OutputGUI::OutputGUI(Output *o)
		11	{
		12	@@ -26,7 +26,7 @@ OutputGUI::OutputGUI(Output *o)
4	if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;	13	if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
5	}	14	}
6		15

Lines 1-5 Link Here

(-)audio/spiralloops/files/patch-GUI_ScopeGUI.C (-3 / +3 lines)
1	--- GUI/ScopeGUI.C.orig Wed Nov 22 13:08:41 2006	1	--- GUI/ScopeGUI.C.orig 2001-04-19 20:48:11 UTC
2	+++ GUI/ScopeGUI.C Wed Nov 22 13:10:26 2006	2	+++ GUI/ScopeGUI.C
3	@@ -23,7 +23,7 @@	3	@@ -23,7 +23,7 @@
4		4
5	#include <FL/fl_draw.H>	5	#include <FL/fl_draw.H>
Lines 9-15 Link Here
9	Fl_Widget(x,y,w,h,l),	9	Fl_Widget(x,y,w,h,l),
10	m_Channels(1)	10	m_Channels(1)
11	{	11	{
12	@@ -69,7 +69,7 @@	12	@@ -69,7 +69,7 @@ void ScopeGUI::Display(const short *data)
13	if (!m_Bypass) m_Scope->redraw();	13	if (!m_Bypass) m_Scope->redraw();
14	}	14	}
15		15

Lines 1-5 Link Here

(-)audio/spiralloops/files/patch-GUI_Widgets_Fl__Knob.cxx (-2 / +2 lines)
1	--- GUI/Widgets/Fl_Knob.cxx.orig Wed Nov 22 13:14:11 2006	1	--- GUI/Widgets/Fl_Knob.cxx.orig 2001-04-19 20:48:10 UTC
2	+++ GUI/Widgets/Fl_Knob.cxx Wed Nov 22 13:14:20 2006	2	+++ GUI/Widgets/Fl_Knob.cxx
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4	#include <FL/fl_draw.H>	4	#include <FL/fl_draw.H>
5	#include <math.h>	5	#include <math.h>

Lines 1-6 Link Here

(-)audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.C (-3 / +12 lines)
1	--- GUI/Widgets/Fl_Loop.C.orig Wed Nov 22 13:15:09 2006	1	--- GUI/Widgets/Fl_Loop.C.orig 2001-04-19 20:48:10 UTC
2	+++ GUI/Widgets/Fl_Loop.C Wed Nov 22 13:15:18 2006	2	+++ GUI/Widgets/Fl_Loop.C
3	@@ -30,7 +30,7 @@	3	@@ -17,7 +17,7 @@
		4	*/
		5
		6	#include "Fl_Loop.h"
		7	-#include <iostream.h>
		8	+#include <iostream>
		9	#include <FL/fl_draw.H>
		10	#include <FL/x.H>
		11	#include <math.h>
		12	@@ -30,7 +30,7 @@ static const float RADCONV = 0.017453292;
4	static const int INDW = 3; // indicator width	13	static const int INDW = 3; // indicator width
5	static const int UPDATECYCLES = 4;	14	static const int UPDATECYCLES = 4;
6		15

Lines 1-5 Link Here

(-)audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.h (-2 / +2 lines)
1	--- GUI/Widgets/Fl_Loop.h.orig Wed Nov 22 13:00:49 2006	1	--- GUI/Widgets/Fl_Loop.h.orig 2001-04-19 20:48:10 UTC
2	+++ GUI/Widgets/Fl_Loop.h Wed Nov 22 13:01:09 2006	2	+++ GUI/Widgets/Fl_Loop.h
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4		4
5	#include <FL/Fl.H>	5	#include <FL/Fl.H>

Lines 1-5 Link Here

(-)audio/spiralloops/files/patch-GUI_Widgets_Fl__Trigger.C (-2 / +11 lines)
1	--- GUI/Widgets/Fl_Trigger.C.orig Wed Nov 22 13:17:29 2006	1	--- GUI/Widgets/Fl_Trigger.C.orig 2001-05-07 20:43:34 UTC
2	+++ GUI/Widgets/Fl_Trigger.C Wed Nov 22 13:17:36 2006	2	+++ GUI/Widgets/Fl_Trigger.C
		3	@@ -17,7 +17,7 @@
		4	*/
		5
		6	#include "Fl_Trigger.h"
		7	-#include <iostream.h>
		8	+#include <iostream>
		9	#include <FL/fl_draw.H>
		10	#include <math.h>
		11	#include <stdio.h>
3	@@ -27,7 +27,7 @@	12	@@ -27,7 +27,7 @@
4		13
5	static const float RADCONV = 0.017453292;	14	static const float RADCONV = 0.017453292;




--- ./SpiralSound/Output.h.orig	Sun Dec  1 15:38:45 2002
+++ ./SpiralSound/Output.h	Sun Dec  1 15:40:05 2002
@@ -20,16 +20,12 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
-#if defined (__FreeBSD__)
-	#include <machine/soundcard.h>
-#else
 #if defined (__NetBSD__) || defined (__OpenBSD__)
 	#include <soundcard.h>            /* OSS emulation */
 #undef ioctl
-#else 	                              /* BSDI, Linux, Solaris */
+#else 	                              /* FreeBSD, BSDI, Linux, Solaris */
 	#include <sys/soundcard.h>
 #endif                                /* __NetBSD__ or __OpenBSD__ */
-#endif                                /* __FreeBSD__ */
 #include <sys/ioctl.h>
 #include <limits.h>
 

Lines 1-5 Link Here

(-)audio/spiralloops/files/patch-SpiralLoops.C (-2 / +11 lines)
1	--- SpiralLoops.C.orig 2001-04-19 20:48:11 UTC	1	--- SpiralLoops.C.orig 2001-04-19 20:48:11 UTC
2	+++ SpiralLoops.C	2	+++ SpiralLoops.C
		3	@@ -20,7 +20,7 @@
		4
		5	#include <FL/Fl.H>
		6	#include <FL/Enumerations.H>
		7	-#include <FL/fl_file_chooser.h>
		8	+#include <FL/Fl_File_Chooser.H>
		9	#include <fstream>
		10	#include <strstream>
		11	#include <string>
3	@@ -308,7 +308,7 @@ int Loops::LinkPlugin()	12	@@ -308,7 +308,7 @@ int Loops::LinkPlugin()
4	Run = (Sample ()()) dlsym(handle, "Run__Fv");	13	Run = (Sample ()()) dlsym(handle, "Run__Fv");
5		14
Lines 9-15 Link Here
9	{	18	{
10	cerr<<"Error linking to plugin:"<<endl;	19	cerr<<"Error linking to plugin:"<<endl;
11	fputs(error, stderr);	20	fputs(error, stderr);
12	@@ -467,7 +467,7 @@ inline void Loops::cb_Load_i(Fl_Button*	21	@@ -467,7 +467,7 @@ inline void Loops::cb_Load_i(Fl_Button* o, void* v)
13	{	22	{
14	char fn=fl_file_chooser("Load a Workspace", ".lws", NULL);	23	char fn=fl_file_chooser("Load a Workspace", ".lws", NULL);
15		24
Lines 18-24 Link Here
18	{	27	{
19	ifstream inf(fn);	28	ifstream inf(fn);
20		29
21	@@ -504,7 +504,7 @@ inline void Loops::cb_Save_i(Fl_Button*	30	@@ -504,7 +504,7 @@ inline void Loops::cb_Save_i(Fl_Button* o, void* v)
22	{	31	{
23	char fn=fl_file_chooser("Save a Workspace", ".lws", NULL);	32	char fn=fl_file_chooser("Save a Workspace", ".lws", NULL);
24		33

Lines 1-6 Link Here

(-)audio/spiralloops/files/patch-SpiralSound_Output.C (-3 / +3 lines)
1	--- SpiralSound/Output.C.orig Wed Nov 22 13:07:18 2006	1	--- SpiralSound/Output.C.orig 2001-04-19 20:48:12 UTC
2	+++ SpiralSound/Output.C Wed Nov 22 13:07:30 2006	2	+++ SpiralSound/Output.C
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@ m_Channels(Channels)
4	m_Buffer.Zero();	4	m_Buffer.Zero();
5	}	5	}
6		6

Lines 1-6 Link Here

(-)audio/spiralloops/files/patch-SpiralSound_RiffWav.C (-3 / +12 lines)
1	--- SpiralSound/RiffWav.C.orig Wed Nov 22 13:07:57 2006	1	--- SpiralSound/RiffWav.C.orig 2001-04-19 20:48:12 UTC
2	+++ SpiralSound/RiffWav.C Wed Nov 22 13:08:07 2006	2	+++ SpiralSound/RiffWav.C
3	@@ -55,7 +55,7 @@	3	@@ -16,7 +16,7 @@
		4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
		5	*/
		6
		7	-#include <iostream.h>
		8	+#include <iostream>
		9	#include <fstream>
		10	#include <stdio.h>
		11	#include <stdlib.h>
		12	@@ -55,7 +55,7 @@ WavFile::HeaderInfo::HeaderInfo() : RiffStr1("RIFF"),R
4	#endif	13	#endif
5	}	14	}
6		15

Lines 1-5 Link Here

(-)audio/spiralloops/files/patch-SpiralSound_Sample.C (-2 / +2 lines)
1	--- SpiralSound/Sample.C.orig Wed Nov 22 13:02:12 2006	1	--- SpiralSound/Sample.C.orig 2001-04-19 20:48:13 UTC
2	+++ SpiralSound/Sample.C Wed Nov 22 13:03:58 2006	2	+++ SpiralSound/Sample.C
3	@@ -18,9 +18,9 @@	3	@@ -18,9 +18,9 @@
4		4
5	#include <string.h>	5	#include <string.h>

Lines 8-14 Link Here

(-)audio/spiralloops/files/patch-SpiralSound_Sample.h (-2 / +2 lines)
8	#include "SpiralInfo.h"	8	#include "SpiralInfo.h"
9		9
10	static const unsigned short UMAX_LEV = 65535;	10	static const unsigned short UMAX_LEV = 65535;
11	@@ -63,13 +64,13 @@ public:	11	@@ -63,13 +64,13 @@ class Sample (public)
12	void Shrink(int Length);	12	void Shrink(int Length);
13	void CropTo(int NewLength);	13	void CropTo(int NewLength);
14		14
Lines 24-30 Link Here
24	{	24	{
25	assert(i>=0 && i<m_Length);	25	assert(i>=0 && i<m_Length);
26	// clip	26	// clip
27	@@ -79,7 +80,7 @@ public:	27	@@ -79,7 +80,7 @@ class Sample (public)
28	m_Data[i]=(short)v;	28	m_Data[i]=(short)v;
29	}	29	}
30		30

Lines 1-6 Link Here

(-)audio/spiralloops/files/patch-SpiralSound_SpiralInfo.C (-3 / +11 lines)
1	--- SpiralSound/SpiralInfo.C.orig Wed Nov 22 13:05:47 2006	1	--- SpiralSound/SpiralInfo.C.orig 2001-04-19 20:48:13 UTC
2	+++ SpiralSound/SpiralInfo.C Wed Nov 22 13:06:04 2006	2	+++ SpiralSound/SpiralInfo.C
3	@@ -22,7 +22,7 @@	3	@@ -16,13 +16,13 @@
		4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
		5	*/
		6
		7	-#include <iostream.h>
		8	-#include <fstream.h>
		9	+#include <iostream>
		10	+#include <fstream>
		11	#include <stdlib.h>
4		12
5	#include "SpiralInfo.h"	13	#include "SpiralInfo.h"
6		14

Lines 1-5 Link Here

(-)audio/spiralloops/files/patch-SpiralSound_SpiralInfo.h (-2 / +2 lines)
1	--- SpiralSound/SpiralInfo.h.orig Wed Nov 22 12:59:01 2006	1	--- SpiralSound/SpiralInfo.h.orig 2001-04-19 20:48:12 UTC
2	+++ SpiralSound/SpiralInfo.h Wed Nov 22 13:00:04 2006	2	+++ SpiralSound/SpiralInfo.h
3	@@ -16,13 +16,15 @@	3	@@ -16,13 +16,15 @@
4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.	4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
5	*/	5	*/





OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math

post-patch:
	@${REINPLACE_CMD} -E -e 's@(-O3|-ffast-math)@@g; \
		s|-Wall||; \
		s|CFLAGS="-pipe|CFLAGS="\$$\{CFLAGS\}|; \
		s|CXXFLAGS="-pipe|CXXFLAGS="\$$\{CXXFLAGS\}|; \
		s|^SpiralSound/Plugins/MidiPlugin/Makefile||; \
		s|MidiPlugin||' \
			${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
	@${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include|' \
		${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in
	@${REINPLACE_CMD} -e 's|O_SYNC|O_FSYNC|' \
		${WRKSRC}/SpiralSound/Midi.C
	@${REINPLACE_CMD} -e 's|True|true|; s|False|false|' \
		${WRKSRC}/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
	@${REINPLACE_CMD} -e 's|JackPort::||' \
		${WRKSRC}/SpiralSound/Plugins/JackPlugin/JackPlugin.h
	@${REINPLACE_CMD} -e 's|CVGUI::||' \
		${WRKSRC}/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h
	@${REINPLACE_CMD} -e 's|Sample::||' \
		${WRKSRC}/SpiralSound/Sample.h
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E -e \
		's,-l(dl|rt),,; s|g\+\+|$$(CXX)|; \
		/^(CC|CXX)[[:space:]]*=.+$$/d; \
		s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \
		s,(bin|lib)dir),DESTDIR)$$(&,'
	@${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" \
		| ${XARGS} ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; \
		/^#include "FL/s|.h"$$|.H"|; \
		s|fl_file_chooser.H|Fl_File_Chooser.H|g'

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/SpiralPlugins/*.so

Lines 1-6 Link Here

(-)audio/spiralsynthmodular/files/patch-SpiralSound_PluginManager.C (-2 / +2 lines)
1	--- SpiralSound/PluginManager.C.orig 2003-08-08 13:07:30 UTC	1	--- SpiralSound/PluginManager.C.orig 2003-08-08 13:07:30 UTC
2	+++ SpiralSound/PluginManager.C	2	+++ SpiralSound/PluginManager.C
3	@@ -49,7 +49,7 @@ PluginID PluginManager::LoadPlugin(const	3	@@ -49,7 +49,7 @@ PluginID PluginManager::LoadPlugin(const char *PluginN
4	}	4	}
5		5
6	// Link the neccesary functions	6	// Link the neccesary functions
Lines 9-15 Link Here
9		9
10	NewPlugin->CreateInstance = (SpiralPlugin()()) dlsym(NewPlugin->Handle, "SpiralPlugin_CreateInstance");	10	NewPlugin->CreateInstance = (SpiralPlugin()()) dlsym(NewPlugin->Handle, "SpiralPlugin_CreateInstance");
11		11
12	@@ -98,7 +98,7 @@ void PluginManager::UnLoadPlugin(PluginI	12	@@ -98,7 +98,7 @@ void PluginManager::UnLoadPlugin(PluginID ID)
13	if (IsValid(ID))	13	if (IsValid(ID))
14	{	14	{
15	dlclose(GetPlugin(ID)->Handle);	15	dlclose(GetPlugin(ID)->Handle);

Lines 1-6 Link Here

(-)audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h (-1 / +1 lines)
1	--- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h.orig 2003-06-05 18:26:42 UTC	1	--- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h.orig 2003-06-05 18:26:42 UTC
2	+++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h	2	+++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h
3	@@ -91,7 +91,7 @@ public:	3	@@ -91,7 +91,7 @@ class LADSPAInfo (public)
4	unsigned long UniqueID;	4	unsigned long UniqueID;
5	std::string Name;	5	std::string Name;
6		6




 #else
 #if defined (__NetBSD__) || defined (__OpenBSD__)
 	#include <soundcard.h>            /* OSS emulation */
@@ -41,7 +42,7 @@
 
 #include "OutputPlugin.h"
 #include "OutputPluginGUI.h"
-#include <FL/fl_file_chooser.H>
+#include <FL/Fl_File_Chooser.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;




--- SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C.orig	2003-08-08 17:55:51 UTC
+++ SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
@@ -17,9 +17,9 @@
 */
 
 #include "PoshSamplerPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <FL/fl_draw.H>
+#include <FL/Fl_File_Chooser.H>
 
 using namespace std;
 
@@ -502,7 +502,7 @@ inline void PoshSamplerPluginGUI::cb_Load_i(Fl_Button*
 { 
 	char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL);




--- SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C.orig	2003-08-08 17:55:52 UTC
+++ SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C
@@ -17,9 +17,9 @@
 */
 
 #include "SpiralLoopPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <FL/fl_draw.H>
+#include <FL/Fl_File_Chooser.H>
 
 using namespace std;
 
@@ -350,7 +350,7 @@ inline void SpiralLoopPluginGUI::cb_Load_i(Fl_Button* 
 {
 	char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL);




--- SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C.orig	2003-08-08 17:55:52 UTC
+++ SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C
@@ -17,9 +17,9 @@
 */
 
 #include "StreamPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <FL/fl_draw.H>
+#include <FL/Fl_File_Chooser.H>
 
 using namespace std;
 
@@ -220,7 +220,7 @@ void StreamPluginGUI::cb_Pos (Fl_Slider* o, void* v) {
 
 inline void StreamPluginGUI::cb_Load_i (Fl_Button* o, void* v) {




--- SpiralSynthModular.C.orig	2004-03-20 09:52:38 UTC
        if (fn && fn!='\0')
                  ~~^ ~~~~

--- SpiralSynthModular.C.orig	2018-08-01 05:55:58 UTC
+++ SpiralSynthModular.C
@@ -27,9 +27,9 @@
 
 #include <FL/Fl.H>
 #include <FL/Enumerations.H>
-#include <FL/fl_file_chooser.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Tooltip.h>
+#include <FL/Fl_File_Chooser.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Tooltip.H>
 
 #include "SpiralSynthModular.h"
 #include "SpiralSound/PluginManager.h"
@@ -1013,7 +1013,7 @@ inline void SynthModular::cb_Load_i(Fl_Button* o, void
 
 	char *fn=fl_file_chooser("Load a patch", "*.ssm", NULL);




--- SpiralSound/ChannelHandler.C.orig	2003-02-21 00:51:15 UTC
+++ SpiralSound/ChannelHandler.C
@@ -19,6 +19,9 @@
 #include "ChannelHandler.h"
 #include <unistd.h>
 
+#include <cstdlib>
+#include <cstring>
+
 using namespace std;
 
 //#define CHANNEL_DEBUG
--- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C.orig	2003-08-08 17:58:26 UTC
+++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C
@@ -30,6 +30,7 @@
 #include <stdio.h>
 
 #include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
--- SpiralSound/Sample.h.orig	2003-07-22 22:08:41 UTC
+++ SpiralSound/Sample.h
@@ -23,6 +23,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <cstring>
 #include <iostream>
 
 //#define DEBUG




     /* errors?  we don't need no stinking errors */
     return;
 }
@@ -36,47 +36,26 @@ void flac_error_callback(const FLAC__FileDecoder *deco
  */
 void *flac_open( char *filename, sound_format_t *sound_format ) {
     flac_data_t *flac_data;

             break;
     }
 
@@ -86,7 +65,7 @@ void *flac_open( char *filename, sound_format_t *sound
     flac_data->sample_rate = -1;
     flac_data->duration = -1;
 

 
     sound_format->rate = flac_data->sample_rate;
     sound_format->channels = flac_data->channels;
@@ -97,12 +76,12 @@ void *flac_open( char *filename, sound_format_t *sound
     return (void *)flac_data;
 }
 

     FLAC__StreamMetadata_VorbisComment comment = metadata->data.vorbis_comment;
     int i;
     char *start, *end, *key, *value;
@@ -128,7 +107,7 @@ void flac_metadata_callback_load_meta( const FLAC__Fil
     }
 }
 

     flac_data_t *flac_data = (flac_data_t *)client_data;
     int i, j, k;
 
@@ -158,7 +137,7 @@ FLAC__StreamDecoderWriteStatus flac_write_callback_dec
     return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 

     flac_data_t *flac_data = (flac_data_t *)client_data;
 
     if( metadata->type != FLAC__METADATA_TYPE_STREAMINFO ) {
@@ -172,47 +151,29 @@ void flac_metadata_callback_decode_frame( const FLAC__
 }
 
 void flac_load_meta( void *data, char *filename ) {

-    if( !FLAC__file_decoder_set_filename( decoder, filename ) ) {
-        squash_error( "Unable to set filename in decoder" );
-    }
+    FLAC__stream_decoder_set_metadata_respond_all( decoder );
 
-    FLAC__file_decoder_set_metadata_callback( decoder, flac_metadata_callback_load_meta );
-    FLAC__file_decoder_set_metadata_respond_all( decoder );
-

-    FLAC__file_decoder_set_error_callback( decoder, flac_error_callback );
-
-    FLAC__file_decoder_set_client_data( decoder, data );
-
 
-    state = FLAC__file_decoder_init( decoder );
+    state = FLAC__stream_decoder_init_file( decoder, filename,  flac_write_callback_load_meta, flac_metadata_callback_load_meta, flac_error_callback, data );
     switch( state ) {

 
     return;
 }
@@ -223,29 +184,27 @@ void flac_load_meta( void *data, char *filename ) {
 frame_data_t flac_decode_frame( void *data ) {
     flac_data_t *flac_data = (flac_data_t *)data;
     frame_data_t frame_data;

     return;
 }
 
@@ -277,9 +236,9 @@ void flac_seek( void *data, long seek_time, long durat
 void flac_close( void *data ) {
     flac_data_t *flac_data = (flac_data_t *)data;
 

Lines 18-27 LIB_DEPENDS= libtag.so:audio/taglib Link Here

(-)audio/vitunes/Makefile (-1 / +1 lines)
18		18
19	USES= ncurses	19	USES= ncurses
20	ALL_TARGET= vitunes	20	ALL_TARGET= vitunes
		21	MAKE_ARGS= PREFIX=${PREFIX}
21	PLIST_FILES= bin/vitunes man/man1/${PORTNAME}.1.gz	22	PLIST_FILES= bin/vitunes man/man1/${PORTNAME}.1.gz
22		23
23	post-patch:	24	post-patch:
24	@${REINPLACE_CMD} -e 's\|/usr/local\|${PREFIX}\|g' ${WRKSRC}/Makefile
25	@${REINPLACE_CMD} -e '27d' ${WRKSRC}/vitunes.h	25	@${REINPLACE_CMD} -e '27d' ${WRKSRC}/vitunes.h
26		26
27	.include <bsd.port.mk>	27	.include <bsd.port.mk>





OPTIONS_DEFINE=	DOCS

post-patch:
	@${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \
		${REINPLACE_CMD} -e \
		's|-O[0-9]|| ; \
		 s| pthread| -pthread|'
	@${REINPLACE_CMD} -e '/long long int/s|std::abs|llabs|' \
		${WRKSRC}/avida-core/source/main/cPopulationInterface.cc
	@${REINPLACE_CMD} -e '/__PPC__/s|linux|${OPSYS}|' \
		${WRKSRC}/libs/tcmalloc-1.4/src/atomicops.h

pre-build:
.for exec in ${BIN_FILES}
	@(cd ${WRKSRC} && ${ECHO_CMD} \




--- avida-core/source/main/cGenomeUtil.cc.orig
+++ avida-core/source/main/cGenomeUtil.cc
@@ -214,7 +214,14 @@
  */
 void cGenomeUtil::RandomShuffle(cAvidaContext& ctx, Sequence& genome) {
 	std::vector<int> idx(static_cast<std::size_t>(genome.GetSize()));
-	std::iota(idx.begin(), idx.end(), 0);
+
+	std::vector<int>::iterator idx_it = idx.begin();
+	int value = 0;
+	while (idx_it != idx.end()) {
+		*idx_it++ = value;
+		++value;
+	}
+
 	cRandomStdAdaptor rng(ctx.GetRandom());
 	std::random_shuffle(idx.begin(), idx.end(), rng);
 	Sequence shuffled(genome.GetSize());

Removed Link Here

(-)biology/avida/files/patch-avida-core__source__tools__tArray.h (-10 lines)
1	--- avida-core/source/tools/tArray.h.orig
2	+++ avida-core/source/tools/tArray.h
3	@@ -23,6 +23,7 @@
4	#ifndef tArray_h
5	#define tArray_h
6
7	+#include <cstdlib>
8	#include <cassert>
9
10	#ifndef NULL

Removed Link Here

(-)biology/avida/files/patch-libs__tcmalloc-1.4__src__malloc_extension.cc (-10 lines)
1	--- libs/tcmalloc-1.4/src/malloc_extension.cc.orig
2	+++ libs/tcmalloc-1.4/src/malloc_extension.cc
3	@@ -57,6 +57,7 @@
4	#include <string.h>
5	#include <stdio.h>
6	#include <stdlib.h>
7	+#include <pthread.h>
8	#if defined HAVE_STDINT_H
9	#include <stdint.h>
10	#elif defined HAVE_INTTYPES_H

Lines 1-6 Link Here

(-)biology/avida/files/patch-libs_apto_include_apto_core_Atomic.h (-1 / +1 lines)
1	--- libs/apto/include/apto/core/Atomic.h.orig 2012-09-29 03:33:38 UTC	1	--- libs/apto/include/apto/core/Atomic.h.orig 2012-09-29 03:33:38 UTC
2	+++ libs/apto/include/apto/core/Atomic.h	2	+++ libs/apto/include/apto/core/Atomic.h
3	@@ -88,6 +88,25 @@ inline void Apto::Atomic::Set(volatile i	3	@@ -88,6 +88,25 @@ inline void Apto::Atomic::Set(volatile int* atomic, in
4	*atomic = value;	4	*atomic = value;
5	}	5	}
6		6




READMES=	README.FIRST README.chaos README.lagan README.mlagan \
		README.tools README.shuffle

post-patch:
	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
		'/^CC/s|^|#| ; \
		 /^CFLAGS/s|^|#| ; \
		 s|$$(CC) -o|$$(CC) $$(CFLAGS) -o| ; \
		 s|$$(CPP) -o|$$(CXX) $$(CXXFLAGS) -o| ; \
		 s|$$(CLINKER) $$(OPTFLAGS)|$$(CXX) $$(LDFLAGS)|'
	@${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
		's|^inline |static inline |'

do-install:
	@${MKDIR} ${STAGEDIR}${LAGAN_DIR}
.for exe in ${EXECUTABLES}




--- src/glocal/rightinfluence.cpp.orig	2006-09-14 20:40:19 UTC
+++ src/glocal/rightinfluence.cpp
@@ -1,6 +1,6 @@
 #include <rightinfluence.h>
 
-Fragment origin, end;
+Fragment origin, my_end;
 
 // Sets the first default owner of the whole region
 void initRI(RI *RightInfluence, long long int scoreIndex) {
@@ -18,17 +18,17 @@ void initRI(RI *RightInfluence, long lon
 
 	// hack to aid winner selection
 	origin.score = -1;
-	end.score = -2;
-	origin.totalScore = end.totalScore = 0;
+	my_end.score = -2;
+	origin.totalScore = my_end.totalScore = 0;
 
 	// will win against anyone
-	end.seq1End = 0; end.seq2End = 0;
-	end.seq1Start = 0; end.seq2Start = 0;
+	my_end.seq1End = 0; my_end.seq2End = 0;
+	my_end.seq1Start = 0; my_end.seq2Start = 0;
 
 	origin.back = NULL;
 
     RightInfluence->act[-INF] = &origin;
-    RightInfluence->act[+INF] = &end;
+    RightInfluence->act[+INF] = &my_end;
 }
 
 

Removed Link Here

(-)biology/lagan/files/patch-src__glocal__score.cpp (-11 lines)
1	--- src/glocal/score.cpp.orig 2006-09-14 20:40:19 UTC
2	+++ src/glocal/score.cpp
3	@@ -2,7 +2,7 @@
4	#include<score.h>
5	#include<leftinfluence.h>
6	#include<rightinfluence.h>
7	-#include<fstream.h>
8	+#include<fstream>
9
10	extern vector<class Score*> scoreFunctions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBITS)];
11

Removed Link Here

(-)biology/lagan/files/patch-src__utils__Glue.cpp (-10 lines)
1	--- src/utils/Glue.cpp.orig 2006-09-14 20:40:18 UTC
2	+++ src/utils/Glue.cpp
3	@@ -6,6 +6,7 @@
4	#include <fstream>
5	#include <iostream>
6	#include <algorithm>
7	+#include <cstring>
8
9	#define NUCLEOTIDE_MATRIX_FILE "nucmatrix.txt"
10	#define MAX_LINE_LENGTH 1024

Lines 1-4 Link Here

(-)biology/lagan/files/patch-src_anchors.c (-2 / +2 lines)
1	--- src/anchors.c.orig 2016-05-11 21:46:55 UTC	1	--- src/anchors.c.orig 2006-09-14 20:40:19 UTC
2	+++ src/anchors.c	2	+++ src/anchors.c
3	@@ -225,7 +225,7 @@ char* rolltonum(char* str) {	3	@@ -225,7 +225,7 @@ char* rolltonum(char* str) {
4	return &str[i];	4	return &str[i];
Lines 9-15 Link Here
9	char temp[1024];	9	char temp[1024];
10	char* help;	10	char* help;
11	int z, h;	11	int z, h;
12	@@ -248,7 +248,7 @@ hll* parseCHAOS(FILE* infile, int* totnu	12	@@ -248,7 +248,7 @@ hll* parseCHAOS(FILE* infile, int* totnum) {
13	*totnum = 0;	13	*totnum = 0;
14	while(!feof(infile)) {	14	while(!feof(infile)) {
15	tt = (hll*) malloc(sizeof(hll));	15	tt = (hll*) malloc(sizeof(hll));




GH_ACCOUNT=	stephaneguindon

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-native

PLIST_FILES=	bin/phyml${BIN_SUFFIX}
PORTDOCS=	*

BIN_SUFFIX=		# none
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|-O2 .* $${ARCH_flag}|$${CFLAGS}|' ${WRKSRC}/configure.ac
.if ${ARCH} != amd64 && ${ARCH} != i386
	@${REINPLACE_CMD} -e 's|VECTOR_FLAG=-march=native|dnl &|' ${WRKSRC}/configure.ac
.endif
	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/utilities.h

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.pdf \





OPTIONS_DEFINE=	DOCS EXAMPLES

post-patch:
	@${FIND} ${BUILD_WRKSRC} -name "makefile" | ${XARGS} \
		${REINPLACE_CMD} -e \
		's|^CC =|CC ?=| ; \
		 s|^CFLAGS =|CFLAGS +=| ; \
		 s|-O[0-9] | | ; \
		 s|-g | | ; \
		 s|-g[0-9] | | ; \
		 s|-lpthread|-pthread| ; \
		 s|glib-config|pkg-config glib-2.0| ; \
		 /welcome.csh/s|^|#|'

do-install:
	(cd ${BUILD_WRKSRC}/bin && ${INSTALL_PROGRAM} ${BINFILES} \
		${STAGEDIR}${PREFIX}/bin)





ALLIANCE_TOP=	${PREFIX}/alliance

post-patch:
	@${REINPLACE_CMD} -e '/include <malloc.h>/d' \
		${WRKSRC}/xgra/src/XSB_parse.c
	# These Makefiles contain hardcoded references to make(1). Replace them with
	# gmake(1) to avoid build failures of the documentation.
	@${REINPLACE_CMD} -e 's/; make/; gmake/' \
		${WRKSRC}/documentation/Makefile.am \
		${WRKSRC}/documentation/alliance-examples/Makefile \
		${WRKSRC}/documentation/tutorials/Makefile.am

pre-configure:
	@cd ${WRKSRC} && ./autostuff





GNU_CONFIGURE=	yes
CONFIGURE_ENV=	prefix=${STAGEDIR}${PREFIX}

MAKE_ARGS=	CCC=c++ \
		CCFLAGS="${CXXFLAGS}"
CXXFLAGS+=	-fPIC -I${PREFIX}/include -I${WRKSRC}/include
ALL_TARGET=	gnucap

PLIST_FILES=	bin/gnucap \
		bin/gnucap-modelgen \
		lib/libgnucap-default-plugins.so \
		lib/libgnucap.so

PORTDOCS=	README
EXAMPLES=	*.ckt *.doc *c runl

OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} 's/%%CXX%%/${CXX}/g' \
		${WRKSRC}/main/configure \
		${WRKSRC}/apps/configure \
		${WRKSRC}/modelgen/configure \
		${WRKSRC}/lib/configure

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/main/O/gnucap ${WRKSRC}/modelgen/O/gnucap-modelgen \

Lines 23-31 LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ Link Here

(-)cad/kicad/Makefile (-3 / +5 lines)
23		23
24	CONFLICTS= kicad-devel-r201*	24	CONFLICTS= kicad-devel-r201*
25		25
26	USE_GITHUB= yes	26	USE_GITLAB= yes
27	GH_ACCOUNT= KiCad	27	GL_ACCOUNT= kicad
28	GH_PROJECT= kicad-source-mirror	28	GL_PROJECT= code/kicad
		29	GL_COMMIT= bd23d003d219cb513b01feb4d9763879c9248f53
		30	WRKSRC= ${WRKDIR}/${PORTNAME}-${GL_COMMIT}-${GL_COMMIT}
29		31
30	USES= cmake:noninja compiler:c++11-lib desktop-file-utils gl \	32	USES= cmake:noninja compiler:c++11-lib desktop-file-utils gl \
31	gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \	33	gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \

Lines 1-3 Link Here

(-)cad/kicad/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1589226804	1	TIMESTAMP = 1599528435
2	SHA256 (KiCad-kicad-source-mirror-5.1.6_GH0.tar.gz) = caf54b256f17171d4be57c1905ab6a0d3bce1de7226e1f9b152c6501507cad52	2	SHA256 (kicad-code/kicad-bd23d003d219cb513b01feb4d9763879c9248f53_GL0.tar.gz) = 9d444a7002a2e1a52e79dd08143b2f271801930f6972dcddd9263989de6bd7f5
3	SIZE (KiCad-kicad-source-mirror-5.1.6_GH0.tar.gz) = 23789922	3	SIZE (kicad-code/kicad-bd23d003d219cb513b01feb4d9763879c9248f53_GL0.tar.gz) = 28805890

Lines 6-12 DISTVERSIONPREFIX= v Link Here

(-)cad/solvespace/Makefile (-1 / +1 lines)
6	PORTREVISION= 5	6	PORTREVISION= 5
7	CATEGORIES= cad	7	CATEGORIES= cad
8		8
9	MAINTAINER= swills@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Parametric 2d/3d CAD	10	COMMENT= Parametric 2d/3d CAD
11		11
12	LICENSE= GPLv3+	12	LICENSE= GPLv3+

Lines 12-17 COMMENT= Convert between Gregorian Solar Calendar (SC) and Lunar Calendar (LC) Link Here

(-)chinese/lunar/Makefile (+2 lines)
12		12
13	ALL_TARGET=	13	ALL_TARGET=
14		14
		15	PLIST_FILES= bin/lunar man/man1/lunar.1.gz share/chinese/lunar.bitmap
		16
15	do-install:	17	do-install:
16	@${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese	18	@${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese
17	${INSTALL_PROGRAM} ${WRKSRC}/lunar ${STAGEDIR}${PREFIX}/bin	19	${INSTALL_PROGRAM} ${WRKSRC}/lunar ${STAGEDIR}${PREFIX}/bin

Lines 1-5 Link Here

(-)chinese/lunar/files/patch-Makefile (-2 / +2 lines)
1	--- Makefile.orig Mon Aug 10 21:14:48 1992	1	--- Makefile.orig 2020-01-26 19:55:51 UTC
2	+++ Makefile Tue Feb 4 01:20:50 1997	2	+++ Makefile
3	@@ -1,6 +1,8 @@	3	@@ -1,6 +1,8 @@
4	# Makefile of LUNAR	4	# Makefile of LUNAR
5		5

Lines 1-6 Link Here

(-)chinese/lunar/files/patch-lunar.1 (-4 / +4 lines)
1	--- lunar.1.orig Tue Aug 11 12:14:48 1992	1	--- lunar.1.orig 2020-01-26 19:55:51 UTC
2	+++ lunar.1 Tue Feb 26 21:00:38 2002	2	+++ lunar.1
3	@@ -4,13 +4,15 @@	3	@@ -4,13 +4,15 @@ lunar (version 2.1) \- a calendar conversion utility
4	.SH SYNTAX	4	.SH SYNTAX
5	.B lunar	5	.B lunar
6	[	6	[
Lines 20-26 Link Here
20	]	20	]
21	.I year month day	21	.I year month day
22	[	22	[
23	@@ -56,14 +58,16 @@	23	@@ -56,14 +58,16 @@ For example, "jia-zi" is 1, "yi-chou" is 2, and so on.
24	The ganzhi of the j-th leap month is the same as that of the j-th month.	24	The ganzhi of the j-th leap month is the same as that of the j-th month.
25		25
26	The possible options are	26	The possible options are




--- lunar.c.orig	Mon Aug 10 21:14:48 1992
+++ lunar.c	Tue Feb  4 01:04:18 1997
@@ -60,6 +60,10 @@
 #define	GanBM	4
 #define	ZhiBM	14
 
+#ifndef BITMAPFILE
+#define BITMAPFILE "lunar.bitmap"
+#endif
+
 typedef struct {
 int year, month, day, hour, weekday;
 int leap;	/* the lunar month is a leap month */
@@ -124,7 +128,7 @@
 
 int	showHZ = 0;			/* output in hanzi */
 int	showBM = 0;			/* output in bitmap */
-char	BMfile[] = "lunar.bitmap";	/* bit map file */
+char	BMfile[] = BITMAPFILE;	/* bit map file */
 char	GZBM[NBM][BMRow][BMCol];	/* the bitmap array */
 char	*progname;
 

Removed Link Here

(-)chinese/lunar/files/patch-lunar.c_2 (-120 lines)
1	--- lunar.c.orig Tue Feb 26 20:54:23 2002
2	+++ lunar.c Tue Feb 26 21:01:38 2002
3	@@ -118,6 +118,26 @@
4	"ËÄ", "Îå", "Áù"
5	};
6
7	+static char *GanBIG5[] = {
8	+ "¥Ò", "¤A", "¤þ", "¤B", "¥³",
9	+ "¤v", "©°", "¨¯", "¤Ð", "¬Ñ"
10	+};
11	+
12	+static char *ZhiBIG5[] = {
13	+ "¤l", "¤¡", "±G", "¥f", "¨°", "¤x",
14	+ "¤È", "¥¼", "¥Ó", "¨»", "¦¦", "¥è"
15	+};
16	+
17	+static char *ShengXiaoBIG5[] = {
18	+ "¹«", "¤û", "ªê", "¨ß", "Às", "³D",
19	+ "°¨", "¦Ï", "µU", "Âû", "ª¯", "½Þ"
20	+};
21	+
22	+static char *weekdayBIG5[] = {
23	+ "¤é", "¤@", "¤G", "¤T",
24	+ "¥\|", "¤", "¤»"
25	+};
26	+
27
28	Date solar, lunar, gan, zhi, gan2, zhi2, lunar2;
29
30	@@ -127,6 +147,7 @@
31	int jieAlert; /* if there is uncertainty in JieQi calculation */
32
33	int showHZ = 0; /* output in hanzi */
34	+int showB5 = 0; /* output in big5 */
35	int showBM = 0; /* output in bitmap */
36	char BMfile[] = BITMAPFILE; /* bit map file */
37	char GZBM[NBM][BMRow][BMCol]; /* the bitmap array */
38	@@ -139,7 +160,7 @@
39	void CalGZ();
40	int JieDate(), JieDate();
41	void readBM(), display3();
42	-void Report(), ReportE(), ReportBM(), ReportGB();
43	+void Report(), ReportE(), ReportBM(), ReportGB(), ReportBIG5();
44	void usage(), Error();
45
46
47	@@ -162,6 +183,7 @@
48	case 'l': if (inverse) leap=1; else usage(); break;
49	case 'h': showHZ = 1; break;
50	case 'b': showBM = 1; break;
51	+ case '5': showB5 = 1; break;
52	default: usage(); break;
53	}
54	}
55	@@ -213,13 +235,14 @@
56	void usage()
57	{
58	printf("Usage:\n\n");
59	- printf("Solar->Lunar:\t%s [-h] [-b] year month day [hour]\n", progname);
60	+ printf("Solar->Lunar:\t%s [-h] [-5] [-b] year month day [hour]\n", progname);
61	printf("\t\t(in Solar Calendar, 24 hour clock)\n\n");
62	- printf("Lunar->Solar:\t%s [-h] [-b] -i [-l] year month day [hour]\n",
63	+ printf("Lunar->Solar:\t%s [-h] [-5] [-b] -i [-l] year month day [hour]\n",
64	progname);
65	printf("\t\t(in Lunar Calendar, 24 hour clock)\n");
66	printf("\t\t-l means the month is a leap month (\"run4 yue4\")\n\n");
67	printf("\t\t-h means output in hanzi (GB)\n");
68	+ printf("\t\t-5 means output in traditional chinese(BIG5)\n");
69	printf("\t\t-b means output in \"bitmap\"\n\n");
70	printf("Date range: about %d years from the Solar Date %d.%d.%d\n", Nyear,
71	SolarFirstDate.year, SolarFirstDate.month, SolarFirstDate.day);
72	@@ -578,6 +601,8 @@
73	{
74	if (showHZ)
75	ReportGB();
76	+ else if (showB5)
77	+ ReportBIG5();
78	else if (showBM)
79	ReportBM();
80	else
81	@@ -614,6 +639,39 @@
82	if (lunar2.month==1)
83	printf("* %s\n", "ÄêÖùÒà¿ÉÄÜÒªÐÞ¸Ä");
84	printf("* %s\n", "Çë²éÓÐ½ÚÆøÊ±¼äÖ®ÍòÄêÀú");
85	+ }
86	+}
87	+
88	+
89	+void ReportBIG5()
90	+{
91	+ printf("%s%d%s%2d%s%2d%s%2d%s%s%s\n", "¶§¾ú¡G¡@",
92	+ solar.year, "¦~", solar.month, "¤ë", solar.day,
93	+ "¤é", solar.hour, "®É¡@",
94	+ "¬P´Á", weekdayBIG5[solar.weekday]);
95	+ printf("%s%d%s%s%2d%s%2d%s%s%s%s%s\n", "³±¾ú¡G¡@",
96	+ lunar.year, "¦~", (lunar.leap? "¶\|":""),
97	+ lunar.month, "¤ë", lunar.day, "¤é",
98	+ ZhiBIG5[zhi.hour], "®É¡@",
99	+ "¥Í¨vÄÝ", ShengXiaoBIG5[zhi.year]);
100	+ printf("%s%s%s%s%s%s%s%s%s%s%s%s%s\n", "¤z¤ä¡G¡@",
101	+ GanBIG5[gan.year], ZhiBIG5[zhi.year], "¦~¡@",
102	+ GanBIG5[gan.month], ZhiBIG5[zhi.month], "¤ë¡@",
103	+ GanBIG5[gan.day], ZhiBIG5[zhi.day], "¤é¡@",
104	+ GanBIG5[gan.hour], ZhiBIG5[zhi.hour], "®É¡@");
105	+ printf("%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
106	+ "¥Î¥\|¬W¯«ºâ±Àºâ¤§®É¨°¤K¦r¡G¡@",
107	+ GanBIG5[gan2.year], ZhiBIG5[zhi2.year], "¦~¡@",
108	+ GanBIG5[gan2.month], ZhiBIG5[zhi2.month], "¤ë¡@",
109	+ GanBIG5[gan2.day], ZhiBIG5[zhi2.day], "¤é¡@",
110	+ GanBIG5[gan2.hour], ZhiBIG5[zhi2.hour], "®É¡@");
111	+ if (jieAlert)
112	+ {
113	+ printf("* %s, %s\n", "¬O¤é¬°¸`",
114	+ "¤ë¬W¥i¯àn×§ï");
115	+ if (lunar2.month==1)
116	+ printf("* %s\n", "¦~¬W¥ç¥i¯àn×§ï");
117	+ printf("* %s\n", "½Ð¬d¦³¸`®ð®É¶¡¤§¸U¦~¾ú");
118	}
119	}
120

Removed Link Here

(-)chinese/lunar/pkg-plist (-3 lines)
1	bin/lunar
2	man/man1/lunar.1.gz
3	share/chinese/lunar.bitmap

Lines 15-22 GNU_CONFIGURE= YES Link Here

(-)chinese/oto/Makefile (-4 lines)
15	CPPFLAGS+= -I${LOCALBASE}/include	15	CPPFLAGS+= -I${LOCALBASE}/include
16	LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB}	16	LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB}
17		17
18	post-patch:
19	@${FIND} ${WRKSRC}/src/ -type f -print0 \| \
20	${XARGS} -0 ${REINPLACE_CMD} -e 's,stdint.h,inttypes.h,'
21
22	.include <bsd.port.mk>	18	.include <bsd.port.mk>

Lines 11-17 DISTNAME= ${PORTNAME} Link Here

(-)comms/bpl+/Makefile (-1 / +2 lines)
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= B Plus file transfer protocol	12	COMMENT= B Plus file transfer protocol
13		13
14	PLIST_FILES= bin/bp bin/bpl	14	PLIST_FILES= bin/bp \
		15	bin/bpl
15		16
16	do-install:	17	do-install:
17	${INSTALL_PROGRAM} ${WRKSRC}/bpl ${STAGEDIR}${PREFIX}/bin	18	${INSTALL_PROGRAM} ${WRKSRC}/bpl ${STAGEDIR}${PREFIX}/bin

Lines 1-5 Link Here

(-)comms/bpl+/files/patch-Makefile (-2 / +2 lines)
1	--- Makefile.orig Fri Jun 13 14:13:23 2003	1	--- Makefile.orig 2020-01-26 19:57:34 UTC
2	+++ Makefile Fri Jun 13 14:13:43 2003	2	+++ Makefile
3	@@ -4,11 +4,9 @@	3	@@ -4,11 +4,9 @@
4	# USE_MKTIME use mktime instead of timelocal	4	# USE_MKTIME use mktime instead of timelocal
5	#	5	#

Removed Link Here

(-)comms/bpl+/files/patch-bplexec.c_1 (-11 lines)
1	--- bplexec.c.orig Fri Feb 10 02:25:34 1995
2	+++ bplexec.c Tue Feb 3 23:54:32 1998
3	@@ -34,7 +34,7 @@
4	extern void hms(UCHAR *s);
5	extern void ldecout(ULONG l);
6
7	-#ifdef SUN
8	+#if 0 /ifdef SUN/
9	extern int fclose(FILE *stream);
10	extern int fflush(FILE *stream);
11	extern int fseek(FILE *stream, long int offset, int origin);




--- bplexec.c.orig	Thu Feb  9 17:25:34 1995
+++ bplexec.c	Wed Nov 15 20:45:53 2000
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #include "bpl.h"
 #include "machine.h"
@@ -1096,7 +1097,7 @@
 
 	fname_w_index = strlen(fname_work);
 	if (copy_body(s)) { /* t@C¼Ùí */
-		strcpy(fname_work, tmpnam(NULL));
+		strcpy(fname_work, "/tmp/bpl.XXXXXXXXXX");
 	}
 
 	my_free(real_filename);
@@ -1118,16 +1119,19 @@
 	FILE *fp;
 	UCHAR *my_tmp;
 	char *tmp;
+	int fd;
 
-	tmp = tmpnam(NULL);
+	tmp = "/tmp/bpl.XXXXXXXXXX";
 	my_tmp = (UCHAR *) malloc(strlen(tmp) + 1);
 	if (my_tmp == NULL)
 		return NULL;
 	strcpy(my_tmp, tmp);
 
-	fp = fopen(tmp, "wb");
-	if (fp == NULL) {
+	if ((fd = mkstemp(my_tmp)) == -1 ||
+            (fp = fdopen(fd, "wb")) == NULL ) {
+		fprintf(stderr, "%s: %s\n", my_tmp, strerror(errno));
 		free(my_tmp);
+		return NULL;
 	} else {
 		/* fBNgÍ current ðg¤ */
 		strwarn(STR_CANT_CREATE_L); /* ut@Cªì¬Å«È¢ÌÅv */
@@ -1136,6 +1140,7 @@
 		strwarn(STR_CANT_CREATE_R);
 		my_free(real_filename);
 		real_filename = my_tmp;
+		close(fd);
 	}
 	return fp;
 }

Lines 1-6 Link Here

(-)comms/bpl+/files/patch-config.sh (-4 / +4 lines)
1	--- config.sh.orig Thu Feb 9 09:25:34 1995	1	--- config.sh.orig 2020-01-26 19:57:34 UTC
2	+++ config.sh Sat Jun 14 07:50:30 2003	2	+++ config.sh
3	@@ -8,27 +8,6 @@	3	@@ -8,27 +8,6 @@ if [ -f $template ]; then
4	exit	4	exit
5	fi	5	fi
6		6
Lines 28-34 Link Here
28	if [ -f /usr/include/utime.h ]; then	28	if [ -f /usr/include/utime.h ]; then
29	FUTIME="-DHAME_UTIME_H"	29	FUTIME="-DHAME_UTIME_H"
30	fi	30	fi
31	@@ -50,4 +29,4 @@	31	@@ -50,4 +29,4 @@ if [ $? != 0 ]; then
32	MKTIME="mktime.o"	32	MKTIME="mktime.o"
33	fi	33	fi
34	fi	34	fi

Lines 1-5 Link Here

(-)comms/bpl+/files/patch-machine.h (-2 / +2 lines)
1	--- machine.h.orig Wed Oct 12 07:19:52 1994	1	--- machine.h.orig 2020-01-26 19:57:34 UTC
2	+++ machine.h Tue Feb 3 23:50:25 1998	2	+++ machine.h
3	@@ -11,4 +11,4 @@	3	@@ -11,4 +11,4 @@
4	* PC88VA PC-88VA	4	* PC88VA PC-88VA
5	*/	5	*/

Lines 28-38 OPTIONS_SUB= yes Link Here

(-)comms/minicom/Makefile (-5 lines)
28	NLS_USES= gettext	28	NLS_USES= gettext
29	NLS_CONFIGURE_ENABLE= nls	29	NLS_CONFIGURE_ENABLE= nls
30		30
31	post-patch:
32	${REINPLACE_CMD} -e "s@/usr/local/bin/@${LOCALBASE}/bin/@; \
33	s@/sz@/lsz@;s@/sb@/lsb@;s@/sx@/lsx@;s@/rz@/lrz@; \
34	s@/rb@/lrb@;s@/rx@/lrx@" ${WRKSRC}/src/rwconf.c
35
36	post-install:	31	post-install:
37	${MKDIR} ${STAGEDIR}${ETCDIR}	32	${MKDIR} ${STAGEDIR}${ETCDIR}
38		33

Removed Link Here

(-)comms/minicom/files/patch-minirc.dfl (-10 lines)
1	--- doc/minirc.dfl.orig 2009-12-12 15:47:47 UTC
2	+++ doc/minirc.dfl
3	@@ -1,2 +1,7 @@
4	# $Id: minirc.dfl,v 1.1.1.1 2003-03-30 18:55:39 al-guest Exp $
5	# Machine-generated file - use "minicom -s" to change parameters.
6	+pr port /dev/cuau0
7	+pu baudrate 9600
8	+pu bits 8
9	+pu parity N
10	+pu minit

Removed Link Here

(-)comms/minicom/files/patch-src-minicom.h (-10 lines)
1	--- src/minicom.h.orig 2013-12-08 10:26:03 UTC
2	+++ src/minicom.h
3	@@ -35,6 +35,7 @@
4
5	#include <time.h>
6	#include <stdbool.h>
7	+#include <limits.h>
8
9	#if HAVE_LOCKDEV
10	#include <ttylock.h>




--- src/script.c.orig	2013-10-29 11:07:42 UTC
+++ src/script.c
@@ -32,6 +32,7 @@
 #include <config.h>
 #endif
 
+#include <sys/wait.h>
 #include <stdarg.h>
 
 #include "port.h"
@@ -76,7 +77,7 @@ struct env {
 struct env *curenv;		/* Execution environment */
 int gtimeout = 120;		/* Global Timeout */
 int etimeout = 0;		/* Timeout in expect routine */
-jmp_buf ejmp;			/* To jump to if expect times out */
+sigjmp_buf ejmp;		/* To jump to if expect times out */
 int inexpect = 0;		/* Are we in the expect routine */
 const char *newline;		/* What to print for '\n'. */
 const char *s_login = "name";	/* User's login name */

Removed Link Here

(-)comms/minicom/files/patch-src-updown.c (-11 lines)
1	--- src/updown.c.orig 2013-12-08 10:25:06 UTC
2	+++ src/updown.c
3	@@ -298,7 +298,7 @@ void updown(int what, int nr)
4	do_log("%s", cmdline); /* jl 22.06.97 */
5
6	if (P_PFULL(g) == 'N') {
7	- win = mc_wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
8	+ win = mc_wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
9	snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g),
10	what == 'U' ? _("upload") : _("download"));
11	mc_wtitle(win, TMID, title);




--- src/window.c.orig	2010-12-12 13:56:25 UTC
+++ src/window.c
@@ -66,6 +66,7 @@ static const char *CE, *Al, *Dl, *AL, *DL;
 static const char *CS, *SF, *SR, *VB, *BL;
 static const char *VE, *VI, *KS, *KE;
 static const char *CD, *CL, *IC, *DC;
+static char *mcBC;
 static const char *CR, *NL;
 #ifdef ST_LINE
 static const char *TS, *FS, *DS;
@@ -335,8 +336,8 @@ static void _gotoxy(int x, int y)
   else if (NL != NULL && x == 0 && x == curx && y == cury + 1)
     outstr(NL);
 #endif
-  else if (BC != NULL && y == cury && x == curx - 1)
-    outstr(BC);
+  else if (mcBC != NULL && y == cury && x == curx - 1)
+    outstr(mcBC);
   else
     outstr(tgoto(CM, x, y));
   curx = x;
@@ -2000,7 +2001,7 @@ int win_init(int fg, int bg, int attr)
   CL = tgetstr("cl", &_tptr);
   IC = tgetstr("ic", &_tptr);
   DC = tgetstr("dc", &_tptr);
-  BC = tgetstr("bc", &_tptr);
+  mcBC = tgetstr("bc", &_tptr);
   CR = tgetstr("cr", &_tptr);
   NL = tgetstr("nl", &_tptr);
   AC = tgetstr("ac", &_tptr);
@@ -2059,11 +2060,11 @@ int win_init(int fg, int bg, int attr)
   _has_am = tgetflag("am");
   _mv_standout = tgetflag("ms");
   if (tgetflag("bs")) {
-    if (BC == NULL)
-      BC = "\b";
+    if (mcBC == NULL)
+      mcBC = "\b";
   }
   else
-    BC = NULL;
+    mcBC = NULL;
 
   /* Special IBM box-drawing characters */
   D_UL  = 201;




--- src/sysdep1.c.orig	2009-12-12 15:47:47 UTC
+++ src/sysdep1.c
@@ -65,13 +65,13 @@ static void m_setrts(int fd)
   if (portfd_is_socket)
     return;
 #endif
-#if defined(TIOCM_RTS) && defined(TIOCMODG)
+#if defined(TIOCM_RTS) && defined(TIOCMGET)
   {
     int mcs=0;
 
-    ioctl(fd, TIOCMODG, &mcs);
+    ioctl(fd, TIOCMGET, &mcs);
     mcs |= TIOCM_RTS;
-    ioctl(fd, TIOCMODS, &mcs);
+    ioctl(fd, TIOCMSET, &mcs);
   }
 #endif
 }
@@ -180,11 +180,11 @@ int m_getdcd(int fd)
     return portfd_is_connected;
   }
 #endif
-#ifdef TIOCMODG
+#ifdef TIOCMODGET
   {
     int mcs = 0;
 
-    if (ioctl(fd, TIOCMODG, &mcs) < 0)
+    if (ioctl(fd, TIOCMODGET, &mcs) < 0)
       return -1;
     return mcs & TIOCM_CAR ? 1 : 0;
   }
@@ -227,8 +227,8 @@ void m_savestate(int fd)
   ioctl(fd, TIOCLGET, &lsw);
 #  endif
 #endif
-#ifdef TIOCMODG
-  ioctl(fd, TIOCMODG, &m_word);
+#ifdef TIOCMGET
+  ioctl(fd, TIOCMGET, &m_word);
 #endif
 }
 
@@ -252,8 +252,8 @@ void m_restorestate(int fd)
   ioctl(fd, TIOCLSET, &lsw);
 #  endif
 #endif
-#ifdef TIOCMODS
-  ioctl(fd, TIOCMODS, &m_word);
+#ifdef TIOCMSET
+  ioctl(fd, TIOCMSET, &m_word);
 #endif
 }
 

Lines 78-87 CONFIGURE_ARGS+= --enable-posixmutexes Link Here

(-)databases/db5/Makefile (-4 lines)
78	CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads	78	CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads
79	.endif	79	.endif
80		80
81	post-patch:
82	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
83	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_*
84
85	post-install:	81	post-install:
86	.for i in ${DBLIBS}	82	.for i in ${DBLIBS}
87	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0	83	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0

Lines 78-87 CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads Link Here

(-)databases/db6/Makefile (-4 lines)
78	.endif	78	.endif
79		79
80	post-patch:	80	post-patch:
81	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
82	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
83	${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* \
84	${WRKSRC}/../src/dbinc/atomic.h
85	${REINPLACE_CMD} -e 's/%%BDBVER%%/${BDBVER}/' ${WRKSRC}/../lang/sql/upgrade61.sh	81	${REINPLACE_CMD} -e 's/%%BDBVER%%/${BDBVER}/' ${WRKSRC}/../lang/sql/upgrade61.sh
86		82
87	post-install:	83	post-install:

Lines 1-4 Link Here

(-)databases/db6/files/patch-src_dbinc_mutex__int.h (-3 / +3 lines)
1	--- src/dbinc/mutex_int.h.orig 2016-03-28 19:45:54 UTC	1	--- src/dbinc/mutex_int.h.orig 2017-04-13 14:06:20 UTC
2	+++ src/dbinc/mutex_int.h	2	+++ src/dbinc/mutex_int.h
3	@@ -9,6 +9,7 @@	3	@@ -9,6 +9,7 @@
4	#ifndef _DB_MUTEX_INT_H_	4	#ifndef _DB_MUTEX_INT_H_
Lines 8-14 Link Here
8	#include "dbinc/atomic.h"	8	#include "dbinc/atomic.h"
9		9
10	#if defined(__cplusplus)	10	#if defined(__cplusplus)
11	@@ -506,11 +507,11 @@ typedef unsigned int tsl_t;	11	@@ -487,11 +488,11 @@ typedef unsigned int tsl_t;
12	#define MUTEX_UNSET(tsl) ((volatile tsl_t )(tsl) = 0)	12	#define MUTEX_UNSET(tsl) ((volatile tsl_t )(tsl) = 0)
13	#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)	13	#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
14	#define MUTEX_MEMBAR(x) \	14	#define MUTEX_MEMBAR(x) \
Lines 23-29 Link Here
23	#endif	23	#endif
24	#endif	24	#endif
25		25
26	@@ -652,7 +652,7 @@ MUTEX_SET(int *tsl) {	26	@@ -633,7 +634,7 @@ MUTEX_SET(int *tsl) {
27	: "=&r" (__r), "+r" (tsl)	27	: "=&r" (__r), "+r" (tsl)
28	:	28	:
29	: "cr0", "memory");	29	: "cr0", "memory");

Lines 25-30 USE_GNOME= cairo gtk30 Link Here

(-)deskutils/baobab/Makefile (+1 lines)
25	BINARY_ALIAS= python3=${PYTHON_CMD}	25	BINARY_ALIAS= python3=${PYTHON_CMD}
26		26
27	GLIB_SCHEMAS= org.gnome.baobab.gschema.xml	27	GLIB_SCHEMAS= org.gnome.baobab.gschema.xml
		28	BINARY_ALIAS= python3=${PYTHON_VERSION}
28		29
29	post-patch:	30	post-patch:
30	@${REINPLACE_CMD} -e 's\|MimeType=inode/directory;\|MimeType=\|g' \	31	@${REINPLACE_CMD} -e 's\|MimeType=inode/directory;\|MimeType=\|g' \




GH_ACCOUNT=	Cairo-Dock
GH_PROJECT=	${PORTNAME}-core

GNU_CONFIGURE=		yes
USES=			cmake compiler:c++11-lang gettext gl gnome \
			localbase:ldflags pkgconfig shebangfix
USE_GL=			glu
USE_GNOME=		glib20 gtk30 librsvg2 libxml2
USE_LDCONFIG=		yes
SHEBANG_FILES=		data/desktop-manager/cairo-dock-session \
			data/scripts/cairo-dock-package-theme.sh \
			data/scripts/help_scripts.sh \
			data/scripts/initial-setup.sh \
			misc/cairo-dock_theme-creator.sh \
			po/misc/add-descriptions.sh po/misc/add-readme.sh
CMAKE_ARGS=		-DCMAKE_INSTALL_MANDIR:PATH=man \
			-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" \
			-DROOT_PREFIX:PATH=${STAGEDIR}
OPTIONS_DEFINE=		WAYLAND X11
OPTIONS_DEFAULT=	EGL WAYLAND X11
OPTIONS_RADIO=		GL
OPTIONS_RADIO_GL=	EGL GLX

EGL_DESC=	${GLX_DESC:S/X11/Native/}
EGL_CMAKE_BOOL=	enable-egl-support
EGL_USE=	GL=egl
OPTIONS_RADIO_GL=	GLX EGL

GLX_USE=	GL=gl
GLX_IMPLIES=	X11
EGL_USE=		GL=egl

GLX_USE=		GL=gl
GLX_IMPLIES=		X11

WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
WAYLAND_USE=		GL=egl
WAYLAND_CMAKE_BOOL=	enable-wayland-support
WAYLAND_IMPLIES=	EGL

X11_USES=	xorg
X11_USE=	XORG=x11,xcomposite,xinerama,xrandr,xrender,xtst
X11_CMAKE_BOOL=	enable-x11-support

post-patch:
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g;' \
	${WRKSRC}/data/cairo-dock \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01firefox.desktop \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01gcalctool.desktop \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01libreoffice-calc.desktop \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01libreoffice-impress.desktop \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01libreoffice-writer.desktop \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01pidgin.desktop \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01thunderbird.desktop \
	${WRKSRC}/data/themes/default-theme-panel/launchers/01ubuntu-software-center.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01firefox.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01gcalctool.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01gimp.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01gnome-terminal.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01ooo-writer.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01pidgin.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01thunderbird.desktop \
	${WRKSRC}/data/themes/default-theme/launchers/01ubuntu-software-center.desktop \
	${WRKSRC}/src/cairo-dock-user-menu.c \
	${WRKSRC}/src/gldit/cairo-dock-class-manager.c \
	${WRKSRC}/src/gldit/cairo-dock-gui-factory.c \

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so

Lines 1-4 Link Here

(-)deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c (-2 / +2 lines)
1	--- src/gldit/cairo-dock-file-manager.c.orig 2014-10-15 14:16:34 UTC	1	--- src/gldit/cairo-dock-file-manager.c.orig 2015-02-19 15:03:40 UTC
2	+++ src/gldit/cairo-dock-file-manager.c	2	+++ src/gldit/cairo-dock-file-manager.c
3	@@ -21,7 +21,11 @@	3	@@ -21,7 +21,11 @@
4	#include <string.h> // memset	4	#include <string.h> // memset
Lines 12-18 Link Here
12	#include <errno.h> // errno	12	#include <errno.h> // errno
13		13
14	#include "gldi-config.h"	14	#include "gldi-config.h"
15	@@ -500,7 +504,7 @@ gboolean cairo_dock_copy_file (const gch	15	@@ -503,7 +507,7 @@ gboolean cairo_dock_copy_file (const gchar *cFilePath,
16	{	16	{
17	// perform in-kernel transfer (zero copy to user space)	17	// perform in-kernel transfer (zero copy to user space)
18	int size;	18	int size;





GNU_CONFIGURE=	yes
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
USES=		charsetfix makeinfo shebangfix tar:xz
SHEBANG_FILES=	misc/gcalltx/gcalltx.pl misc/gcalltx/gcalltxp.in

INFO=		gcal

OPTIONS_DEFINE=		NLS
OPTIONS_SUB=		yes
NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls


		gcalltx/gcalltxp moon/moon mrms/mrms srss/srss wloc/wlocdrv

post-patch:
.for p in daily/daily ddiff/ddiff ddiff/ddiffdrv dst/dst gcalltx/gcalltx moon/moon mrms/mrms srss/srss wloc/wlocdrv
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/misc/${p}.in
		-e '/^packagedatamiscdir=/s:=.*:=${DATADIR}/misc/${p:H}:' \
		${WRKSRC}/misc/${p}.in
.endfor

post-install:




NLS_CONFIGURE_ENABLE=	nls
NLS_USES=		gettext

post-patch:
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|-Wall -g|-Wall|g ; \
		 s|-Wmissing-prototypes -g|-Wmissing-prototypes|g'
	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|_Modifica|_Edit|' \
		-e 's|A_iuto|_Help|' \
		${WRKSRC}/interface/MainWindow.glade
	@${REINPLACE_CMD} -e \
		's|^Categories=.*|Categories=GNOME;Application;Office;System;Utility;|' \
		${WRKSRC}/rubrica2.desktop.in

post-patch-NLS-off:
	@${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in


Removed Link Here

(-)deskutils/rubrica/files/patch-app_c (-11 lines)
1	--- src/app.c.orig 2016-01-08 10:28:54 UTC
2	+++ src/app.c
3	@@ -1339,7 +1339,7 @@ rubrica_app_init(RubricaApp* self)
4
5	self->priv->cutted = NULL;
6	self->priv->notify = notify_notification_new("Rubrica Addressbook",
7	- NULL, "info", NULL);
8	+ "info", NULL);
9	self->priv->active_plugin = g_strdup("autodetect");
10	self->priv->manager = r_lib_get_manager();
11	self->priv->print_settings = NULL;

Removed Link Here

(-)deskutils/rubrica/files/patch-callbacks_c (-11 lines)
1	--- src/callbacks.c.orig 2016-01-08 10:29:13 UTC
2	+++ src/callbacks.c
3	@@ -638,7 +638,7 @@ on_info_cb (GtkWidget* button, gpointer
4	"wrap-license", FALSE,
5	NULL);
6
7	- gdk_pixbuf_unref (logo);
8	+ g_object_unref (logo);
9
10	gtk_dialog_run (GTK_DIALOG(about));
11	gtk_widget_destroy (about);




--- src/data_view.c.orig	2016-01-08 10:28:41 UTC
+++ src/data_view.c
@@ -689,7 +689,7 @@ data_view_set_image(RubricaDataView* vie
   priv = RUBRICA_DATA_VIEW_GET_PRIVATE(view);
 
   gtk_image_set_from_pixbuf(GTK_IMAGE(priv->image), pixbuf);
-  gdk_pixbuf_unref(pixbuf);
+  g_object_unref(pixbuf);
 }
 
 
@@ -952,7 +952,7 @@ write_addresses(RubricaDataView* view, R
 
       data_view_write(body, "\n");
       data_view_write_pixbuf(body, pixbuf, _("Addresses"));      
-      gdk_pixbuf_unref(pixbuf);
+      g_object_unref(pixbuf);
 
       for (; address; address = r_card_get_next_address(R_CARD(card)))
 	{
@@ -1057,8 +1057,7 @@ write_work(RubricaDataView* view, RPerso
 
       data_view_write(body, "\n");
       data_view_write_pixbuf(body, pixbuf, _("Work"));
-      gdk_pixbuf_unref(pixbuf);
-
+      g_object_unref(pixbuf);
       data_view_write_line(body, _("Assignment"), assignment, TRUE);
       data_view_write_line(body, _("Organization"), organization, TRUE);
       data_view_write_line(body, _("Department"), department, TRUE);
@@ -1093,7 +1092,7 @@ write_net (RubricaDataView* view, RCard*
       
       data_view_write(body, "\n");
       data_view_write_pixbuf(body, pixbuf, _("Net"));
-      gdk_pixbuf_unref(pixbuf);
+      g_object_unref(pixbuf);
       
       for (; net; net = r_card_get_next_net_address(R_CARD(card)))
 	{	  
@@ -1165,7 +1164,7 @@ write_telephones(RubricaDataView* view, 
 
       data_view_write(body, "\n");
       data_view_write_pixbuf(body, pixbuf, _("Telephone"));
-      gdk_pixbuf_unref(pixbuf);
+      g_object_unref(pixbuf);
 
       for (; tel; tel = r_card_get_next_telephone(R_CARD(card)))
 	{
@@ -1210,7 +1209,7 @@ write_notes(RubricaDataView* view, RPers
       
       data_view_write(body, "\n");
       data_view_write_pixbuf(body, pixbuf, _("Notes"));
-      gdk_pixbuf_unref(pixbuf);
+      g_object_unref(pixbuf);
 
       if (has_partner)
 	{   
@@ -1257,7 +1256,7 @@ write_company_notes(RubricaDataView* vie
       data_view_write(body, "\n");
       data_view_write_pixbuf(body, pixbuf, _("Notes"));
       data_view_write(body, "\n");
-      gdk_pixbuf_unref(pixbuf);
+      g_object_unref(pixbuf);
 
       data_view_write(body, text);   
     }

Lines 1-5 Link Here

(-)deskutils/rubrica/files/patch-rubrica2.schemas.in (-2 / +2 lines)
1	--- rubrica2.schemas.in.orig 2010-06-20 14:23:50.000000000 +0200	1	--- rubrica2.schemas.in.orig 2008-02-04 13:57:05 UTC
2	+++ rubrica2.schemas.in 2013-04-03 20:40:05.000000000 +0200	2	+++ rubrica2.schemas.in
3	@@ -6,7 +6,7 @@	3	@@ -6,7 +6,7 @@
4	<applyto>/apps/rubrica2/file_format</applyto>	4	<applyto>/apps/rubrica2/file_format</applyto>
5	<owner>rubrica</owner>	5	<owner>rubrica</owner>

Lines 15-21 USE_LDCONFIG= yes Link Here

(-)devel/ElectricFence/Makefile (-1 / +4 lines)
15	CFLAGS+= -D__USE_BSD	15	CFLAGS+= -D__USE_BSD
16		16
17	MAKE_ARGS= CC="${CC}"	17	MAKE_ARGS= CC="${CC}"
18	PLIST_FILES= bin/ef.sh lib/libefence.a lib/libefence.so.0 man/man3/efence.3.gz	18	PLIST_FILES= bin/ef.sh \
		19	lib/libefence.a \
		20	lib/libefence.so.0 \
		21	man/man3/efence.3.gz
19		22
20	do-install:	23	do-install:
21	${INSTALL_DATA} ${WRKSRC}/libefence.a ${STAGEDIR}${PREFIX}/lib	24	${INSTALL_DATA} ${WRKSRC}/libefence.a ${STAGEDIR}${PREFIX}/lib

Lines 1-4 Link Here

(-)devel/ElectricFence/files/patch-Makefile (-1 / +1 lines)
1	--- Makefile.orig 1999-04-13 17:22:49 UTC	1	--- Makefile.orig 2020-01-27 13:08:36 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,8 +1,14 @@	3	@@ -1,8 +1,14 @@
4	PIC= -fPIC	4	PIC= -fPIC

Lines 1-11 Link Here

(-)devel/ElectricFence/files/patch-ef.sh (-4 / +6 lines)
1	--- ef.sh.orig Wed May 2 21:17:33 2001	1	--- ef.sh.orig 2020-01-27 13:08:36 UTC
2	+++ ef.sh Wed May 2 21:17:40 2001	2	+++ ef.sh
3	@@ -1,3 +1,3 @@	3	@@ -1,4 +1,4 @@
4	-#!/bin/bash	4	-#!/bin/bash
5	+#!/bin/sh	5	+#!/bin/sh
6		6
7	#	7	#
8	@@ -16,5 +16,5 @@	8	# Simple script to run electric fence on stuff. (needs libefence.so).
		9	@@ -15,6 +15,6 @@ fi
		10
9	# Set the environment to load eletric fence.	11	# Set the environment to load eletric fence.
10	(\	12	(\
11	-export LD_PRELOAD=libefence.so.0.0;\	13	-export LD_PRELOAD=libefence.so.0.0;\

Lines 1-5 Link Here

(-)devel/ElectricFence/files/patch-efence.c (-3 / +3 lines)
1	--- efence.c.orig 2019-02-26 17:53:52.941236000 +0100	1	--- efence.c.orig 2020-01-27 13:08:36 UTC
2	+++ efence.c 2019-02-26 17:56:18.688752000 +0100	2	+++ efence.c
3	@@ -38,6 +38,7 @@	3	@@ -38,6 +38,7 @@
4	# include <pthread.h>	4	# include <pthread.h>
5	# include <semaphore.h>	5	# include <semaphore.h>
Lines 8-14 Link Here
8		8
9	#ifdef malloc	9	#ifdef malloc
10	#undef malloc	10	#undef malloc
11	@@ -670,6 +671,27 @@	11	@@ -668,6 +669,27 @@ memalign(size_t alignment, size_t userSize)
12	release();	12	release();
13		13
14	return address;	14	return address;




--- eftest.c	Tue Jun  2 09:25:10 1998
+++ eftest.c	Tue Jun  2 09:24:58 1998
@@ -24,7 +24,7 @@
 extern int	EF_PROTECT_BELOW;
 extern int	EF_ALIGNMENT;
 
-static jmp_buf	env;
+static sigjmp_buf	env;
 
 /*
  * There is still too little standardization of the arguments and return
@@ -40,13 +40,13 @@
 )
  {
 	signal(PAGE_PROTECTION_VIOLATED_SIGNAL, SIG_DFL);
-	longjmp(env, 1);
+	siglongjmp(env, 1);
 }
 
 static int
 gotSegmentationFault(int (*test)(void))
 {
-	if ( setjmp(env) == 0 ) {
+	if ( sigsetjmp(env, 1) == 0 ) {
 		int			status;
 
 		signal(PAGE_PROTECTION_VIOLATED_SIGNAL




Found at:
	http://www.redhat.com/archives/fedora-cvs-commits/2007-March/msg00788.html

Size is, correctly, size_t and mmap, correctly, takes
size_t as the size argument; the cast to int flunks
64bit thinking.

diff -Naur ElectricFence-2.2.2/page.c ElectricFence-2.2.3/page.c
--- page.c	2007-03-16 13:20:44.000000000 -0400
+++ page.c	2007-03-16 13:23:28.000000000 -0400
@@ -70,7 +70,7 @@
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE|MAP_ANONYMOUS
 	,-1
@@ -122,7 +122,7 @@
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE
 	,devZeroFd




--- page.c.orig	2020-01-27 13:08:36 UTC
+++ page.c
@@ -29,7 +29,7 @@
 
 static caddr_t	startAddr = (caddr_t) 0;

 extern int	sys_nerr;
 extern char *	sys_errlist[];
 #endif
@@ -70,7 +70,7 @@ Page_Create(size_t size)
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE|MAP_ANONYMOUS
 	,-1
@@ -122,7 +122,7 @@ Page_Create(size_t size)
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE
 	,devZeroFd

Removed Link Here

(-)devel/ElectricFence/files/patch-vaarg (-11 lines)
1	--- print.c Thu Jan 19 23:54:26 1995
2	+++ print.c Tue May 16 07:43:45 2000
3	@@ -99,7 +99,7 @@ vprint(const char * pattern, va_list arg
4	break;
5	case 'c':
6	{
7	- char c = va_arg(args, char);
8	+ char c = va_arg(args, int);
9
10	(void) write(2, &c, 1);
11	}

Lines 5150-5155 Link Here

(-)devel/Makefile (+1 lines)
5150	SUBDIR += py-versiontools	5150	SUBDIR += py-versiontools
5151	SUBDIR += py-vine	5151	SUBDIR += py-vine
5152	SUBDIR += py-virtualenv	5152	SUBDIR += py-virtualenv
		5153	SUBDIR += py-virtualenv20
5153	SUBDIR += py-virtualenv-clone	5154	SUBDIR += py-virtualenv-clone
5154	SUBDIR += py-virtualenvwrapper	5155	SUBDIR += py-virtualenvwrapper
5155	SUBDIR += py-visitor	5156	SUBDIR += py-visitor

Lines 13-19 COMMENT= Ada95 bindings for ncurses Link Here

(-)devel/adacurses/Makefile (-1 / +1 lines)
13	LICENSE= MIT	13	LICENSE= MIT
14	LICENSE_FILE= ${WRKSRC}/README	14	LICENSE_FILE= ${WRKSRC}/README
15		15
16	USES= ada gmake pkgconfig ncurses:port tar:tgz	16	USES= ada gmake pkgconfig ncurses tar:tgz
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --with-ada-include=${PREFIX}/include/adacurses \	18	CONFIGURE_ARGS= --with-ada-include=${PREFIX}/include/adacurses \
19	--with-ada-objects=${PREFIX}/lib/adacurses \	19	--with-ada-objects=${PREFIX}/lib/adacurses \

Lines 32-42 DOCS_ALL_TARGET= doc Link Here

(-)devel/alog/Makefile (-5 lines)
32	TEST_BUILD_DEPENDS= ${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven	32	TEST_BUILD_DEPENDS= ${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
33	TEST_ALL_TARGET= tests	33	TEST_ALL_TARGET= tests
34		34
35	post-patch:
36	${REINPLACE_CMD} -e '/^NUM_CPUS/d' ${WRKSRC}/Makefile
37	${REINPLACE_CMD} -e 's/$not-allowed$/NONEXISTENT\/\1/' \
38	${WRKSRC}/tests/facility_tests-fd.adb
39
40	do-install:	35	do-install:
41	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \	36	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
42	${STAGEDIR}${PREFIX}/lib/alog \	37	${STAGEDIR}${PREFIX}/lib/alog \

Lines 40-46 GENERIC_LINKS= autoconf autoheader autom4te autoreconf autoscan autoupdate \ Link Here

(-)devel/autoconf/Makefile (-1 / +1 lines)
40		40
41	post-patch:	41	post-patch:
42	@(cd ${WRKSRC}/man && \	42	@(cd ${WRKSRC}/man && \
43	for file in *.[1x]; do \	43	for file in autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 autoupdate.1 common.x config.guess.1 config.guess.x config.sub.1 config.sub.x ifnames.1 ifnames.x ; do \
44	${REINPLACE_CMD} -E 's,([^-]auto)(conf\|make\|reconf\|update\|header\|scan),\1\2-${BUILD_VERSION},g ; \	44	${REINPLACE_CMD} -E 's,([^-]auto)(conf\|make\|reconf\|update\|header\|scan),\1\2-${BUILD_VERSION},g ; \
45	s,(config\.guess\|config\.sub\|ifnames),\1-${BUILD_VERSION},g' $$file ; \	45	s,(config\.guess\|config\.sub\|ifnames),\1-${BUILD_VERSION},g' $$file ; \
46	done)	46	done)

Lines 34-41 NLS_CONFIGURE_OFF= ac_cv_libtextstyle=no Link Here

(-)devel/bison/Makefile (-4 lines)
34	NLS_LIB_DEPENDS= libtextstyle.so:devel/libtextstyle	34	NLS_LIB_DEPENDS= libtextstyle.so:devel/libtextstyle
35	NLS_USES= gettext	35	NLS_USES= gettext
36		36
37	post-patch:
38	@${REINPLACE_CMD} -e 's\|$$(docdir)$/examples$\|$$(datarootdir)\1/bison\|' ${WRKSRC}/Makefile.in
39	@${GREP} -l '_Noreturn void' ${WRKSRC}/lib/.[ch] \| ${XARGS} -J % ${REINPLACE_CMD} -e 's\|$.$ _Noreturn void\|_Noreturn \1 void\|' %
40
41	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Lines 50-59 post-install: Link Here

(-)devel/boost-libs/Makefile (-6 lines)
50		50
51	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so	51	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
52		52
53	@${REINPLACE_CMD} \
54	-e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" \
55	-e "s\|%%PYTHON_INCLUDEDIR%%\|${PYTHON_INCLUDEDIR}\|g" \
56	-e "s\|%%PYTHON_LIBDIR%%\|${PYTHON_LIBDIR}\|g" \
57	-e "s\|%%PYTHON_VERSION%%\|${PYTHON_VERSION}\|g" ${PKGMESSAGE}
58
59	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 22-28 OPTIONS_DEFAULT= SFTP CA_BUNDLE Link Here

(-)devel/bzr/Makefile (-1 / +1 lines)
22	SFTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR}	22	SFTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR}
23	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	23	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
24		24
25	USES= gettext python:2.7 shebangfix tar:xz	25	USES= gettext python shebangfix tar:xz
26	SHEBANG_FILES= bzr	26	SHEBANG_FILES= bzr
27	USE_PYTHON= distutils cython autoplist	27	USE_PYTHON= distutils cython autoplist
28	PYDISTUTILS_PKGNAME= bzr	28	PYDISTUTILS_PKGNAME= bzr





LICENSE=	GPLv1

USES=		perl5 shebangfix
USE_PERL5=	run
NO_BUILD=	yes
NO_WRKSUBDIR=	yes
SHEBANG_FILES=	${DISTNAME}

PLIST_FILES=	bin/cvschk \
		man/man1/cvschk.1.gz

do-extract:
	@${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME}
	<${DISTDIR}/${DISTNAME} >${WRKSRC}/${DISTNAME}

do-install:
	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin

Lines 16-22 LICENSE= GPLv3 Link Here

(-)devel/dee/Makefile (-1 / +1 lines)
16	BUILD_DEPENDS= vapigen:lang/vala	16	BUILD_DEPENDS= vapigen:lang/vala
17	LIB_DEPENDS= libicutu.so:devel/icu	17	LIB_DEPENDS= libicutu.so:devel/icu
18		18
19	USES= gmake gnome libtool localbase pathfix pkgconfig python:2.7	19	USES= gmake gnome libtool localbase pathfix pkgconfig python
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	USE_GNOME= glib20 introspection:build pygobject3	21	USE_GNOME= glib20 introspection:build pygobject3
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes




USERS=		git_daemon
GROUPS=		git_daemon

SUB_FILES=	gitweb.conf pkg-message

GNU_CONFIGURE=	yes
CPPFLAGS+=	-isystem${LOCALBASE}/include

MAKE_ARGS+=	DEVELOPER=
MAKE_ENV+=	V=1
USE_RC_SUBR=	git_daemon
SHEBANG_FILES=	*.perl */*.perl */*.pl */*/*.perl */*/*.pl */*/*/*.pl \
		contrib/buildsystems/generate contrib/contacts/git-contacts \
		contrib/credential/netrc/git-credential-netrc.perl \
		contrib/fast-import/import-zips.py \
		contrib/hg-to-git/hg-to-git.py \
		contrib/hooks/update-paranoid \
		contrib/hooks/multimail/post-receive.example \
		contrib/hooks/multimail/git_multimail.py \
		contrib/hooks/multimail/migrate-mailhook-config \
		contrib/hooks/multimail/post-receive.example \
		contrib/hooks/update-paranoid \
		contrib/remote-helpers/git-remote-bzr \
		contrib/remote-helpers/git-remote-hg \
		contrib/svn-fe/svnrdump_sim.py git-p4.py t/*/*/post t/*/*/pre \
		t/Git-SVN/Utils/*.t templates/hooks--fsmonitor-watchman.sample
		contrib/svn-fe/svnrdump_sim.py \
		templates/hooks--fsmonitor-watchman.sample
TEST_TARGET=	test

CONFIGURE_ARGS=	--enable-pthreads=-pthread \
		ac_cv_header_libcharset_h=no

OPTIONS_RADIO=			PCRE_VERSION
OPTIONS_RADIO_PCRE_VERSION=	PCRE PCRE2
OPTIONS_DEFINE=			CONTRIB CURL CVS GITWEB GUI HTMLDOCS ICONV NLS \
				P4 PERL SEND_EMAIL SUBTREE SVN
OPTIONS_DEFAULT=		CONTRIB CURL CVS GITWEB ICONV P4 PCRE PERL \
				SEND_EMAIL SUBTREE SVN
OPTIONS_SUB=			yes

CONTRIB_DESC=		Install contributed scripts
CURL_DESC=		Install curl support (provides HTTPS transport)
CVS_DESC=		Enable CVS support
GITWEB_DESC=		Install gitweb
HTMLDOCS_DESC=		Install additional documentation
P4_DESC=		Enable Perforce support
PCRE2_DESC=		Use Perl Compatible Regular Expressions (v2)
SEND_EMAIL_DESC=	Enable the git-send-email(1) script
SUBTREE_DESC=		Install git-subtree

NLS_USES=		gettext
NLS_MAKE_ARGS_OFF=	NO_GETTEXT=yes

CURL_BUILD_DEPENDS=	curl:ftp/curl
CURL_RUN_DEPENDS=	curl:ftp/curl
CURL_LIB_DEPENDS=	libexpat.so:textproc/expat2
CURL_MAKE_ARGS_OFF=	NO_CURL=1 \
			NO_EXPAT=1

HTMLDOCS_DISTFILES=	${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}

GUI_USES=		tk
GUI_MAKE_ARGS=		TCL_PATH=${TCLSH} \
			TCLTK_PATH=${WISH}
GUI_MAKE_ARGS_OFF=	NO_TCLTK=yes

SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey

SVN_RUN_DEPENDS+=	p5-subversion>=0:devel/p5-subversion
.endif

SUBTREE_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
			xmlto:textproc/xmlto

CVS_RUN_DEPENDS=	cvsps:devel/cvsps

.endif

.if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
USES+=			python
CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
.else
CONFIGURE_ARGS+=	--without-python
.endif

.if empty(PORT_OPTIONS:MGUI)
RMMAN1+=	git-citool.1 git-gui.1 gitk.1
		git-gui.1 \
		gitk.1
.endif

.if empty(PORT_OPTIONS:MSVN)

.endif

.if empty(PORT_OPTIONS:MCVS)
RMMAN1+=	git-cvsimport.1 git-cvsexportcommit.1 git-cvsserver.1
		git-cvsexportcommit.1 \
		git-cvsserver.1
RMMAN7+=	gitcvs-migration.7
.endif


		${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/

post-install-HTMLDOCS-on:
# Manually remove the index.html symlink before installing, and then
# recreate it after. This is necessary because the distfile is
# extracted with --no-same-owner. If the distfile is extracted as a
# non-root user then the symlink will have the incorrect owner.
	${RM} ${WRKDIR}/htmldocs/index.html
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})

	@${ECHO_MSG} "===> Installing contributed scripts"
	${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib
	${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib
# Symlink the completions from the contrib directory to where they
# will be useful
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
	@${LN} -s ../../share/git-core/contrib/completion/git-completion.bash \
		${STAGEDIR}${PREFIX}/etc/bash_completion.d/

post-install-CONTRIB-off:
# Install the contrib completions anyway
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
	${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
		${STAGEDIR}${PREFIX}/etc/bash_completion.d/




# $FreeBSD$

PORTNAME=	gobject-introspection
PORTVERSION=	1.64.1
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Generate interface introspection data for GObject libraries

LICENSE=	GPLv2+ LGPL20+


PORTSCOUT=	limitw:1,even

USES=		bison gettext gnome localbase meson \
		pkgconfig python:3.4+ tar:xz
GNU_CONFIGURE=	yes
USE_GNOME=	glib20
USE_LDCONFIG=	yes

MESON_ARGS=	-Dpython=${PYTHON_CMD}

# Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
MAKE_ENV=	HOME=${WRKDIR}

post-patch:
	@${REINPLACE_CMD} -e 's|@PYTHON_CMD@|/usr/bin/env ${PYTHON_VERSION}|g' \
		${WRKSRC}/tools/g-ir-tool-template.in

GIRLIBDIR=	${PREFIX}/lib/gobject-introspection/giscanner

post-install:
# generates .py[co] files for installed modules
# if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
# with these files when module is imported from root user
	@${FIND} ${STAGEDIR}${PREFIX} -name \*.pyc -delete
	(cd ${STAGEDIR}${PREFIX} && \
	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
		-d ${GIRLIBDIR} -f ${GIRLIBDIR:S;${PREFIX}/;;} && \
	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
		-d ${GIRLIBDIR} -f ${GIRLIBDIR:S;${PREFIX}/;;})

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/gobject-introspection/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1525378740	1	TIMESTAMP = 1586148225
2	SHA256 (gnome/gobject-introspection-1.56.1.tar.xz) = 5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b	2	SHA256 (gnome/gobject-introspection-1.64.1.tar.xz) = 80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
3	SIZE (gnome/gobject-introspection-1.56.1.tar.xz) = 1397812	3	SIZE (gnome/gobject-introspection-1.64.1.tar.xz) = 1000280




--- tests/Makefile.in.orig	2017-04-17 10:01:31 UTC
+++ tests/Makefile.in
@@ -1257,7 +1257,7 @@ everything.h: everything-stamp.h
 	@true
 
 Everything-1.0.gir: libeverything-1.0.la Makefile
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
+	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error \
 	--namespace=Everything --nsversion=1.0 \
 	--libtool="$(LIBTOOL)" \
 	--add-include-path=$(top_builddir) --include=Gio-2.0 \
@@ -1266,7 +1266,7 @@ Everything-1.0.gir: libeverything-1.0.la Makefile
 	everything.h everything.c
 
 GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
+	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error \
 	--namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \
 	--libtool="$(LIBTOOL)" \
 	--add-include-path=$(top_builddir) --include=Gio-2.0 \





LICENSE=	BSD2CLAUSE

USES=		uidfix

USE_LDCONFIG=	yes

.if defined(NO_PROFILE) || defined(NOPROFILE) || defined(WITHOUT_PROFILE) || "${MK_PROFILE}" == "no"

PLIST_SUB+=	PROFLIB=""
.endif

USES=		uidfix

SRCCONF=	/dev/null
MAKE_ENV+=	SRCCONF=${SRCCONF}

SUB_FILES=	libublio.pc
SUB_LIST=	PORTVERSION=${PORTVERSION} \
		PREFIX=${PREFIX}

OPTIONS_DEFINE=	DOCS

post-extract:
	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}

# this pre-install is only for debugging pointyhat failures
pre-install:
	@${ECHO_CMD} "===> Environment:"
	@${SETENV} | ${SORT} -f
	@${ECHO_CMD} "===> Makefiles used:"
	@${ECHO_CMD} ${.MAKEFILE_LIST}

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}

Lines 22-31 INCLUDES= base64.h connections.h io.h lfnmatch.h lgroup.h lion.h \ Link Here

(-)devel/lion/Makefile (-4 lines)
22	lion_rcsid.h lion_types.h misc.h pipe.h sockets.h \	22	lion_rcsid.h lion_types.h misc.h pipe.h sockets.h \
23	timers.h tls.h udp.h zlib.h	23	timers.h tls.h udp.h zlib.h
24		24
25	post-patch:
26	@${REINPLACE_CMD} -E 's,^(CC\|LDFLAGS) *=,\1 ?=,' \
27	${WRKSRC}/Makefile
28
29	do-install:	25	do-install:
30	${INSTALL_DATA} ${WRKSRC}/liblion.a ${STAGEDIR}${PREFIX}/lib	26	${INSTALL_DATA} ${WRKSRC}/liblion.a ${STAGEDIR}${PREFIX}/lib
31	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lion	27	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lion




# $FreeBSD$

PORTNAME=	newt
PORTVERSION=	0.52.21
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	https://releases.pagure.org/newt/


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libpopt.so:devel/popt \
		libslang.so:devel/libslang2

USES=		gmake ncurses pathfix
GNU_CONFIGURE=	yes
MAKE_ENV=	PCFLAGS="${CFLAGS}"
USE_LDCONFIG=	yes
MAKE_JOBS_UNSAFE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -lncurses

NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls
PYTHON_USES=		python
PYTHON_CONFIGURE_WITH=	python=python${PYTHON_VER}
TCL_USES=		tcl
TCL_CONFIGURE_ENV=	ac_cv_c_tclconfig=${TCL_LIBDIR:Q}
TCL_CONFIGURE_WITH=	tcl

		 /make -C/s|^|#| ; \
		 /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in

post-patch-PYTHON-on:
	@${REINPLACE_CMD} -e \
		'/PYTHONVERS/s|=.*|=${PYTHON_VERSION}|' ${WRKSRC}/configure

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so

Lines 1-3 Link Here

(-)devel/newt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1489932281	1	TIMESTAMP = 1595562796
2	SHA256 (newt-0.52.20.tar.gz) = 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc	2	SHA256 (newt-0.52.21.tar.gz) = 265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31
3	SIZE (newt-0.52.20.tar.gz) = 181163	3	SIZE (newt-0.52.21.tar.gz) = 174895




CONFIGURE_ARGS+=	--disable-jit
.endif

RSLIST=		${WRKSRC}/doc/pcre-config.1 ${WRKSRC}/doc/pcre.3 \
		${WRKSRC}/doc/pcre16.3 ${WRKSRC}/doc/pcre32.3 \
		${WRKSRC}/doc/pcre_assign_jit_stack.3 \
		${WRKSRC}/doc/pcre_compile.3 ${WRKSRC}/doc/pcre_compile2.3 \
		${WRKSRC}/doc/pcre_config.3 \
		${WRKSRC}/doc/pcre_copy_named_substring.3 \
		${WRKSRC}/doc/pcre_copy_substring.3 \
		${WRKSRC}/doc/pcre_dfa_exec.3 ${WRKSRC}/doc/pcre_exec.3 \
		${WRKSRC}/doc/pcre_free_study.3 \
		${WRKSRC}/doc/pcre_free_substring.3 \
		${WRKSRC}/doc/pcre_free_substring_list.3 \
		${WRKSRC}/doc/pcre_fullinfo.3 \
		${WRKSRC}/doc/pcre_get_named_substring.3 \
		${WRKSRC}/doc/pcre_get_stringnumber.3 \
		${WRKSRC}/doc/pcre_get_stringtable_entries.3 \
		${WRKSRC}/doc/pcre_get_substring.3 \
		${WRKSRC}/doc/pcre_get_substring_list.3 \
		${WRKSRC}/doc/pcre_jit_exec.3 \
		${WRKSRC}/doc/pcre_jit_stack_alloc.3 \
		${WRKSRC}/doc/pcre_jit_stack_free.3 \
		${WRKSRC}/doc/pcre_maketables.3 \
		${WRKSRC}/doc/pcre_pattern_to_host_byte_order.3 \
		${WRKSRC}/doc/pcre_refcount.3 ${WRKSRC}/doc/pcre_study.3 \
		${WRKSRC}/doc/pcre_utf16_to_host_byte_order.3 \
		${WRKSRC}/doc/pcre_utf32_to_host_byte_order.3 \
		${WRKSRC}/doc/pcre_version.3 ${WRKSRC}/doc/pcreapi.3 \
		${WRKSRC}/doc/pcrebuild.3 ${WRKSRC}/doc/pcrecallout.3 \
		${WRKSRC}/doc/pcrecompat.3 ${WRKSRC}/doc/pcrecpp.3 \
		${WRKSRC}/doc/pcregrep.1 ${WRKSRC}/doc/pcrejit.3 \
		${WRKSRC}/doc/pcrelimits.3 ${WRKSRC}/doc/pcrematching.3 \
		${WRKSRC}/doc/pcrepartial.3 ${WRKSRC}/doc/pcrepattern.3 \
		${WRKSRC}/doc/pcreperform.3 ${WRKSRC}/doc/pcreposix.3 \
		${WRKSRC}/doc/pcreprecompile.3 ${WRKSRC}/doc/pcresample.3 \
		${WRKSRC}/doc/pcrestack.3 ${WRKSRC}/doc/pcresyntax.3 \
		${WRKSRC}/doc/pcretest.1 ${WRKSRC}/doc/pcreunicode.3

post-patch:
	@${REINPLACE_CMD} -e "/^\.rs/d" ${RSLIST}
	@${REINPLACE_CMD} -e "s/Â£//g" ${WRKSRC}/doc/pcre_compile2.3

.include <bsd.port.post.mk>

Lines 25-31 CPPFLAGS+= -I${LOCALBASE}/include Link Here

(-)devel/protobuf-c/Makefile (-1 lines)
25	LDFLAGS+= -L${LOCALBASE}/lib	25	LDFLAGS+= -L${LOCALBASE}/lib
26		26
27	OPTIONS_DEFINE= DOXYGEN DOCS	27	OPTIONS_DEFINE= DOXYGEN DOCS
28	OPTIONS_DEFAULT= DOXYGEN
29		28
30	PORTDOCS= *	29	PORTDOCS= *
31		30

Lines 3-8 Link Here

(-)devel/py-argcomplete/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= argcomplete	4	PORTNAME= argcomplete
5	PORTVERSION= 1.12.0	5	PORTVERSION= 1.12.0
		6	PORTREVISION= 1
6	CATEGORIES= devel python	7	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 26-32 NO_ARCH= yes Link Here
26	.include <bsd.port.pre.mk>	27	.include <bsd.port.pre.mk>
27		28
28	.if ${PYTHON_REL} < 3800	29	.if ${PYTHON_REL} < 3800
29	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.23<2:devel/py-importlib-metadata@${PY_FLAVOR}	30	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.23:devel/py-importlib-metadata@${PY_FLAVOR}
30	.endif	31	.endif
31		32
32	.include <bsd.port.post.mk>	33	.include <bsd.port.post.mk>

Lines 11-16 COMMENT= Backport of functools.lru_cache from Python 3.3 Link Here

(-)devel/py-backports.functools_lru_cache/Makefile (+3 lines)
11		11
12	LICENSE= MIT	12	LICENSE= MIT
13		13
		14	DEPRECATED= Python 2 is EOL upstream
		15	EXPIRATION_DATE= 2020-12-31
		16
14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}	17	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR}	18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR}
16		19

Lines 12-17 COMMENT= Backport of new features in Python's os module Link Here

(-)devel/py-backports.os/Makefile (+3 lines)
12	LICENSE= PSFL	12	LICENSE= PSFL
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
		15	DEPRECATED= Python 2 is EOL upstream
		16	EXPIRATION_DATE= 2020-12-31
		17
15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}	18	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR} \	19	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}	20	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}

Lines 12-17 COMMENT= Backport of recent additions to the 'collections.abc' module Link Here

(-)devel/py-backports_abc/Makefile (+3 lines)
12		12
13	LICENSE= PSFL	13	LICENSE= PSFL
14		14
		15	DEPRECATED= Python 2 is EOL upstream
		16	EXPIRATION_DATE= 2020-12-31
		17
15	USES= python:2.7	18	USES= python:2.7
16	USE_PYTHON= autoplist distutils	19	USE_PYTHON= autoplist distutils
17		20

Lines 2-8 Link Here

(-)devel/py-celery/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= celery	4	PORTNAME= celery
5	PORTVERSION= 4.4.2	5	PORTVERSION= 4.4.4
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 15-21 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
15		15
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard@${PY_FLAVOR} \	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}kombu>=4.6.8:net/py-kombu@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}kombu>=4.6.10:net/py-kombu@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}vine>=1.3.0:devel/py-vine@${PY_FLAVOR}	19	${PYTHON_PKGNAMEPREFIX}vine>=1.3.0:devel/py-vine@${PY_FLAVOR}
20		20
21	NO_ARCH= yes	21	NO_ARCH= yes

Lines 1-3 Link Here

(-)devel/py-celery/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1586284339	1	TIMESTAMP = 1591193469
2	SHA256 (celery-4.4.2.tar.gz) = 108a0bf9018a871620936c33a3ee9f6336a89f8ef0a0f567a9001f4aa361415f	2	SHA256 (celery-4.4.4.tar.gz) = c2037b6a8463da43b19969a0fc13f9023ceca6352b4dd51be01c66fbbb13647e
3	SIZE (celery-4.4.2.tar.gz) = 1448133	3	SIZE (celery-4.4.4.tar.gz) = 1461880

Lines 1-7 Link Here

(-)devel/py-coverage/Makefile (-1 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= coverage	3	PORTNAME= coverage
4	PORTVERSION= 4.5.4	4	PORTVERSION= 5.2
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 11-16 COMMENT= Code coverage measurement for Python Link Here
11		11
12	LICENSE= BSD2CLAUSE	12	LICENSE= BSD2CLAUSE
13		13
		14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
		15
14	USES= python	16	USES= python
15	USE_PYTHON= autoplist concurrent distutils	17	USE_PYTHON= autoplist concurrent distutils
16		18

Lines 1-3 Link Here

(-)devel/py-coverage/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1568761933	1	TIMESTAMP = 1595299825
2	SHA256 (coverage-4.5.4.tar.gz) = e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c	2	SHA256 (coverage-5.2.tar.gz) = 1874bdc943654ba46d28f179c1846f5710eda3aeb265ff029e0ac2b52daae404
3	SIZE (coverage-4.5.4.tar.gz) = 385185	3	SIZE (coverage-5.2.tar.gz) = 693669




# $FreeBSD$

PORTNAME=	GitPython
DISTVERSION=	3.1.2
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gitdb>=4.0.1:devel/py-gitdb@${PY_FLAVOR}
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ddt>=1.1.1:devel/py-ddt@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}

NO_ARCH=	yes

Lines 1-3 Link Here

(-)devel/py-gitpython/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1545318709	1	TIMESTAMP = 1590775069
2	SHA256 (GitPython-2.1.11.tar.gz) = 8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8	2	SHA256 (GitPython-3.1.2.tar.gz) = 864a47472548f3ba716ca202e034c1900f197c0fb3a08f641c20c3cafd15ed94
3	SIZE (GitPython-2.1.11.tar.gz) = 428531	3	SIZE (GitPython-3.1.2.tar.gz) = 430474




#   $MCom: ports/devel/py-gobject/Makefile,v 1.58 2012/12/30 18:15:16 mezz Exp $

PORTNAME=	gobject
PORTVERSION=	3.38.0
PORTREVISION=	9
CATEGORIES=	devel python
MASTER_SITES=	GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	LGPL21

BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR}
LIB_DEPENDS+=	libffi.so:devel/libffi
RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR}

PORTSCOUT=	ignore:1

USES=		gmake gnome libtool pathfix pkgconfig python:3.5+ tar:xz
# meson
USE_GNOME=	glib20 introspection:build,run cairo
USE_PYTHON=	flavors distutils
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

BINARY_ALIAS=	python3=${PYTHON_CMD}
SHEBANG_FILES=	codegen/*.py

CONFLICTS=	py*-gtk-0*
PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"

Lines 1-2 Link Here

(-)devel/py-gobject/distinfo (-2 / +3 lines)
1	SHA256 (gnome2/pygobject-2.28.6.tar.xz) = fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8	1	TIMESTAMP = 1600140878
2	SIZE (gnome2/pygobject-2.28.6.tar.xz) = 747248	2	SHA256 (gnome2/pygobject-3.38.0.tar.xz) = 0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
		3	SIZE (gnome2/pygobject-3.38.0.tar.xz) = 553892

Removed Link Here

(-)devel/py-gobject/files/patch-docs_Makefile.in (-11 lines)
1	--- docs/Makefile.in.orig Sat May 5 01:25:03 2007
2	+++ docs/Makefile.in Sat May 5 01:25:39 2007
3	@@ -223,7 +223,7 @@ XSL_FILES = \
4	# fixxref cannot be included in XSL_FILES, because automake is touching it
5	# so the date is newer then the files in HTML_FILES
6	FIXXREF = xsl/fixxref.py
7	-TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
8	+TARGET_DIR = $(prefix)/share/doc/pygobject
9	CSSdir = $(TARGET_DIR)
10	CSS_DATA = $(CSS_FILES)
11	XSLdir = $(datadir)/pygobject/xsl




--- gi/pygi-info.c.orig	2011-09-17 10:24:16.000000000 +0200
+++ gi/pygi-info.c	2011-09-17 10:24:40.000000000 +0200
@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info)
         case GI_INFO_TYPE_CONSTANT:
             type = &PyGIConstantInfo_Type;
             break;
-        case GI_INFO_TYPE_ERROR_DOMAIN:
-            type = &PyGIErrorDomainInfo_Type;
-            break;
         case GI_INFO_TYPE_UNION:
             type = &PyGIUnionInfo_Type;
             break;
@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type
                 case GI_INFO_TYPE_INVALID:
                 case GI_INFO_TYPE_FUNCTION:
                 case GI_INFO_TYPE_CONSTANT:
-                case GI_INFO_TYPE_ERROR_DOMAIN:
                 case GI_INFO_TYPE_VALUE:
                 case GI_INFO_TYPE_SIGNAL:
                 case GI_INFO_TYPE_PROPERTY:
@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn
                     case GI_INFO_TYPE_INVALID:
                     case GI_INFO_TYPE_FUNCTION:
                     case GI_INFO_TYPE_CONSTANT:
-                    case GI_INFO_TYPE_ERROR_DOMAIN:
                     case GI_INFO_TYPE_VALUE:
                     case GI_INFO_TYPE_SIGNAL:
                     case GI_INFO_TYPE_PROPERTY:




--- gio/gio-types.defs.orig	2011-06-13 18:33:49.000000000 +0200
+++ gio/gio-types.defs	2013-09-13 01:14:09.000000000 +0200
@@ -526,7 +526,7 @@
   )
 )
 
-(define-enum MountMountFlags
+(define-flags MountMountFlags
   (in-module "gio")
   (c-name "GMountMountFlags")
   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
@@ -545,7 +545,7 @@
   )
 )
 
-(define-enum DriveStartFlags
+(define-flags DriveStartFlags
   (in-module "gio")
   (c-name "GDriveStartFlags")
   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
@@ -770,7 +770,7 @@
   )
 )
 
-(define-enum SocketMsgFlags
+(define-flags SocketMsgFlags
   (in-module "gio")
   (c-name "GSocketMsgFlags")
   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")

Removed Link Here

(-)devel/py-gobject/files/patch-pygobject-2.0.pc.in (-11 lines)
1	--- pygobject-2.0.pc.in.orig 2008-09-03 15:31:23.000000000 +0000
2	+++ pygobject-2.0.pc.in 2008-09-03 15:31:43.000000000 +0000
3	@@ -10,7 +10,7 @@
4	# install additional headers.
5	pygtkincludedir=${includedir}/pygtk-2.0
6	fixxref=${datadir}/pygobject/xsl/fixxref.py
7	-pygdocs=${datadir}/gtk-doc/html/pygobject
8	+pygdocs=${datadir}/doc/pygobject
9	defsdir=${datadir}/pygobject/2.0/defs
10	codegendir=${datadir}/pygobject/2.0/codegen
11




include/pygobject-3.0/pygobject.h
%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/requires.txt
%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/gi/__init__.py
%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_gtktemplate.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_gtktemplate.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/_constants.py
%%PYTHON_SITELIBDIR%%/gi/_error.py
%%PYTHON_SITELIBDIR%%/gi/_gi.so
%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
%%PYTHON_SITELIBDIR%%/gi/_gtktemplate.py
%%PYTHON_SITELIBDIR%%/gi/_option.py
%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py
%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
%%PYTHON_SITELIBDIR%%/gi/docstring.py
%%PYTHON_SITELIBDIR%%/gi/importer.py
%%PYTHON_SITELIBDIR%%/gi/module.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GdkPixbuf.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GdkPixbuf.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GdkPixbuf.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/gi/types.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-37.opt-1.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
libdata/pkgconfig/pygobject-3.0.pc
share/doc/pygobject/pygobject.devhelp
share/doc/pygobject/style.css
share/pygobject/2.0/codegen/__init__.py
share/pygobject/2.0/codegen/__init__.pyc
share/pygobject/2.0/codegen/__init__.pyo
share/pygobject/2.0/codegen/argtypes.py
share/pygobject/2.0/codegen/argtypes.pyc
share/pygobject/2.0/codegen/argtypes.pyo
share/pygobject/2.0/codegen/code-coverage.py
share/pygobject/2.0/codegen/code-coverage.pyc
share/pygobject/2.0/codegen/code-coverage.pyo
share/pygobject/2.0/codegen/codegen.py
share/pygobject/2.0/codegen/codegen.pyc
share/pygobject/2.0/codegen/codegen.pyo
share/pygobject/2.0/codegen/createdefs.py
share/pygobject/2.0/codegen/createdefs.pyc
share/pygobject/2.0/codegen/createdefs.pyo
share/pygobject/2.0/codegen/definitions.py
share/pygobject/2.0/codegen/definitions.pyc
share/pygobject/2.0/codegen/definitions.pyo
share/pygobject/2.0/codegen/defsconvert.py
share/pygobject/2.0/codegen/defsconvert.pyc
share/pygobject/2.0/codegen/defsconvert.pyo
share/pygobject/2.0/codegen/defsgen.py
share/pygobject/2.0/codegen/defsgen.pyc
share/pygobject/2.0/codegen/defsgen.pyo
share/pygobject/2.0/codegen/defsparser.py
share/pygobject/2.0/codegen/defsparser.pyc
share/pygobject/2.0/codegen/defsparser.pyo
share/pygobject/2.0/codegen/docextract.py
share/pygobject/2.0/codegen/docextract.pyc
share/pygobject/2.0/codegen/docextract.pyo
share/pygobject/2.0/codegen/docextract_to_xml.py
share/pygobject/2.0/codegen/docextract_to_xml.pyc
share/pygobject/2.0/codegen/docextract_to_xml.pyo
share/pygobject/2.0/codegen/docgen.py
share/pygobject/2.0/codegen/docgen.pyc
share/pygobject/2.0/codegen/docgen.pyo
share/pygobject/2.0/codegen/h2def.py
share/pygobject/2.0/codegen/h2def.pyc
share/pygobject/2.0/codegen/h2def.pyo
share/pygobject/2.0/codegen/mergedefs.py
share/pygobject/2.0/codegen/mergedefs.pyc
share/pygobject/2.0/codegen/mergedefs.pyo
share/pygobject/2.0/codegen/missingdefs.py
share/pygobject/2.0/codegen/missingdefs.pyc
share/pygobject/2.0/codegen/missingdefs.pyo
share/pygobject/2.0/codegen/mkskel.py
share/pygobject/2.0/codegen/mkskel.pyc
share/pygobject/2.0/codegen/mkskel.pyo
share/pygobject/2.0/codegen/override.py
share/pygobject/2.0/codegen/override.pyc
share/pygobject/2.0/codegen/override.pyo
share/pygobject/2.0/codegen/reversewrapper.py
share/pygobject/2.0/codegen/reversewrapper.pyc
share/pygobject/2.0/codegen/reversewrapper.pyo
share/pygobject/2.0/codegen/scanvirtuals.py
share/pygobject/2.0/codegen/scanvirtuals.pyc
share/pygobject/2.0/codegen/scanvirtuals.pyo
share/pygobject/2.0/codegen/scmexpr.py
share/pygobject/2.0/codegen/scmexpr.pyc
share/pygobject/2.0/codegen/scmexpr.pyo
share/pygobject/2.0/defs/gappinfo.override
share/pygobject/2.0/defs/gapplaunchcontext.override
share/pygobject/2.0/defs/gbufferedinputstream.override
share/pygobject/2.0/defs/gcancellable.override
share/pygobject/2.0/defs/gdatainputstream.override
share/pygobject/2.0/defs/gdrive.override
share/pygobject/2.0/defs/gfile.override
share/pygobject/2.0/defs/gfileattribute.override
share/pygobject/2.0/defs/gfileenumerator.override
share/pygobject/2.0/defs/gfileinfo.override
share/pygobject/2.0/defs/gfileinputstream.override
share/pygobject/2.0/defs/gfileiostream.override
share/pygobject/2.0/defs/gfileoutputstream.override
share/pygobject/2.0/defs/gicon.override
share/pygobject/2.0/defs/ginputstream.override
share/pygobject/2.0/defs/gio-types.defs
share/pygobject/2.0/defs/gio.defs
share/pygobject/2.0/defs/gio.override
share/pygobject/2.0/defs/giostream.override
share/pygobject/2.0/defs/gmemoryinputstream.override
share/pygobject/2.0/defs/gmemoryoutputstream.override
share/pygobject/2.0/defs/gmount.override
share/pygobject/2.0/defs/goutputstream.override
share/pygobject/2.0/defs/gresolver.override
share/pygobject/2.0/defs/gsocket.override
share/pygobject/2.0/defs/gvolume.override
share/pygobject/2.0/defs/gvolumemonitor.override
share/pygobject/2.0/defs/unix-types.defs
share/pygobject/2.0/defs/unix.defs
share/pygobject/2.0/defs/unix.override
share/pygobject/xsl/common.xsl
share/pygobject/xsl/devhelp.xsl
share/pygobject/xsl/fixxref.py
share/pygobject/xsl/html.xsl
share/pygobject/xsl/pdf-style.xsl
share/pygobject/xsl/pdf.xsl
share/pygobject/xsl/ref-html-style.xsl

Lines 7-13 CATEGORIES= devel python Link Here

(-)devel/py-ipywidgets/Makefile (-1 / +1 lines)
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		9
10	MAINTAINER= swills@FreeBSD.org	10	MAINTAINER= python@FreeBSD.org
11	COMMENT= Interactive HTML widgets for Jupyter notebooks and the IPython kernel	11	COMMENT= Interactive HTML widgets for Jupyter notebooks and the IPython kernel
12		12
13	LICENSE= BSD3CLAUSE	13	LICENSE= BSD3CLAUSE

Lines 29-35 USES= python:3.5+ Link Here

(-)devel/py-jira/Makefile (-1 / +1 lines)
29	USE_PYTHON= autoplist distutils	29	USE_PYTHON= autoplist distutils
30		30
31	OPTIONS_DEFINE= MAGIC PARALLEL SHELL TESTS	31	OPTIONS_DEFINE= MAGIC PARALLEL SHELL TESTS
32	OPTIONS_DEFAULT= MAGIC PARALLEL SHELL	32	OPTIONS_DEFAULT= MAGIC PARALLEL
33		33
34	MAGIC_DESC= Enable Content-Type Auto-detection	34	MAGIC_DESC= Enable Content-Type Auto-detection
35	PARALLEL_DESC= Enable asynchronous requests	35	PARALLEL_DESC= Enable asynchronous requests

Lines 1-4 Link Here

(-)devel/py-jira/pkg-descr (-1 / +1 lines)
1	a Python library designed to ease the use of the JIRA REST API. Some basic	1	A Python library designed to ease the use of the JIRA REST API. Some basic
2	support for the GreenHopper REST API also exists.	2	support for the GreenHopper REST API also exists.
3		3
4	WWW: https://bitbucket.org/bspeakmon/jira-python	4	WWW: https://bitbucket.org/bspeakmon/jira-python

Lines 1-7 Link Here

(-)devel/py-pre-commit/Makefile (-3 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pre-commit	3	PORTNAME= pre-commit
4	PORTVERSION= 1.21.0	4	PORTVERSION= 2.6.0
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 22-29 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aspy.yaml>=0:devel/py-aspy.yaml@${PY_FLAVOR} Link Here
22	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}virtualenv20>=20.0.8:devel/py-virtualenv20@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}	26	${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
27		27
28	USES= python:3.6+ shebangfix	28	USES= python:3.6+ shebangfix
29	USE_PYTHON= autoplist distutils	29	USE_PYTHON= autoplist distutils

Lines 1-3 Link Here

(-)devel/py-pre-commit/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1594693753	1	TIMESTAMP = 1595291430
2	SHA256 (pre_commit-1.21.0.tar.gz) = 8f48d8637bdae6fa70cc97db9c1dd5aa7c5c8bf71968932a380628c25978b850	2	SHA256 (pre_commit-2.6.0.tar.gz) = 1657663fdd63a321a4a739915d7d03baedd555b25054449090f97bb0cb30a915
3	SIZE (pre_commit-1.21.0.tar.gz) = 145595	3	SIZE (pre_commit-2.6.0.tar.gz) = 151465




# $FreeBSD$

PORTNAME=	pytest-mock
PORTVERSION=	3.2.0
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

PATCH_SITES=	https://github.com/pytest-dev/${PORTNAME}/commit/
PATCHFILES=	b3badafebedea3605c90eb22a68adff2885a8bb0.patch:-p1

MAINTAINER=	olgeni@FreeBSD.org
COMMENT=	Thin wrapper around the mock package for easier use with py.test


Lines 1-5 Link Here

(-)devel/py-pytest-mock/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1557059422	1	TIMESTAMP = 1595302774
2	SHA256 (pytest-mock-1.10.4.tar.gz) = 5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568	2	SHA256 (pytest-mock-3.2.0.tar.gz) = 7122d55505d5ed5a6f3df940ad174b3f606ecae5e9bc379569cdcbd4cd9d2b83
3	SIZE (pytest-mock-1.10.4.tar.gz) = 18790	3	SIZE (pytest-mock-3.2.0.tar.gz) = 25569
4	SHA256 (b3badafebedea3605c90eb22a68adff2885a8bb0.patch) = 8c6d1028175b1a524cbcb1df3aeaa725fed9a1aa3ad0499a242ac65b65e855e0
5	SIZE (b3badafebedea3605c90eb22a68adff2885a8bb0.patch) = 1667

Lines 1-7 Link Here

(-)devel/py-pytest/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pytest	3	PORTNAME= pytest
4	PORTVERSION= 4.5.0	4	PORTVERSION= 5.4.3
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)devel/py-pytest/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557834909	1	TIMESTAMP = 1595300910
2	SHA256 (pytest-4.5.0.tar.gz) = 1a8aa4fa958f8f451ac5441f3ac130d9fc86ea38780dd2715e6d5c5882700b24	2	SHA256 (pytest-5.4.3.tar.gz) = 7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8
3	SIZE (pytest-4.5.0.tar.gz) = 943607	3	SIZE (pytest-5.4.3.tar.gz) = 1022353

Lines 14-22 LICENSE= LGPL21 Link Here

(-)devel/regexx/Makefile (-2 / +4 lines)
14		14
15	LIB_DEPENDS= libpcre.so:devel/pcre	15	LIB_DEPENDS= libpcre.so:devel/pcre
16		16
17	USES= gmake pkgconfig libtool	17	USES= gmake libtool pkgconfig
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \	19	MAKE_ARGS= ACLOCAL="${TRUE}" \
		20	AUTOCONF="${TRUE}" \
		21	AUTOHEADER="${TRUE}" \
20	AUTOMAKE="${TRUE}"	22	AUTOMAKE="${TRUE}"
21	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
22		24

Removed Link Here

(-)devel/regexx/files/patch-examples__simple.cc (-10 lines)
1	--- examples/simple.cc.orig Tue Mar 13 23:42:21 2001
2	+++ examples/simple.cc Sun Dec 22 03:09:56 2002
3	@@ -30,6 +30,7 @@
4	#include <regexx.hh>
5
6	using namespace regexx;
7	+using namespace std;
8
9	//
10	// This is the function to pass to replace() in

Removed Link Here

(-)devel/regexx/files/patch-src__Makefile.in (-11 lines)
1	--- src/Makefile.in.orig 2013-11-15 21:03:55.000000000 +0900
2	+++ src/Makefile.in 2013-11-15 21:04:18.000000000 +0900
3	@@ -74,7 +74,7 @@
4
5	lib_LTLIBRARIES = libregexx.la
6	libregexx_la_SOURCES = regexx.cc regexx.hh split.cc split.hh
7	-libregexx_la_LDFLAGS = -version-info 2:0:1 ../pcre/maketables.lo ../pcre/get.lo ../pcre/study.lo ../pcre/pcre.lo
8	+libregexx_la_LDFLAGS = -version-info 2:0:1
9	include_HEADERS = regexx.hh split.hh
10	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11	CONFIG_CLEAN_FILES =




--- src/regexx.hh.orig	Tue Mar 13 23:42:21 2001
+++ src/regexx.hh	Sun Dec 22 03:08:47 2002
@@ -94,7 +94,7 @@
 
   };
 
-  inline ostream& operator<<(ostream& _o, RegexxMatchAtom& _rxxma)
+  inline std::ostream& operator<<(std::ostream& _o, RegexxMatchAtom& _rxxma)
   {
     return _o << _rxxma.str();
   }
@@ -161,7 +161,7 @@
 
   };
 
-  inline ostream& operator<<(ostream& _o, RegexxMatch& _rxxm)
+  inline std::ostream& operator<<(std::ostream& _o, RegexxMatch& _rxxm)
   {
     return (_o << _rxxm.str());
   }
@@ -566,7 +566,7 @@
   }
 
   inline const std::string&
-  Regexx::replacef(std::string (*_func)(const RegexxMatch&), int _flags = 0)
+  Regexx::replacef(std::string (*_func)(const RegexxMatch&), int _flags)
     throw(CompileException)
   {
     exec(_flags&~nomatch);
@@ -580,7 +580,7 @@
   inline const std::string&
   Regexx::replacef(const std::string& _expr,
 		   std::string (*_func)(const RegexxMatch&),
-		   int _flags = 0)
+		   int _flags)
     throw(CompileException)
   {
     expr(_expr);
@@ -590,7 +590,7 @@
   inline const std::string&
   Regexx::replacef(const std::string& _str, const std::string& _expr,
 		   std::string (*_func)(const RegexxMatch&),
-		   int _flags = 0)
+		   int _flags)
     throw(CompileException)
   {
     str(_str);




--- src/regexx.cc.orig	Tue Mar 13 22:42:21 2001
+++ src/regexx.cc	Sat Dec 29 08:27:24 2001
@@ -27,7 +27,7 @@
 // $Date: 2001/03/13 14:42:21 $
 
 #include "regexx.hh"
-#include "../pcre/pcre.h"
+#include "pcre.h"
 
 const unsigned int&
 regexx::Regexx::exec(int _flags)
@@ -43,13 +43,13 @@
     if(m_preg == NULL) {
       throw CompileException(errptr);
     }
-    pcre_fullinfo(m_preg, NULL, PCRE_INFO_CAPTURECOUNT, (void*)&m_capturecount);
+    pcre_fullinfo((const pcre *)m_preg, NULL, PCRE_INFO_CAPTURECOUNT, (void*)&m_capturecount);
     m_compiled = true;
   }
 
   if(!m_study && (_flags&study)) {
     const char *errptr;
-    m_extra = pcre_study(m_preg, 0, &errptr);
+    m_extra = pcre_study((const pcre *)m_preg, 0, &errptr);
     if(errptr != NULL)
       throw CompileException(errptr);
     m_study = true;
@@ -63,20 +63,20 @@
   int ssc;
   m_matches = 0;
 
-  ssc = pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),0,eflags,ssv,33);
+  ssc = pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),0,eflags,ssv,33);
   bool ret = (ssc > 0);
 
   if(_flags&global) {
     if(_flags&nomatch)
       while(ret) {
 	m_matches++;
-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
       }
     else if(_flags&noatom)
       while(ret) {
 	m_matches++;
 	match.push_back(RegexxMatch(m_str,ssv[0],ssv[1]-ssv[0]));
-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
       }
     else
       while(ret) {
@@ -89,7 +89,7 @@
 	  else
 	    match.back().atom.push_back(RegexxMatchAtom(m_str,0,0));
         }
-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
       }
   }
   else {
@@ -114,7 +114,7 @@
 	  else
 	    match.back().atom.push_back(RegexxMatchAtom(m_str,0,0));
 	}
-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
       }
     }
   }

Removed Link Here

(-)devel/regexx/files/patch-src__regexx.hh (-10 lines)
1	--- src/regexx.hh.orig 2013-11-15 21:02:42.000000000 +0900
2	+++ src/regexx.hh 2013-11-15 21:03:03.000000000 +0900
3	@@ -29,6 +29,7 @@
4	#ifndef REGEXX_HH
5	#define REGEXX_HH
6
7	+#include <cstdlib>
8	#include <string>
9	#include <vector>
10	#include <split.hh>

Lines 1-7 Link Here

(-)devel/zpu-binutils/files/patch-build.sh (-1 / +1 lines)
1	--- build.sh.orig 2012-10-11 19:40:23.000000000 -0400	1	--- build.sh.orig 2012-10-11 19:40:23.000000000 -0400
2	+++ build.sh 2013-12-30 21:20:35.147443323 -0500	2	+++ build.sh 2013-12-30 21:20:35.147443323 -0500
3	@@ -1,18 +1,20 @@	3	@@ -1,18 +1,20 @@
4	+export CC=cc	4	+export CC=%%CC%%
5	+export DISTDIR=%%DISTDIR%%	5	+export DISTDIR=%%DISTDIR%%
6	set -e	6	set -e
7	rm -rf build	7	rm -rf build

Lines 22-32 PORTDOCS= AUTHORS ChangeLog README THANKS TODO Link Here

(-)dns/checkdns/Makefile (-5 lines)
22		22
23	OPTIONS_DEFINE= DOCS	23	OPTIONS_DEFINE= DOCS
24		24
25	post-patch:
26	@${REINPLACE_CMD} -e 's\|/usr/local\|${PREFIX}\|g' ${WRKSRC}/main.c \
27	${WRKSRC}/INSTALL ${WRKSRC}/README ${WRKSRC}/checkdns.conf-dist
28	@${REINPLACE_CMD} -e 's\|CC = gcc\|CC = ${CC} -include string.h\|' ${WRKSRC}/Makefile
29
30	do-install:	25	do-install:
31	${INSTALL_PROGRAM} ${WRKSRC}/checkdns ${STAGEDIR}${PREFIX}/bin/	26	${INSTALL_PROGRAM} ${WRKSRC}/checkdns ${STAGEDIR}${PREFIX}/bin/
32	${INSTALL_DATA} ${WRKSRC}/checkdns.conf-dist ${STAGEDIR}${PREFIX}/etc/	27	${INSTALL_DATA} ${WRKSRC}/checkdns.conf-dist ${STAGEDIR}${PREFIX}/etc/




--- Makefile.orig	2005-01-15 20:40:27 UTC
+++ Makefile
@@ -1,5 +1,5 @@
-#CC = gcc -ansi -pedantic -DDEBUG -g
-CC = gcc -ansi -pedantic
+#CC = cc -include string.h -ansi -pedantic -DDEBUG -g
+CC = cc -include string.h -ansi -pedantic
 
 INSTALL = install
 
@@ -9,12 +9,20 @@ compile: $(OBJS)
 	$(CC) -o checkdns $(OBJS)
 
 install:

+	mkdir -p ${PREFIX}/share/checkdns/lang
+	cp -f checkdns.css ${PREFIX}/share/checkdns
+	cp -f lang/* ${PREFIX}/share/checkdns/lang
 
+
+
 
 clean:
 	rm -f $(OBJS) checkdns
 
 uninstall: clean
 	rm /usr/local/bin/checkdns
 




     ;;
 esac
 
@@ -2633,13 +2633,43 @@ fi
   ac_cv_flavor_gethostbyaddr=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 2637 "configure"
+#line 2648 "configure"
 #include "confdefs.h"
 
     #include <stddef.h>
     #include <sys/types.h>
     #include <sys/socket.h>
     #include <netdb.h>
+    struct hostent *gethostbyaddr(const void *addr, int len, int type) {
+	return NULL;
+    }

+else
+  cat > conftest.$ac_ext <<EOF
+#line 2678 "configure"
+#include "confdefs.h"
+
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
     struct hostent *gethostbyaddr(const char *addr, int len, int type) {
 	return NULL;
     }
@@ -2674,6 +2704,10 @@ echo "$ac_t""$ac_cv_flavor_gethostbyaddr" 1>&6
     glibc)
 	ac_cv_type_ghba_addr_t='const char *'
 	ac_cv_type_ghba_addrlen_t='size_t'
+	;;
+    freebsd6)
+	ac_cv_type_ghba_addr_t='const void *'
+	ac_cv_type_ghba_addrlen_t='int'
 	;;
     traditional | none)
 	ac_cv_type_ghba_addr_t='const char *'
 	ac_cv_type_ghba_addrlen_t='int'

Lines 29-35 THREADS_CONFIGURE_ENABLE= threads Link Here

(-)dns/libbind/Makefile (-3 lines)
29	verify: checksum	29	verify: checksum
30	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc	30	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
31		31
32	post-patch:
33	${REINPLACE_CMD} -e '/#include <utmp.h>/ d' ${WRKSRC}/irs/*.c
34
35	.include <bsd.port.mk>	32	.include <bsd.port.mk>




--- doc/Makefile.in.orig	2009-03-04 01:09:51.000000000 +0100
+++ doc/Makefile.in	2012-04-24 00:04:48.884815527 +0200
@@ -175,24 +175,12 @@
 		${INSTALL_DATA} $${f}.${LIB_NETWORK_MAN_EXT} \
 		${MANDIR}/man${LIB_NETWORK_EXT}/$${f}.${LIB_NETWORK_EXT}; \
 	done
-	@set -x; N=${LIB_NETWORK_EXT}; for f in ${LIB_NETWORK_BASE}; do \
-		${INSTALL_DATA} $${f}.${LIB_NETWORK_CAT_EXT} \
-		${MANDIR}/cat${LIB_NETWORK_EXT}/$${f}.${LIB_NETWORK_EXT}; \
-	done
 	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_BASE}; do \
 		${INSTALL_DATA} $${f}.${FORMAT_MAN_EXT} \
 		${MANDIR}/man${FORMAT_EXT}/$${f}.${FORMAT_EXT}; \
 	done
-	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_BASE}; do \
-		${INSTALL_DATA} $${f}.${FORMAT_CAT_EXT} \
-		${MANDIR}/cat${FORMAT_EXT}/$${f}.${FORMAT_EXT}; \
-	done
 	@set -x; N=${DESC_EXT}; for f in ${DESC_BASE}; do \
 		${INSTALL_DATA} $${f}.${DESC_MAN_EXT} \
 		${MANDIR}/man${DESC_EXT}/$${f}.${DESC_EXT}; \
 	done
-	@set -x; N=${DESC_EXT}; for f in ${DESC_BASE}; do \
-		${INSTALL_DATA} $${f}.${DESC_CAT_EXT} \
-		${MANDIR}/cat${DESC_EXT}/$${f}.${DESC_EXT}; \
-	done
 

Lines 13-21 COMMENT= DNS "ping" Link Here

(-)dns/nsping/Makefile (-3 lines)
13		13
14	PLIST_FILES= sbin/nsping man/man8/nsping.8.gz	14	PLIST_FILES= sbin/nsping man/man8/nsping.8.gz
15		15
16	post-patch:
17	${REINPLACE_CMD} -e "s/dprintf/debug_printf/g" ${WRKSRC}/nsping.*
18
19	do-install:	16	do-install:
20	${INSTALL_PROGRAM} ${WRKSRC}/nsping ${STAGEDIR}${PREFIX}/sbin	17	${INSTALL_PROGRAM} ${WRKSRC}/nsping ${STAGEDIR}${PREFIX}/sbin
21	${INSTALL_DATA} ${WRKSRC}/nsping.8 ${STAGEDIR}${PREFIX}/man/man8	18	${INSTALL_DATA} ${WRKSRC}/nsping.8 ${STAGEDIR}${PREFIX}/man/man8




--- Makefile.orig	1997-11-24 09:56:28 UTC
+++ Makefile
@@ -1,4 +1,4 @@
-CFLAGS=	-g 
+#CFLAGS=	-g 
 #Solaris
 #CFLAGS= -g -Dsys5
 LDFLAGS=
@@ -10,6 +10,8 @@ TARGET= nsping
 OBJS= nsping.o dns-lib.o dns-rr.o
 SRCS= nsping.c dns-lib.c dns-rr.c
 HEADERS= nsping.h dns-lib.h dns-rr.h 

Lines 1-6 Link Here

(-)dns/nsping/files/patch-dns-rr.c (-3 / +3 lines)
1	--- dns-rr.c.orig Mon Jul 4 12:02:22 2005	1	--- dns-rr.c.orig 1997-11-24 09:40:37 UTC
2	+++ dns-rr.c Mon Jul 4 12:02:39 2005	2	+++ dns-rr.c
3	@@ -23,7 +23,7 @@	3	@@ -23,7 +23,7 @@ dns_rr_query(char name, int type, u_char buf) {
4		4
5	len = dns_string(name, dp, MAXDNAME);	5	len = dns_string(name, dp, MAXDNAME);
6	if(len < 0)	6	if(len < 0)




--- nsping.c.orig	1997-11-26 08:11:39 UTC
+++ nsping.c
@@ -14,6 +14,9 @@ int snprintf(char *, int, char *, ...);
 #include <stdarg.h>
 #include <assert.h>
 

 /* store state on sent queries */
 
 struct nsq {
@@ -26,8 +29,17 @@ struct nsq {
  * too much stuff through globals. Sorry.
  */
 

 char *Zone 		= NULL;
 char *Hostname 		= NULL;
 
@@ -55,7 +67,7 @@ int main(int argc, char **argv) {
 	struct timeval *tvp;
 	struct itimerval itv;
 	u_int32_t address = INADDR_ANY;

 	char *timearg = NULL;
 	char c;
 	int i;
@@ -65,6 +77,10 @@ int main(int argc, char **argv) {
 		Queries[i].found = 1;
 	}
 

 #define OPTS "z:h:t:p:dP:a:c:T:rR"
 
 	while((c = getopt(argc, argv, OPTS)) != EOF) {
@@ -105,15 +121,17 @@ int main(int argc, char **argv) {
 			break;			
 
 		case 'p':

 			if(address == INADDR_NONE) {
 				fprintf(stderr, "Unable to resolve local address.\n");
 				exit(1);
@@ -135,7 +153,7 @@ int main(int argc, char **argv) {
 		exit(1);
 	}
 

 		fprintf(stderr, "Unable to resolve target server address.\n");
 		fprintf(stderr, "Fatal error, exiting.\n");
 		exit(1);
@@ -147,7 +165,7 @@ int main(int argc, char **argv) {
 	       	exit(1);
 	}
 

 		fprintf(stderr, "Fatal error, exiting.\n");
 		exit(1);
 	}
@@ -167,7 +185,7 @@ int main(int argc, char **argv) {
 	/* start the fun */
 
 	printf("NSPING %s (%s): %s = \"%s\", Type = \"IN %s\"\n",

 			Hostname ? "Hostname" : "Domain",
 			Hostname ? Hostname : Zone,
 			type_int2string(Type));
@@ -189,10 +207,14 @@ int main(int argc, char **argv) {
 
 int guess_zone() {
 	char lhn[MAXDNAME];

 
 	cp = strchr(lhn, '.');
 	if(!cp || !(*(++cp)))
@@ -261,15 +283,19 @@ void probe(int sig) {
 	static int Start = 0;
 	static int Pos    = 0;      
 

-		Start = getpid();
+	if(!Start) {
+		Start = getpid() % MAX_ID;
+	  	debug_printf("Start = %d\n", Start);
+	}
 
 	/* we're overwriting state from a query we never got a response
 	 * to, so at least note that we missed it.
@@ -278,18 +304,16 @@ void probe(int sig) {
 	if(!Queries[Pos].found)
 		Missed++;
 

 	/* get the DNS request */
 
-	l = dns_packet(&qp, Start + Sent);
+	debug_printf("sending with id = %d\n", (Start + Sent) % MAX_ID);
+	l = dns_packet(&qp, (Start + Sent) % MAX_ID); 
 
 	do {

 			if(errno != EINTR) {		
 				perror("sendto");
 				return;
@@ -299,7 +323,7 @@ void probe(int sig) {
 
 	/* if it was sent successfully, update state */
 

 	gettimeofday(&Queries[Pos].sent, NULL);
 	Queries[Pos].found = 0;
 
@@ -361,7 +385,10 @@ int dns_packet(u_char **qp, int id) {
 
 void handle_incoming() {
 	u_char buffer[1024];

 	int sil = sizeof(si);
 	int l;
 
@@ -378,20 +405,22 @@ void handle_incoming() {
 
 		/* descriminate real responses from spurious crud */
 
+#if 0
 		if(si.sin_addr.s_addr != Target_Address) {
-			dprintf("Received packet from unexpected address %s.\n",
+			debug_printf("Received packet from unexpected address %s.\n",
 				inet_ntoa(si.sin_addr));
 			continue;
 		}
 
 		if(si.sin_port != htons(Target_Port)) {
-			dprintf("Received packet from unexpected port %d.\n",
+			debug_printf("Received packet from unexpected port %d.\n",
 				ntohs(si.sin_port));
 			continue;
 		}
+#endif
 
 		if(l < sizeof(HEADER)) {
-			dprintf("Short packet.\n");
+			debug_printf("Short packet.\n");
 			continue;
 		}
 		
@@ -420,7 +449,7 @@ void update(u_char *bp, int l) {
 	double triptime;
 
 	if(!Start)

 
 	gettimeofday(&tv, NULL);
 
@@ -431,14 +460,15 @@ void update(u_char *bp, int l) {
 			break;
 
 	if(i == QUERY_BACKLOG) {
-		dprintf("Packet with id %d not ours.\n", ntohs(hp->id));
+		debug_printf("Packet with id %d not ours.\n", ntohs(hp->id));
 		return;
 	} else 
 		Queries[i].found = 1;	
 
 	/* figure out which query this was, using the DNS query ID */
-
+	debug_printf("received with id = %d\n", ntohs(hp->id));
 	delta = ntohs(hp->id) - Start;
+	debug_printf("delta = %d - %d = %d\n", ntohs(hp->id), Start, delta);
 	
 	/* figure out how long it took */
 
@@ -494,7 +524,7 @@ void update(u_char *bp, int l) {
 	       hp->rcode == NOERROR ? "+" : "-",
 	       delta,
 	       l, 

 	       triptime,
 	       delta ? Ave : 0.0);
 
@@ -512,6 +542,9 @@ void summarize(int sig) {
 	       "Ave/Max/Min: %8.3f / %8.3f / %8.3f\n",
 	       Sent, Count, Missed ? Missed : Sent - Count, Lagged, Ave, Max, Min);
 

 	exit(0);
 }
 
@@ -555,18 +588,6 @@ struct timeval *timeval_subtract(struct timeval *out, 
 
 /* -------------------------------------------------------------------------- */
 

 /* map integer type codes to names, v/vrsa. Add new types here if you must. */
 
 struct type2str {
@@ -610,7 +631,7 @@ int type_string2int(char *string) {
 
 /* don't print if we're not in debug mode */
 
-void dprintf(char *fmt, ...) {
+void debug_printf(char *fmt, ...) {
 	va_list ap;
 
 	if(!Debug)
@@ -625,22 +646,40 @@ void dprintf(char *fmt, ...) {
 
 /* return a bound UDP socket */
 

+		((struct sockaddr_in *)(&sss))->sin_family = AF_INET;
+		addrlen = sizeof(struct sockaddr_in);
+	    	break;
 
-	if(bind(sockfd, (struct sockaddr *)&si, sizeof(si)) < 0) {
+	    case AF_INET6:
+		((struct sockaddr_in6 *)(&sss))->sin6_addr = anyaddr;
+		((struct sockaddr_in6 *)(&sss))->sin6_port = htons(atoi(port)); 

+		addrlen = sizeof(struct sockaddr_in6);
+	    	break;
+	}
+
-	if(bind(sockfd, (struct sockaddr *)&si, sizeof(si)) < 0) {
+	if(bind(sockfd, (struct sockaddr *)&sss, addrlen) < 0) 
+	{
 		perror("bind");
 		return(-1);
 	}
@@ -652,19 +691,45 @@ int bind_udp_socket(u_int32_t address, u_int16_t port)
 
 /* wrap hostname resolution */
 
-u_int32_t resolve(char *name) {
-	u_long addr;
+struct addrinfo* resolve(char *name, char *port) { 
+	struct addrinfo hints, *res, *res0;
+    	int error;
+        const char *cause = NULL;
 
-	addr = inet_addr(name);
-	if(addr == INADDR_NONE) {
-		struct hostent *hp = gethostbyname(name);
-		if(!hp)
-			return(INADDR_NONE);
-
-		memcpy(&addr, hp->h_addr, 4);
+struct addrinfo* resolve(char *name, char *port) { 
+	struct addrinfo hints, *res, *res0;
+    	int error;
+        const char *cause = NULL;
+
+	memset(&hints, 0, sizeof(hints));
+    	hints.ai_family = PF_UNSPEC;
+      	hints.ai_socktype = SOCK_DGRAM;

+	  errx(1, "%s", gai_strerror(error));
+	  return(NULL);
+	}
 
-		memcpy(&addr, hp->h_addr, 4);
+	res = res0;
+	switch (res->ai_family) {
+	    case AF_INET:

 }
 
 
@@ -679,9 +744,7 @@ char *xstrdup(char *v) {
 /* -------------------------------------------------------------------------- */
 
  void usage() {




--- nsping.h.orig	1997-11-24 09:47:25 UTC
+++ nsping.h
@@ -27,7 +27,7 @@ typedef unsigned short u_int16_t;
 #endif
 
 #define QUERY_BACKLOG	1024

 #define DEFAULT_SECOND_INTERVAL	1
 #define DEFAULT_USECOND_INTERVAL	0
 
@@ -40,11 +40,10 @@ void update(u_char *bp, int l);
 void summarize(int);
 double trip_time(struct timeval *send_time, struct timeval *rcv);
 struct timeval *timeval_subtract(struct timeval *out, struct timeval *in);
-char *addr_string(u_int32_t address);
-int bind_udp_socket(u_int32_t address, u_int16_t port);
-void dprintf(char *fmt, ...);
+int bind_udp_socket(char *port);
+void debug_printf(char *fmt, ...);
 void usage(void);
 char *xstrdup(char *v);
-u_int32_t resolve(char *name);




# $FreeBSD$

PORTNAME=	cooledit
DISTVERSION=	4.0.0
PORTREVISION=	3
CATEGORIES=	editors
MASTER_SITES=	SUNSITE/apps/editors/X/cooledit


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libfreetype.so:print/freetype2

USES=		gettext-runtime gmake libtool pkgconfig python xorg
GNU_CONFIGURE=	yes
USE_XORG=	x11 xt
USE_LDCONFIG=	yes
USE_GCC=	any
INSTALL_TARGET=	install-strip

CPPFLAGS+=	-I${PREFIX}/include
LDFLAGS+=	-lpthread -L${PREFIX}/lib
CFLAGS+=	-DHAVE_MBRTOWC

OPTIONS_DEFINE=	NEXT_LOOK
NEXT_LOOK_DESC=	Enable NeXT look
NEXT_LOOK_CONFIGURE_ENABLE=	NeXT-look

post-patch:
	@${REINPLACE_CMD} -e 's|po pixmap man|po man|g' ${WRKSRC}/Makefile.in

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)editors/cooledit/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1527085795	1	TIMESTAMP = 1595154397
2	SHA256 (cooledit-3.17.28.tar.gz) = 4d8b664592737bb1d4b93e509fe185d712318f40fc3c5a36bbc522d87f6b686d	2	SHA256 (cooledit-4.0.0.tar.gz) = 88822d8436d4d81b5dabb909881a7e28ef3dd16b1302c0b430938cba8bb96c96
3	SIZE (cooledit-3.17.28.tar.gz) = 1265017	3	SIZE (cooledit-4.0.0.tar.gz) = 67719237




--- widget/widechar.c.orig	2017-08-04 19:12:31 UTC
+++ widget/widechar.c
@@ -227,6 +227,7 @@ static inline struct mb_rule apply_mb_ru
 static inline struct mb_rule apply_mb_rules_going_right (WEdit * edit, long byte_index, struct mb_rule mb_rule)
 {
 #ifdef HAVE_WCHAR_H
+#ifdef HAVE_MBRTOWC
     wchar_t wc;
     unsigned char p[16];
     int n;
@@ -253,6 +254,7 @@ static inline struct mb_rule apply_mb_ru
     mb_rule.end = 0;
     mb_rule.ch = -1;
 #endif
+#endif
     return mb_rule;
 }
 




man/man1/coolman.1.gz
man/man1/smalledit.1.gz
%%DATADIR%%/c_utils.py
%%DATADIR%%/fonts/8x13B-ISO8859-1.pcf.gz
%%DATADIR%%/fonts/8x13B.pcf.gz
%%DATADIR%%/fonts/Makefile.am
%%DATADIR%%/fonts/NotoColorEmoji.ttf
%%DATADIR%%/fonts/NotoEmoji-Regular.ttf
%%DATADIR%%/fonts/NotoKufiArabic-Regular.ttf
%%DATADIR%%/fonts/NotoMono-Regular.ttf
%%DATADIR%%/fonts/NotoNaskhArabicUI-Regular.ttf
%%DATADIR%%/fonts/NotoNastaliqUrdu-Regular.ttf
%%DATADIR%%/fonts/NotoSans-Regular.ttf
%%DATADIR%%/fonts/NotoSansAdlam-Regular.ttf
%%DATADIR%%/fonts/NotoSansAdlamUnjoined-Regular.ttf
%%DATADIR%%/fonts/NotoSansAnatolianHieroglyphs-Regular.ttf
%%DATADIR%%/fonts/NotoSansArmenian-Regular.ttf
%%DATADIR%%/fonts/NotoSansAvestan-Regular.ttf
%%DATADIR%%/fonts/NotoSansBalinese-Regular.ttf
%%DATADIR%%/fonts/NotoSansBamum-Regular.ttf
%%DATADIR%%/fonts/NotoSansBatak-Regular.ttf
%%DATADIR%%/fonts/NotoSansBengaliUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansBrahmi-Regular.ttf
%%DATADIR%%/fonts/NotoSansBuginese-Regular.ttf
%%DATADIR%%/fonts/NotoSansBuhid-Regular.ttf
%%DATADIR%%/fonts/NotoSansCanadianAboriginal-Regular.ttf
%%DATADIR%%/fonts/NotoSansCarian-Regular.ttf
%%DATADIR%%/fonts/NotoSansChakma-Regular.ttf
%%DATADIR%%/fonts/NotoSansCham-Regular.ttf
%%DATADIR%%/fonts/NotoSansCherokee-Regular.ttf
%%DATADIR%%/fonts/NotoSansCoptic-Regular.ttf
%%DATADIR%%/fonts/NotoSansCuneiform-Regular.ttf
%%DATADIR%%/fonts/NotoSansCypriot-Regular.ttf
%%DATADIR%%/fonts/NotoSansDeseret-Regular.ttf
%%DATADIR%%/fonts/NotoSansDevanagariUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansEgyptianHieroglyphs-Regular.ttf
%%DATADIR%%/fonts/NotoSansEthiopic-Regular.ttf
%%DATADIR%%/fonts/NotoSansGeorgian-Regular.ttf
%%DATADIR%%/fonts/NotoSansGlagolitic-Regular.ttf
%%DATADIR%%/fonts/NotoSansGothic-Regular.ttf
%%DATADIR%%/fonts/NotoSansGujaratiUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansGurmukhiUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansHanunoo-Regular.ttf
%%DATADIR%%/fonts/NotoSansHebrew-Regular.ttf
%%DATADIR%%/fonts/NotoSansImperialAramaic-Regular.ttf
%%DATADIR%%/fonts/NotoSansInscriptionalPahlavi-Regular.ttf
%%DATADIR%%/fonts/NotoSansInscriptionalParthian-Regular.ttf
%%DATADIR%%/fonts/NotoSansJavanese-Regular.ttf
%%DATADIR%%/fonts/NotoSansKaithi-Regular.ttf
%%DATADIR%%/fonts/NotoSansKannadaUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansKayahLi-Regular.ttf
%%DATADIR%%/fonts/NotoSansKharoshthi-Regular.ttf
%%DATADIR%%/fonts/NotoSansKhmerUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansLaoUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansLepcha-Regular.ttf
%%DATADIR%%/fonts/NotoSansLimbu-Regular.ttf
%%DATADIR%%/fonts/NotoSansLinearB-Regular.ttf
%%DATADIR%%/fonts/NotoSansLisu-Regular.ttf
%%DATADIR%%/fonts/NotoSansLycian-Regular.ttf
%%DATADIR%%/fonts/NotoSansLydian-Regular.ttf
%%DATADIR%%/fonts/NotoSansMalayalamUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansMandaic-Regular.ttf
%%DATADIR%%/fonts/NotoSansMeeteiMayek-Regular.ttf
%%DATADIR%%/fonts/NotoSansMongolian-Regular.ttf
%%DATADIR%%/fonts/NotoSansMono-Bold.ttf
%%DATADIR%%/fonts/NotoSansMonoCJKjp-Regular.otf
%%DATADIR%%/fonts/NotoSansMonoCJKkr-Regular.otf
%%DATADIR%%/fonts/NotoSansMonoCJKsc-Regular.otf
%%DATADIR%%/fonts/NotoSansMonoCJKtc-Regular.otf
%%DATADIR%%/fonts/NotoSansMyanmarUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansNKo-Regular.ttf
%%DATADIR%%/fonts/NotoSansNewTaiLue-Regular.ttf
%%DATADIR%%/fonts/NotoSansOgham-Regular.ttf
%%DATADIR%%/fonts/NotoSansOlChiki-Regular.ttf
%%DATADIR%%/fonts/NotoSansOldItalic-Regular.ttf
%%DATADIR%%/fonts/NotoSansOldPersian-Regular.ttf
%%DATADIR%%/fonts/NotoSansOldSouthArabian-Regular.ttf
%%DATADIR%%/fonts/NotoSansOldTurkic-Regular.ttf
%%DATADIR%%/fonts/NotoSansOriyaUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansOsage-Regular.ttf
%%DATADIR%%/fonts/NotoSansOsmanya-Regular.ttf
%%DATADIR%%/fonts/NotoSansPhagsPa-Regular.ttf
%%DATADIR%%/fonts/NotoSansPhoenician-Regular.ttf
%%DATADIR%%/fonts/NotoSansRejang-Regular.ttf
%%DATADIR%%/fonts/NotoSansRunic-Regular.ttf
%%DATADIR%%/fonts/NotoSansSamaritan-Regular.ttf
%%DATADIR%%/fonts/NotoSansSaurashtra-Regular.ttf
%%DATADIR%%/fonts/NotoSansShavian-Regular.ttf
%%DATADIR%%/fonts/NotoSansSinhalaUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansSundanese-Regular.ttf
%%DATADIR%%/fonts/NotoSansSylotiNagri-Regular.ttf
%%DATADIR%%/fonts/NotoSansSymbols-Regular.ttf
%%DATADIR%%/fonts/NotoSansSymbols2-Regular.ttf
%%DATADIR%%/fonts/NotoSansSyriacEastern-Regular.ttf
%%DATADIR%%/fonts/NotoSansSyriacEstrangela-Regular.ttf
%%DATADIR%%/fonts/NotoSansSyriacWestern-Regular.ttf
%%DATADIR%%/fonts/NotoSansTagalog-Regular.ttf
%%DATADIR%%/fonts/NotoSansTagbanwa-Regular.ttf
%%DATADIR%%/fonts/NotoSansTaiLe-Regular.ttf
%%DATADIR%%/fonts/NotoSansTaiTham-Regular.ttf
%%DATADIR%%/fonts/NotoSansTaiViet-Regular.ttf
%%DATADIR%%/fonts/NotoSansTamilUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansTeluguUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansThaana-Regular.ttf
%%DATADIR%%/fonts/NotoSansThaiUI-Regular.ttf
%%DATADIR%%/fonts/NotoSansTibetan-Regular.ttf
%%DATADIR%%/fonts/NotoSansTifinagh-Regular.ttf
%%DATADIR%%/fonts/NotoSansUgaritic-Regular.ttf
%%DATADIR%%/fonts/NotoSansVai-Regular.ttf
%%DATADIR%%/fonts/NotoSansYi-Regular.ttf
%%DATADIR%%/fonts/sort.py
%%DATADIR%%/global.py
%%DATADIR%%/sh_utils.py
%%DATADIR%%/syntax/ada95.syntax




MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
WRKSRC=		${WRKDIR}/${PORTNAME}

OPTIONS_DEFINE=	EXTRADOCS
EXTRADOCS_DESC=	Build and install cmds.doc
EXTRADOCS_USES=	groff
OPTIONS_DEFAULT=
OPTIONS_SUB=	yes

post-patch:
# Fix collisions with getline(3)
	@${REINPLACE_CMD} 's|[[:<:]]getline[[:>:]]|get_line|g' ${WRKSRC}/*.c ${WRKSRC}/*.h

post-patch-EXTRADOCS-off:
	@${REINPLACE_CMD} -E 's|^(all:.*) doc/cmds\.doc$$|\1|' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} 's|^CMDS.DOC = .*|CMDS.DOC=|' ${WRKSRC}/Makefile

.include <bsd.port.mk>




 #else /* MSFILESYSTEM */
 	tmpfd = open(tfname, O_CREAT|O_EXCL|O_BINARY|O_RDWR, S_IWRITE|S_IREAD);
 #endif /* MSFILESYSTEM */
@@ -1240,9 +1246,9 @@ int	Jr_Len;		/* length of Just Read Line */
 
 void
 #ifdef USE_PROTOTYPES
-getline proto((daddr addr, register char *buf))
+get_line proto((daddr addr, register char *buf))
 #else
-getline(addr, buf)
+get_line(addr, buf)
 daddr	addr;
 register char	*buf;
 #endif





DEBUG_MAKE_ARGS=	NE_DEBUG=1

post-patch:
	@${FIND} ${BUILD_WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
		's|"regex\.h"|<gnu/regex.h>|g'
	@${REINPLACE_CMD} -e \
		's|-O3|| ; \
		/[[:space:]]regex.o/d ; \
		 s|regex.h$$||g' ${BUILD_WRKSRC}/makefile
	@${REINPLACE_CMD} -e '/cp -pR/d' ${WRKSRC}/makefile

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ne
	${INSTALL_MAN} ${WRKSRC}/doc/ne.1 ${STAGEDIR}${MANPREFIX}/man/man1

Lines 1-6 Link Here

(-)editors/ne/files/patch-makefile (-3 / +3 lines)
1	--- makefile.orig 2018-10-24 23:53:08 UTC	1	--- makefile.orig 2019-10-02 12:47:26 UTC
2	+++ makefile	2	+++ makefile
3	@@ -54,17 +54,17 @@ install:	3	@@ -54,17 +54,16 @@ install:
4	mkdir -p $(DESTDIR)$(PREFIX)/bin	4	mkdir -p $(DESTDIR)$(PREFIX)/bin
5	mkdir -p $(DESTDIR)$(PREFIX)/share/ne/syntax	5	mkdir -p $(DESTDIR)$(PREFIX)/share/ne/syntax
6	mkdir -p $(DESTDIR)$(PREFIX)/share/ne/macros	6	mkdir -p $(DESTDIR)$(PREFIX)/share/ne/macros
Lines 14-21 Link Here
14	cp -p syntax/*.jsf $(DESTDIR)$(PREFIX)/share/ne/syntax	14	cp -p syntax/*.jsf $(DESTDIR)$(PREFIX)/share/ne/syntax
15	cp -p macros/* $(DESTDIR)$(PREFIX)/share/ne/macros	15	cp -p macros/* $(DESTDIR)$(PREFIX)/share/ne/macros
16	- cp -p doc/ne.1 $(DESTDIR)$(PREFIX)/share/man/man1	16	- cp -p doc/ne.1 $(DESTDIR)$(PREFIX)/share/man/man1
		17	- cp -pR doc/html doc/ne.txt doc/default.* README.md COPYING NEWS CHANGES $(DESTDIR)$(PREFIX)/share/doc/ne
17	+# cp -p doc/ne.1 $(DESTDIR)$(PREFIX)/share/man/man1	18	+# cp -p doc/ne.1 $(DESTDIR)$(PREFIX)/share/man/man1
18	cp -pR doc/html doc/ne.txt doc/default.* README.md COPYING NEWS CHANGES $(DESTDIR)$(PREFIX)/share/doc/ne
19	if [ -f doc/ne.pdf ]; then cp -p doc/ne.pdf $(DESTDIR)$(PREFIX)/share/doc/ne ; fi	19	if [ -f doc/ne.pdf ]; then cp -p doc/ne.pdf $(DESTDIR)$(PREFIX)/share/doc/ne ; fi
20	- cp -p doc/ne.info.gz $(DESTDIR)$(PREFIX)/share/info	20	- cp -p doc/ne.info.gz $(DESTDIR)$(PREFIX)/share/info
21	+# cp -p doc/ne.info.gz $(DESTDIR)$(PREFIX)/share/info	21	+# cp -p doc/ne.info.gz $(DESTDIR)$(PREFIX)/share/info





OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} -e \
		's|SOL_TCP|IPPROTO_TCP|g' ${WRKSRC}/hscutl.c
	@${REINPLACE_CMD} \
		-e '/herclin_LDADD =/s/$$/ libhercu.la libhercd.la/' \
		-e '/hercules_LDADD =/s/$$/ libhercu.la libhercd.la/' \
		${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e \
		'/^pkgdatadir/s|=.*|= $$(docdir)|' ${WRKSRC}/html/Makefile.in

.include <bsd.port.mk>




PLIST_FILES=	bin/xtrader \
		%%DATADIR%%/sample.xt

post-patch:
	${REINPLACE_CMD} -e 's|char|const char|' \
	    ${WRKSRC}/xtrader/src/Resource.cpp
	${REINPLACE_CMD} -e 's|static char|static const char|' \
	    ${WRKSRC}/xtrader/src/Resource.h
	${REINPLACE_CMD} -e 's|int(data)|(unsigned long)data|' \
	    ${WRKSRC}/xtrader/src/gui/XTrader.h
	${FIND} ${WRKSRC} -type f -name "*.cpp" -o -name "*.h" | ${XARGS} \
	   ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; s|fl_file_chooser|Fl_File_Chooser|g'

do-install:
	@${MKDIR} ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/sample.xt ${STAGEDIR}${DATADIR}




--- ./xtrader/Makefile.linux.orig	2004-10-22 00:21:08.000000000 +0200
+++ ./xtrader/Makefile.linux	2011-11-15 13:46:18.000000000 +0100
@@ -1,12 +1,12 @@
-COMP=			g++
-IFLAGS=			-I../util -Isrc -I/usr/local/include -I/usr/include/ptypes
-CFLAGS=			-march=i586 -O3 -Wall -Wno-format-y2k
-LFLAGS=			-L/usr/local/lib -lz -lfltk -lptypes  -lexpat -L/usr/X11R6/lib -lm -lXpm -lX11 -ldl -lpthread -lXft
-LFLAGS2=		-L/usr/local/lib -lfltk_ -lptypes -L/usr/X11R6/lib -lXpm -lX11 -ldl -lpthread
+COMP=			$(CXX)
+IFLAGS=			-I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes
+CFLAGS:=			$(CFLAGS) -Wno-format-y2k
+LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes -lexpat -lm -lXpm -lX11 -pthread -lXft -lcompat
+LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11 -pthread
 XTRADER=		xtrader
 XTRADER2=		xtrader.static
 
-all:	$(XTRADER) $(XTRADER2)
+all:	$(XTRADER)
 
 XTRADER_OBJ=../util/MH.o ../util/MHCSVFile.o \
 		../util/MHDate.o ../util/MHDayChart.o ../util/MHDC.o \




--- ./util/fl/Fl_Table.cpp.orig	2004-11-14 11:21:29.000000000 +0100
+++ ./util/fl/Fl_Table.cpp	2011-11-15 13:46:19.000000000 +0100
@@ -10,15 +10,15 @@
 #include "Fl_Select.h"
 #include "Fl_Find.h"
 #include "Fl_Defines.h"
-#include <FL/Fl.h>
-#include <FL/fl_ask.h>
-#include <FL/fl_draw.h>
-#include <FL/Fl_Choice.h>
-#include <FL/Fl_Check_Button.h>
-#include <FL/Fl_File_Chooser.h>
-#include <FL/Fl_Input.h>
-#include <FL/Fl_Scrollbar.h>
-#include <FL/fl_show_colormap.h>
+#include <FL/Fl.H>
+#include <FL/fl_ask.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Choice.H>
+#include <FL/Fl_Check_Button.H>
+#include <FL/Fl_File_Chooser.H>
+#include <FL/Fl_Input.H>
+#include <FL/Fl_Scrollbar.H>
+#include <FL/fl_show_colormap.H>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -962,7 +962,14 @@
     }
 }
 
-
+/**
+ * Callback for file chooser
+ */
+void tab_fc_callback(Fl_File_Chooser *fc, void *data)
+{
+	Fl_Table *t = static_cast<Fl_Table *>(data);
+	t->aData->value (fc->value(), t->aCurrRow, t->aCurrCol);
+}
 
 /**
 *  Start to edit a cell
@@ -983,9 +990,10 @@
 
     }
     else if (aData->editor_type (aCurrRow, aCurrCol, false) == FL_DLG_FILE_EDITOR) {
-        char* file = fl_file_chooser("Select File", "*", aData->value(aCurrRow, aCurrCol));
-        aData->value (file, aCurrRow, aCurrCol);
 
+        Fl_File_Chooser *fc = new Fl_File_Chooser("Select File", "*", Fl_File_Chooser::SINGLE, aData->value(aCurrRow, aCurrCol));
+        fc->callback(tab_fc_callback, this);
+        delete fc;
     }
     else {
         aEditWidget = aData->editor (aCurrRow, aCurrCol, force_custom);




--- ./util/fl/Fl_Table.h.orig	2004-11-14 11:21:34.000000000 +0100
+++ ./util/fl/Fl_Table.h	2011-11-15 13:46:19.000000000 +0100
@@ -12,12 +12,13 @@
     #define snprintf _snprintf
 #endif
 
-#include <FL/Fl_Group.h>
+#include <FL/Fl_Group.H>
 #include "Fl_Table_Data.h"
 
 class Fl_Input;
 class Fl_Scrollbar;
 class Fl_Find;
+class Fl_File_Chooser;
 
 enum {
     FL_DATA_CHANGE = 1000,
@@ -121,6 +122,8 @@
     void                    get_cell_pos (int& row, int& col, int& xpos, int& ypos, int& width, int& height);
     void                    start_edit_mode (bool force = false);
     void                    set_cursor(int row, int col) {move_cursor (row - aCurrRow, col - aCurrCol);}
+	 friend                  void tab_fc_callback(Fl_File_Chooser *fc, void *data);
+
 };
 
 #endif




--- xtrader/src/dlg/DownloadDlg.cpp.orig	2004-11-14 10:21:30 UTC
+++ xtrader/src/dlg/DownloadDlg.cpp
@@ -21,8 +21,8 @@
 #include "Enums.h"
 #include "Progress.h"

 #include <MHDate.h>
 #include <MHDebug.h>
 #include <MHFile.h>
@@ -164,13 +164,24 @@ void DownloadDlg::cb2 () {
 }
 
 

+	DownloadDlg *d = static_cast<DownloadDlg *>(data);
+	const char *file = fc->value();
+	if (file && *file) d->aFile->value(file);
+
+}
 
+}
+
 /**
 * Browse for result file name
 */

Lines 1-5 Link Here

(-)finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h (-3 / +3 lines)
1	--- ./xtrader/src/dlg/DownloadDlg.h.orig 2004-11-14 11:21:35.000000000 +0100	1	--- xtrader/src/dlg/DownloadDlg.h.orig 2004-11-14 10:21:35 UTC
2	+++ ./xtrader/src/dlg/DownloadDlg.h 2011-11-15 13:46:19.000000000 +0100	2	+++ xtrader/src/dlg/DownloadDlg.h
3	@@ -18,6 +18,7 @@	3	@@ -18,6 +18,7 @@
4	#include <download/BaseDownload.h>	4	#include <download/BaseDownload.h>
5		5
Lines 8-14 Link Here
8		8
9		9
10		10
11	@@ -51,6 +52,8 @@	11	@@ -51,6 +52,8 @@ class DownloadDlg : public Fl_Dialog { (private)
12	Fl_Button* aClose;	12	Fl_Button* aClose;
13		13
14	void download (int type, const char* start, const char* stop, int action);	14	void download (int type, const char* start, const char* stop, int action);

Lines 1-5 Link Here

(-)finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp (-3 / +3 lines)
1	--- ./xtrader/src/dlg/ExportDlg.cpp.orig 2004-11-14 11:21:29.000000000 +0100	1	--- xtrader/src/dlg/ExportDlg.cpp.orig 2004-11-14 10:21:29 UTC
2	+++ ./xtrader/src/dlg/ExportDlg.cpp 2011-11-15 13:46:19.000000000 +0100	2	+++ xtrader/src/dlg/ExportDlg.cpp
3	@@ -14,9 +14,9 @@	3	@@ -14,9 +14,9 @@
4	#include <help/Export.h>	4	#include <help/Export.h>
5	#include <MHDate.h>	5	#include <MHDate.h>
Lines 13-19 Link Here
13		13
14		14
15		15
16	@@ -134,13 +134,23 @@	16	@@ -134,13 +134,23 @@ void ExportDlg::cb2 () {
17	}	17	}
18		18
19		19

Lines 1-5 Link Here

(-)finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h (-3 / +3 lines)
1	--- ./xtrader/src/dlg/ExportDlg.h.orig 2004-11-14 11:21:35.000000000 +0100	1	--- xtrader/src/dlg/ExportDlg.h.orig 2004-11-14 10:21:35 UTC
2	+++ ./xtrader/src/dlg/ExportDlg.h 2011-11-15 13:46:19.000000000 +0100	2	+++ xtrader/src/dlg/ExportDlg.h
3	@@ -16,6 +16,7 @@	3	@@ -16,6 +16,7 @@
4	#include <FL/Fl_Button.H>	4	#include <FL/Fl_Button.H>
5		5
Lines 8-14 Link Here
8		8
9		9
10		10
11	@@ -45,6 +46,8 @@	11	@@ -45,6 +46,8 @@ class ExportDlg : public Fl_Dialog { (private)
12	Fl_Button* aBrowse;	12	Fl_Button* aBrowse;
13	Fl_Button* aHelp;	13	Fl_Button* aHelp;
14	Fl_Button* aClose;	14	Fl_Button* aClose;




--- xtrader/src/gui/ReportView.cpp.orig	2004-11-14 10:21:30 UTC
+++ xtrader/src/gui/ReportView.cpp
@@ -21,13 +21,13 @@
 #include "Resource.h"
 #include <MHDate.h>

 #include <fl/Fl_Table.h>
 #include <fl/Fl_Table_Data.h>
 
@@ -139,8 +139,16 @@ void ReportView::cbBrowser1 () {
 void ReportView::cbBrowser2 () {
 }
 
-
+/**
+ * Callback for file chooser
+ */

+	if (file && *file) r->Save (file);
+}
 
-
 /**
 *  Callback for buttons
 */
@@ -173,8 +181,9 @@ void ReportView::cbButton (Fl_Button* button) {
             Report* r = ((ReportData*)aTable->data())->report();
 
             if (r) {




--- xtrader/src/gui/XTrader.cpp.orig	2004-11-14 10:21:30 UTC
+++ xtrader/src/gui/XTrader.cpp
@@ -34,11 +34,11 @@
 #include "table/SecurityData.h"
 #include "table/SetData.h"

 #include <fl/Fl_Table_Data.h>
 #include <MHDate.h>
 #include <MHDebug.h>
@@ -249,7 +249,35 @@ void XTrader::cbClose () {
 }
 
 

+{
+	XTrader *xt = static_cast<XTrader *>(data);
+	const char *file = fc->value();
 
+	if (file && *file) {
+		MHDate date;
+		Import* import = 0;

+		delete import;
+	}
+}
+
 /**
 *  Callback for all menu items
 */
@@ -291,28 +319,11 @@ void XTrader::cbMenu (int id) {
                 break;
 
             case Resource::MENU_IMPORT: {




	@${MKDIR} ${WRKSRC}/archs/${OPSYS}
	@${CP} ${FILESDIR}/variables.GNU ${WRKSRC}/archs/${OPSYS}

post-patch:
	@${REINPLACE_CMD} -e \
		's|ARCH|OPSYS| ; \
		 s|:= -O|+=|' ${WRKSRC}/GNUmakefile
	@${REINPLACE_CMD} -e \
		's|SDL_main|main| ; \
		 s|../../data/|${DATADIR}/data/|' ${WRKSRC}/code/*.cpp

do-install:
	(cd ${WRKSRC}/Release/bin/${OPSYS} && ${INSTALL_PROGRAM} 54321 \
		${STAGEDIR}${PREFIX}/bin)




USE_GNOME=	gtk20
SHEBANG_FILES=	configure

CONFIGURE_ARGS=	--extra-inc=${LOCALBASE}/include \
		--extra-ld=${LOCALBASE}/lib \
		--prefix=${PREFIX}

INSTALL_TARGET=	install install-man

OPTIONS_DEFINE=		DOCS JOYSTICK
JOYSTICK_DESC=		Enable joystick support
JOYSTICK_BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto

DESKTOP_ENTRIES=	"eboard" \
			"Play chess" \
			"${PREFIX}/share/pixmaps/eboard.xpm" \
			"eboard" \
			"Game;BoardGame;GTK;" \
			true

.include <bsd.port.options.mk>





libc++ doesn't like "using namespace std" in C++11

network.cc:466:59: error: invalid operands to binary expression ('__bind<int &, sockaddr *, unsigned long>' and 'int')
  if (bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ ~~

--- network.cc.orig	2008-02-22 15:51:22 UTC
+++ network.cc
@@ -463,7 +463,7 @@ int IncomingConnection::createSocket() {
   sin.sin_addr.s_addr = INADDR_ANY;
   sin.sin_port = htons(Port);
     
-  if (bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
+  if (::bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
     snprintf(errorMessage,128,_("Unable to bind on port %d."),Port);
     return(-1);
   }




--- configure.orig	2020-01-27 14:05:04 UTC
+++ configure
@@ -1,12 +1,12 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 
 use IO::Handle;
 
 my $prefix      = "/usr/local";
 my $package     = "eboard";
 my $version     = "1.1.1";
-my $cxx         = "g++";
-my @cxxflags    = ("-O6");
+my $cxx         = "c++";
+my @cxxflags    = ("-O2 -pipe -fstack-protector-strong -fno-strict-aliasing  ");
 my @ldflags     = ("-lpthread");
 my @libs        = ();
 my $configh     = "config.h";
@@ -45,7 +45,7 @@ sub usage {
     print "\t--enable-debug       compile with gdb debugging info\n";
     print "\t--disable-nls        disable translation support\n";
 #    print "\t--disable-dgt        disable DGT board support\n";
-    print "\t--compiler=prog      use alternative compiler (default: g++)\n";
+    print "\t--compiler=prog      use alternative compiler (default: c++)\n";
     print "\t--extra-inc=list     additional include file search paths, separated by :\n";
     print "\t--extra-ld=list      additional library search paths, separated by :\n";
     print "\t--extra-libs=list    additional libraries separated by :\n";
@@ -104,7 +104,7 @@ sub run_cmd {
 }
 
 sub cplusplus_lang {
-    my @compilers = ( $cxx, 'g++', 'c++' );
+    my @compilers = ( $cxx, 'c++9', 'c++' );
     my $x;
     my $program = <<EOF;
 #include <list>




--- cimg.cc
+++ cimg.cc
@@ -94,11 +95,11 @@
       ct == PNG_COLOR_TYPE_GRAY_ALPHA)
     png_set_gray_to_rgb(pngp);
 
-  alloc(pngp->width,pngp->height);
+  alloc(width,height);
   if (!ok) { fclose(f); return; }
   ok = 0;
 
-  for(i=0;i<pngp->height;i++) {
+  for(i=0;i<height;i++) {
     png_read_row(pngp, (png_bytep) (&data[i*rowlen]), NULL);
   }
 

Lines 1-6 Link Here

(-)games/eboard/files/patch-main.cc (-3 / +3 lines)
1	--- main.cc.orig Mon Jan 22 18:57:40 2007	1	--- main.cc.orig 2020-01-27 14:05:04 UTC
2	+++ main.cc Tue Jan 30 21:07:51 2007	2	+++ main.cc
3	@@ -139,7 +139,7 @@	3	@@ -139,7 +139,7 @@ void openJoystick(MainWindow *mw) {
4	char devname[64];	4	char devname[64];
5		5
6	for(i=0;i<10;i++) {	6	for(i=0;i<10;i++) {

Lines 1-6 Link Here

(-)games/eboard/files/patch-network.cc (-6 / +15 lines)
1	--- network.cc.orig 2008-02-22 16:51:22.000000000 +0100	1	--- network.cc.orig 2020-01-27 14:05:04 UTC
2	+++ network.cc 2008-12-29 11:24:10.000000000 +0100	2	+++ network.cc
3	@@ -566,6 +566,7 @@	3	@@ -463,7 +463,7 @@ int IncomingConnection::createSocket() {
		4	sin.sin_addr.s_addr = INADDR_ANY;
		5	sin.sin_port = htons(Port);
		6
		7	- if (bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
		8	+ if (::bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
		9	snprintf(errorMessage,128,_("Unable to bind on port %d."),Port);
		10	return(-1);
		11	}
		12	@@ -566,6 +566,7 @@ PipeConnection::PipeConnection(int _pin,int _pout) {
4	strcpy(HostName,"local pipe");	13	strcpy(HostName,"local pipe");
5	snprintf(HostAddress,96,"pipe[%d,%d]",pin,pout);	14	snprintf(HostAddress,96,"pipe[%d,%d]",pin,pout);
6	Quiet=0;	15	Quiet=0;
Lines 8-14 Link Here
8	MaxWaitTime = 60000.0; // 1 minute	17	MaxWaitTime = 60000.0; // 1 minute
9	}	18	}
10		19
11	@@ -577,6 +578,7 @@	20	@@ -577,6 +578,7 @@ void PipeConnection::init() {
12	strcpy(HostAddress,"unknown");	21	strcpy(HostAddress,"unknown");
13	memset(HelperBin,0,512);	22	memset(HelperBin,0,512);
14	Quiet=0;	23	Quiet=0;
Lines 16-22 Link Here
16	handshake.erase();	25	handshake.erase();
17	MaxWaitTime = 60000.0; // 1 minute	26	MaxWaitTime = 60000.0; // 1 minute
18	}	27	}
19	@@ -612,6 +614,25 @@	28	@@ -612,6 +614,25 @@ PipeConnection::PipeConnection(char *host,int port,
20	Port=port;	29	Port=port;
21	g_strlcpy(HostName,host,128);	30	g_strlcpy(HostName,host,128);
22		31
Lines 42-48 Link Here
42	// build helper path	51	// build helper path
43	if (helpersuffix)	52	if (helpersuffix)
44	snprintf(z,256,"%s.%s",helperbin,helpersuffix);	53	snprintf(z,256,"%s.%s",helperbin,helpersuffix);
45	@@ -728,7 +749,10 @@	54	@@ -728,7 +749,10 @@ int PipeConnection::open() {
46	dup2(1,2);	55	dup2(1,2);
47		56
48	setpgid(getpid(),0); // to broadcast SIGKILL later	57	setpgid(getpid(),0); // to broadcast SIGKILL later

Lines 1-6 Link Here

(-)games/eboard/files/patch-network.h (-3 / +3 lines)
1	--- network.h.orig Mon Jan 15 23:59:58 2007	1	--- network.h.orig 2020-01-27 14:05:04 UTC
2	+++ network.h Wed Jan 17 19:39:10 2007	2	+++ network.h
3	@@ -235,6 +235,7 @@	3	@@ -235,6 +235,7 @@ class PipeConnection : public BufferedConnection,
4	int pid;	4	int pid;
5	int toid; // timeout	5	int toid; // timeout
6	string handshake;	6	string handshake;

Lines 1-4 Link Here

(-)games/eboard/files/patch-ntext.cc (-2 / +2 lines)
1	--- ntext.cc.orig 2008-02-22 15:51:22 UTC	1	--- ntext.cc.orig 2020-01-27 14:05:04 UTC
2	+++ ntext.cc	2	+++ ntext.cc
3	@@ -237,7 +237,7 @@ void NText::setBG(int c) {	3	@@ -237,7 +237,7 @@ void NText::setBG(int c) {
4	void NText::append(const char *text, int len, int color) {	4	void NText::append(const char *text, int len, int color) {
Lines 9-15 Link Here
9		9
10	if (len < 0) {	10	if (len < 0) {
11	discardExcess();	11	discardExcess();
12	@@ -246,10 +246,8 @@ void NText::append(const char *text, int	12	@@ -246,10 +246,8 @@ void NText::append(const char *text, int len, int colo
13		13
14	p = strchr(text, '\n');	14	p = strchr(text, '\n');
15	if (p!=NULL) {	15	if (p!=NULL) {

Lines 17-23 BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib Link Here

(-)games/gracer/Makefile (-1 / +1 lines)
17	LIB_DEPENDS= libgif.so:graphics/giflib \	17	LIB_DEPENDS= libgif.so:graphics/giflib \
18	libpng.so:graphics/png	18	libpng.so:graphics/png
19		19
20	USES= gl gmake jpeg localbase perl5 tcl	20	USES= gl gmake jpeg localbase perl5 tcl xorg
21	USE_GL= glut	21	USE_GL= glut
22	USE_PERL5= build	22	USE_PERL5= build
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes

Removed Link Here

(-)games/gracer/files/patch-ab (-10 lines)
1	Index: src/glhash.h
2	@@ -709,6 +709,8 @@
3	{"all_attrib_bits", GL_ALL_ATTRIB_BITS},
4	{"client_pixel_store_bit", GL_CLIENT_PIXEL_STORE_BIT},
5	{"client_vertex_array_bit", GL_CLIENT_VERTEX_ARRAY_BIT},
6	+#ifdef GL_CLIENT_ALL_ATTRIB_BITS
7	{"client_all_attrib_bits", GL_CLIENT_ALL_ATTRIB_BITS},
8	+#endif
9	{NULL, GL_NONE},
10	};




--- ac2scene/ac2scene.c.orig	Fri Apr  1 18:36:19 2005
+++ ac2scene/ac2scene.c	Fri Apr  1 18:36:48 2005
@@ -160,8 +160,6 @@
       return 1;
     }
     break;
-
-  default:
   }
 
   return 0;
@@ -232,8 +230,6 @@
       return 1;
     }
     break;
-
-  default:
   }
 
   return 0;
@@ -315,7 +311,6 @@
       return 1;
     }
     break;
-  default:
   }
 
   return 0;
@@ -397,8 +392,6 @@
       hints[i]->state = GR_SCENE_OPT_QUAD_STRIP_START;
       hints[i]->surf->elements = gr_new (GrSElement, num_quads * 2 + 2);
       break;
-
-    default:
     }
   }
 




--- src/glbind.c.orig	Wed May  4 18:45:48 2005
+++ src/glbind.c	Wed May  4 18:46:20 2005
@@ -2147,8 +2147,6 @@
     TCL_CHECK(Tcl_GetIntFromObj(interp, objv[2], &i), ERROR);
     GL_CHECK(glLightModeli (pname, i));
     return 3;
-
-  default:
   }
 
 ERROR:
@@ -2886,8 +2884,6 @@
     }
     GL_CHECK(glTexEnvfv (GL_TEXTURE_ENV, pname, param));
     return 6;
-
-  default:
   }
 
 ERROR:
@@ -3078,8 +3074,6 @@
     param[0] = d;
     GL_CHECK(glTexParameterf (target, pname, param[0]));
     return 4;
-
-  default:
   }
 
 ERROR:




--- src/glutwidgets.c.orig	Wed May  4 18:47:07 2005
+++ src/glutwidgets.c	Wed May  4 18:48:56 2005
@@ -254,7 +254,6 @@
 	widget->x -= (width - screen_width) / 2;
 	widget->width += (width - screen_width);
 	break;
-      default:
       }
       switch (widget->anchor & GR_VERTICAL_MASK) {
       case GR_BOTTOM:
@@ -267,7 +266,6 @@
 	widget->y -= (height - screen_height) / 2;
 	widget->height += (width - screen_height);
 	break;
-      default:
       }
       glut_widget_calc_bbox (widget);
     }
@@ -325,8 +323,6 @@
 	glut_widget_set_focus (glut_next_focus_widget (NULL));
       }
       break;
-
-    default:
     }
   }
 
@@ -502,8 +498,6 @@
 	glut_widget_set_focus (widget);
       }
       break;
-
-    default:
     }
   }
 
@@ -1297,8 +1291,6 @@
     }
     glut_post_redisplay ();
     break;
-
-  default:
   }
 }
 
@@ -1569,8 +1561,6 @@
     case GR_RIGHT:
       width = glut_label_width (obj) / 2;
       break;
-
-    default:
     }
 
     glColor4fv (widget->fg_color[GR_STATE_NORMAL]);

Removed Link Here

(-)games/gracer/files/patch-gr_memory.h (-11 lines)
1	--- common/gr_memory.h.orig Wed May 4 18:49:43 2005
2	+++ common/gr_memory.h Wed May 4 18:49:45 2005
3	@@ -64,7 +64,7 @@
4	void gr_dlist_free (GrDList *list);
5
6	#define gr_FOREACH(l,p) \
7	- for (; (l) != NULL && ((void *)(p) = (l)->data, 1); (l) = (l)->next)
8	+ for (; (l) != NULL && ((p) = (l)->data, 1); (l) = (l)->next)
9
10	void gr_ref_incr (GrRef *ref);
11	void gr_ref_decr (GrRef *ref);




--- common/gr_texture.c.orig	2000-03-01 04:27:18 UTC
+++ common/gr_texture.c
@@ -274,7 +274,11 @@ read_gif_file (GrTexture *texture, char 
   int index;
   int width, height;
 
+#if GIFLIB_MAJOR >= 5
+  file = DGifOpenFileName (filename, NULL);
+#else
   file = DGifOpenFileName (filename);
+#endif
   if (!file)
     return -1;
 
@@ -419,7 +423,7 @@ read_png_file (GrTexture *texture, char 
   if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) {
     goto ERROR;
   }
-  if (!png_check_sig (header, PNG_BYTES_TO_CHECK)) {
+  if (png_sig_cmp (header, 0, PNG_BYTES_TO_CHECK)) {
     goto ERROR;
   }
 
@@ -431,7 +435,7 @@ read_png_file (GrTexture *texture, char 
   if (!info_ptr) {
     goto ERROR;
   }
-  if (setjmp (png_ptr->jmpbuf)) {
+  if (setjmp (png_jmpbuf(png_ptr))) {
     goto ERROR;
   }
   png_init_io (png_ptr, file);

Removed Link Here

(-)games/gracer/files/patch-gr_world.c (-11 lines)
1	--- src/gr_world.c.orig Wed May 4 18:49:13 2005
2	+++ src/gr_world.c Wed May 4 18:49:24 2005
3	@@ -167,8 +167,6 @@
4	case GR_CLINE_B_TO_A:
5	vehicle->lap_count --;
6	break;
7	-
8	- default:
9	}
10
11	tlist = entry->triggers;




--- src/glbind.c.orig	2020-01-28 12:54:24 UTC
+++ src/glbind.c
@@ -20,6 +20,7 @@
  */
 

 #include <GL/gl.h>
 #include <GL/glut.h>
 #include <string.h>
@@ -2146,8 +2147,6 @@ gl_subcmd_lightmodel (Tcl_Interp *interp, int objc, Tc
     TCL_CHECK(Tcl_GetIntFromObj(interp, objv[2], &i), ERROR);
     GL_CHECK(glLightModeli (pname, i));
     return 3;
-
-  default:
   }
 
 ERROR:
@@ -2885,8 +2884,6 @@ gl_subcmd_texenv (Tcl_Interp *interp, int objc, Tcl_Ob
     }
     GL_CHECK(glTexEnvfv (GL_TEXTURE_ENV, pname, param));
     return 6;
-
-  default:
   }
 
 ERROR:
@@ -3077,8 +3074,6 @@ gl_subcmd_texparameter (Tcl_Interp *interp, int objc, 
     param[0] = d;
     GL_CHECK(glTexParameterf (target, pname, param[0]));
     return 4;
-
-  default:
   }
 
 ERROR:

Lines 11-17 MASTER_SITES= http://www.srv.net/~kth/ \ Link Here

(-)games/ladder/Makefile (-1 / +1 lines)
11	DISTNAME= ${PORTNAME}	11	DISTNAME= ${PORTNAME}
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= The old "ladder" game	14	COMMENT= Historical "ladder" game
15		15
16	RESTRICTED= possible copyright problems ?	16	RESTRICTED= possible copyright problems ?
17		17




--- Makefile.orig	2020-01-28 12:55:18 UTC
+++ Makefile
@@ -2,12 +2,13 @@ TARGET	= ladder
 SRCS	= ladder.c lplay.c ltime.c lscore.c lscreens.c
 OBJS	= ladder.o lplay.o ltime.o lscore.o lscreens.o

 
 .SUFFIXES:	.o .c .m4
 
@@ -21,6 +22,14 @@ $(TARGET):	$(OBJS)
 	$(CC) -o $(TARGET) $(LDFLAGS) $(OBJS) $(LIBS)
 
 $(OBJS):	ladder.h
+
+clean:
+	-$(RM)	$(OBJS) $(TARGET) *.core
+

+
+install:
+	$(BSD_INSTALL_PROGRAM) ladder $(DESTDIR)${PREFIX}/bin
 
 # ladder.c:	ladder.m4
 
 # lscreens.c:	lscreens.m4

Removed Link Here

(-)games/ladder/files/patch-ladder.c_1 (-11 lines)
1	--- ladder.c.org Wed Feb 18 19:26:47 1998
2	+++ ladder.c Wed Feb 18 19:33:09 1998
3	@@ -82,7 +82,7 @@
4	mvaddstr(r,LM,"Version: n/a");
5	mvaddstr(r,RM0,"Up = k\|8 Down = j\|2 Left = h\|4 Right = l\|6");
6	r++;
7	- mvprintw(r,LM,"Terminal: %s",termname());
8	+ mvprintw(r,LM,"Terminal: %s",getenv("TERM"));
9	mvaddstr(r,RM0,"Jump = Space Stop = Other");
10	r++;
11	mvprintw(r,LM,"Play Speed: %d",speed + 1);

Removed Link Here

(-)games/ladder/files/patch-ladder.c_2 (-11 lines)
1	--- ladder.c.org Mon Oct 27 00:07:23 1997
2	+++ ladder.c Wed Feb 18 22:33:55 1998
3	@@ -14,7 +14,7 @@
4	char *d = t;
5	int i;
6
7	- for( ; s; s++ )
8	+ for( ; *s; s++ )
9	if( *s & 0200 )
10	for( i = 210 - (unsigned char)*s; i; i-- )
11	*d++ = ' ';

Lines 1-5 Link Here

(-)games/ladder/files/patch-ladder.h (-2 / +2 lines)
1	--- ladder.h.org Wed Feb 18 19:19:51 1998	1	--- ladder.h.orig 2020-01-28 12:55:18 UTC
2	+++ ladder.h Wed Feb 18 19:26:29 1998	2	+++ ladder.h
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#include <ncurses/curses.h>	4	-#include <ncurses/curses.h>
5	+#include <ncurses.h>	5	+#include <ncurses.h>




--- lplay.c.orig	2020-01-28 12:55:18 UTC
+++ lplay.c
@@ -54,7 +54,7 @@ static void ldscreen(void)
         mvaddstr(row,0,t);
 
         /* find points of release */

         {
             rel->row = row;
             rel->col = s - t;
@@ -67,7 +67,7 @@ static void ldscreen(void)
 
     /* find lad */
     for( row = 0; row < DIMROW; row++ ) 

         {
             /* nasty, check for CLAD's surrounded by CFREEs */
             if( s[-1] != CFREE || s[1] != CFREE )
@@ -433,6 +433,8 @@ static RESULT drv_lad(void)
                     else
                         dir = STOP;
                     break;




--- lscore.c.orig	2020-01-28 12:55:18 UTC
+++ lscore.c
@@ -21,7 +21,7 @@ static void lock_score(void)
     FILE *lfp;
 
     for( i = 3; i; i-- )

         {
             fclose(lfp);
             sleep(2);
@@ -47,7 +47,7 @@ static void read_scores(void)
 
     lock_score();
     memset(scores,0,sizeof(scores));

     {
         for( scp = scores; scp < &scores[MAXSCORE]; scp++ )
             if( fscanf(sfp,"%d%d%d%d",
@@ -67,8 +67,8 @@ static void percolate(void)
     SCORE *scp;
     for( scp = &scores[MAXSCORE]; scp > scores; scp-- )
         if( scp[0].score >  scp[-1].score ||

         {
             SCORE tmp = scp[0];
             scp[0] = scp[-1];
@@ -113,7 +113,7 @@ void prt_score(int r, int c)
         if( scores[i].score )
         {
             printw("%5d00  %2d  ",scores[i].score,scores[i].level + 1);

Lines 1-5 Link Here

(-)games/ladder/files/patch-ltime.c (-2 / +2 lines)
1	--- ltime.c.org Mon Oct 27 00:07:24 1997	1	--- ltime.c.orig 2020-01-28 12:55:18 UTC
2	+++ ltime.c Wed Feb 18 22:33:56 1998	2	+++ ltime.c
3	@@ -2,6 +2,7 @@	3	@@ -2,6 +2,7 @@
4	#include <sys/types.h>	4	#include <sys/types.h>
5	#include <sys/times.h>	5	#include <sys/times.h>

Lines 1-9 Link Here

(-)games/minecraft-server/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= minecraft-server	3	PORTNAME= minecraft-server
4	PORTVERSION= 1.16.1	4	PORTVERSION= 1.16.2
5	CATEGORIES= games java	5	CATEGORIES= games java
6	MASTER_SITES= https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/	6	MASTER_SITES= https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/
7	DISTFILES= server.jar	7	DISTFILES= server.jar
8	DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}	8	DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
9	EXTRACT_ONLY=	9	EXTRACT_ONLY=

Lines 1-3 Link Here

(-)games/minecraft-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1595102862	1	TIMESTAMP = 1599202877
2	SHA256 (minecraft-server-1.16.1/server.jar) = 2782d547724bc3ffc0ef6e97b2790e75c1df89241f9d4645b58c706f5e6c935b	2	SHA256 (minecraft-server-1.16.2/server.jar) = 2902ed3ff84e4f810a2c0620c6b6df9c3ef8488b272c61274d5eac2433876f39
3	SIZE (minecraft-server-1.16.1/server.jar) = 37968964	3	SIZE (minecraft-server-1.16.2/server.jar) = 37942337

Lines 19-27 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} Link Here

(-)graphics/aview/Makefile (-5 lines)
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --with-x=no	20	CONFIGURE_ARGS= --with-x=no
21		21
22	post-patch:
23	@${REINPLACE_CMD} -e 's\|/bash\|/sh\|g' ${WRKSRC}/asciiview
24	@${FIND} ${WRKSRC} -name '*.[ch]' \| ${XARGS} ${REINPLACE_CMD} -e \
25	's\|<malloc.h>\|<stdlib.h>\|g'
26
27	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 35-45 INFO= gauche-gl-refe gauche-gl-refj Link Here

(-)graphics/gauche-gl/Makefile (-5 lines)
35		35
36	OPTIONS_DEFINE= DOCS EXAMPLES	36	OPTIONS_DEFINE= DOCS EXAMPLES
37		37
38	post-patch:
39	.for i in configure src/gauche-gl.c src/gauche-gl.h src/glut-lib.stub
40	@${REINPLACE_CMD} -e '/glut.h/s\|GLUT\|GL\|' ${WRKSRC}/${i}
41	.endfor
42
43	do-install:	38	do-install:
44	.for i in src lib	39	.for i in src lib
45	@(cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \	40	@(cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \





OPTIONS_DEFINE=	DOCS EXAMPLES

post-patch:
	@${REINPLACE_CMD} \
		-e 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' \
		-e 's/^#ifdef HAVE_LIBFREETYPE/#ifndef NO_LIBFREETYPE/' \
			${WRKSRC}/*.[ch]
# ft_samp.c and gdc_samp?.c miss #include "gdcpie.h"
	@${REINPLACE_CMD} \
		-e 's/^#include "gdc\.h"/#include "gdcpie.h"/' \
			${WRKSRC}/ft_samp.c \
			${WRKSRC}/gdc_samp?.c
# gdc_pie_samp.c misses #include "gdchart.h"
	@${REINPLACE_CMD} \
		-e 's/^#include "gdc\.h"/#include "gdchart.h"/' \
			${WRKSRC}/gdc_pie_samp.c

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}





OPTIMIZED_CFLAGS_CFLAGS=	-O3

post-patch:
	@${FIND} ${WRKSRC} -name Makefile.am \
		-exec ${REINPLACE_CMD} -e "s|; make|; ${MAKE_CMD}|" {} \;
	@${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \
		${WRKSRC}/configure.in

do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/${GIMP_PLUGIN_DIR}/
	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \




--- configure.in.orig	2003-01-30 21:29:29 UTC
+++ configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(README)
-
-AM_INIT_AUTOMAKE(refocus, 0.9.0)
+AC_INIT([refocus],[0.9.0])
+AC_CONFIG_SRCDIR(README)
+AM_INIT_AUTOMAKE
 
-AM_INIT_AUTOMAKE(refocus, 0.9.0)
-
 AC_PROG_CC
 AC_CHECK_PROG(GCC3, gcc3, gcc3)
 
@@ -12,31 +12,32 @@ if test "$GCC3" ; then
    AC_MSG_RESULT([using $CC as compiler])
 fi
 

 AM_PATH_GTK_2_0(2.0.0)
 AM_PATH_GLIB_2_0(2.0.0)
 
@@ -96,15 +97,9 @@ if test x$enable_debug = xyes ; then
    AC_DEFINE(PREVIEW_DEBUG)
 fi
 

Removed Link Here

(-)graphics/gimp-refocus-plugin/files/patch-lib__Makefile.am (-7 lines)
1	--- lib/Makefile.am.orig 2003-01-30 19:29:52.000000000 -0200
2	+++ lib/Makefile.am 2014-04-01 22:13:34.000000000 -0300
3	@@ -1,4 +1,3 @@
4	-CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
5
6
7	noinst_LIBRARIES = liblapack.a libatlas.a libcblas.a




--- src/Makefile.am.orig	2003-01-30 19:30:18.000000000 -0200
+++ src/Makefile.am	2014-04-01 22:12:45.000000000 -0300
@@ -1,22 +1,28 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES=@GTK_CFLAGS@ @GIMP_CFLAGS@ -I @LAPACK_INCLUDE_DIR@
+INCLUDES=@GTK_CFLAGS@ @GIMP_CFLAGS@ @LAPACK_INCLUDES@
 
 bin_PROGRAMS = refocus
 noinst_PROGRAMS = test-matrix
 
-ldadd_atlas=-L@LAPACK_LIB_DIR@ -llapack -lcblas -latlas
+ldadd_atlas=@LAPACK_LIBS@
 
 noinst_HEADERS=bdclosure.h refocus.h matrix.h tilebuf.h conv.h fwlapack.h gimppreview.h prevman.h util.h
 EXTRA_DIST = dummy-plugin.c
 
 refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c
-refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas}
-refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a
+refocus_LDADD = -lm ${ldadd_atlas} @GIMP_LIBS@
+if HAVE_ATLAS
+else
+refocus_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
+endif
 
 test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
 test_matrix_LDADD = -lm ${ldadd_atlas} @GLIB_LIBS@
-test_matrix_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a
+if HAVE_ATLAS
+else
+test_matrix_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
+endif
 
 install-bin: refocus
 	@if test "x@GIMPTOOL@" = "x" ; then \
@@ -36,8 +42,8 @@
 		@GIMPTOOL@ --install-admin-bin refocus ; \
 	fi
 
-@LAPACK_LIB_DIR@/liblapack.a:
-	cd @LAPACK_LIB_DIR@; make
+@BUNDLED_LAPACK_LIB_DIR@/liblapack.a:
+	cd @BUNDLED_LAPACK_LIB_DIR@; gmake
 
 %.s: %.c
 	${CC} ${CFLAGS} -S $< -o $@




--- src/conv.c	2014-03-27 20:00:17.000000000 -0300
+++ src/conv.c	2014-03-27 20:00:58.000000000 -0300
@@ -421,13 +421,19 @@
   gint x, buf_start_y, total_tiles, tile_nr = 0;
   /* Will be false when progress_update tells us that the data is no longer needed */
   gboolean ok = TRUE;
-
+  /*
+    tile_height()                 [util.c]
+    tile_width()                  [util.c]
+   */
   initialize_buf (&buf, source, mat_size / 2, sx, sy, width, height,
                   boundary_type);
   total_tiles = (1 + floor ((buf.x + buf.width - 1) / tile_width ())
                  - floor ((buf.x) / tile_width ())) *
     (1 + floor ((buf.y_limit - 1) / tile_height ())
      - floor ((buf.y) / tile_height ()));
+#ifdef RLXTEST
+  printf("convolve_image: total_tiles %d\n",total_tiles);
+#endif
 
   buf_start_y = buf.y;
   while (ok && shift_buf (&buf, source))
@@ -437,6 +443,10 @@
         {
           const gint ncolors = source->bpp - source->has_alpha;
           GimpTile *tile = tile_sink_get_tile (sink, x, buf.y);
+#ifdef RLXTEST
+          printf("convolve_image: x %d, y %d, tile->eheight %d\n",
+                 x, buf.y, tile->eheight);
+#endif
           convolve_tile (tile, pixpos_in_buf (&buf, x, buf.y), buf.row_stride,
                          ncolors, sink->bpp, mat->data, mat_size);
           tile_sink_tile_unref (sink, tile);




--- src/gimppreview.c	2014-03-27 20:00:17.000000000 -0300
+++ src/gimppreview.c	2014-03-27 20:00:38.000000000 -0300
@@ -36,18 +36,18 @@
 #include "gimppreview.h"
 
 
-static void gimp_preview_init (GimpPreview * preview);
-static void gimp_preview_class_init (GimpPreviewClass * klass);
+static void gimp_preview_init (myGimpPreview * preview);
+static void gimp_preview_class_init (myGimpPreviewClass * klass);
 
 static void gimp_preview_plus_callback (GtkWidget * widget, gpointer data);
 static void gimp_preview_minus_callback (GtkWidget * widget, gpointer data);
 static gint gimp_preview_event (GtkWidget * widget, GdkEvent * event,
                                 gpointer data);
-static void gimp_preview_recompute_sizes (GimpPreview * preview,
+static void gimp_preview_recompute_sizes (myGimpPreview * preview,
                                           gdouble newscale);
-static void gimp_preview_update_preview (GimpPreview * preview);
+static void gimp_preview_update_preview (myGimpPreview * preview);
 
-static void gimp_preview_image_set_size (GimpPreview * preview, gint width,
+static void gimp_preview_image_set_size (myGimpPreview * preview, gint width,
                                          gint height);
 static void gimp_preview_size_request (GtkWidget * widget,
                                        GtkRequisition * requisition);
@@ -58,7 +58,7 @@
                                  GtkCallback callback,
                                  gpointer callback_data);
 gboolean gimp_preview_update_preview_idle_fun (gpointer data);
-void gimp_preview_schedule_update (GimpPreview * preview);
+void gimp_preview_schedule_update (myGimpPreview * preview);
 
 #define PROGRESS_BAR_HEIGHT (10)
 #define PREVIEW_SIZE (100)
@@ -94,11 +94,11 @@
 
 
 /*
- * Apps which use a GimpPreview widget should not be accessing the private
+ * Apps which use a myGimpPreview widget should not be accessing the private
  * data!
  */
 #define PREVIEW_DATA(preview) \
-        ((GimpPreviewData*)(GIMP_PREVIEW (preview)->private_data))
+        ((myGimpPreviewData*)(MY_GIMP_PREVIEW (preview)->private_data))
 
 typedef struct
 {
@@ -126,7 +126,7 @@
   GtkWidget *image;
   GtkWidget *progress_bar;
 }
-GimpPreviewData;
+myGimpPreviewData;
 
 
 /* Convert coordinate in preview space to image coordinates */
@@ -155,20 +155,20 @@
   if (!preview_type)
     {
       GTypeInfo preview_info = {
-        sizeof (GimpPreviewClass),
+        sizeof (myGimpPreviewClass),
         (GBaseInitFunc) NULL,
         (GBaseFinalizeFunc) NULL,
         (GClassInitFunc) gimp_preview_class_init,
         (GClassFinalizeFunc) NULL,
         (gconstpointer) NULL,   /* class_data */
-        sizeof (GimpPreview),
+        sizeof (myGimpPreview),
         0,                      /* n_preallocs */
         (GInstanceInitFunc) gimp_preview_init,
         (GTypeValueTable *) NULL /* value_table */
       };
 
       preview_type =
-        g_type_register_static (GTK_TYPE_CONTAINER, "GimpPreview",
+        g_type_register_static (GTK_TYPE_CONTAINER, "myGimpPreview",
                                 &preview_info, 0);
     }
 
@@ -181,7 +181,7 @@
  * by GTK's internal mechanisms.
  */
 static void
-gimp_preview_class_init (GimpPreviewClass * klass)
+gimp_preview_class_init (myGimpPreviewClass * klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
@@ -190,7 +190,7 @@
     g_signal_new ("update_preview",
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (GimpPreviewClass, update_preview),
+                  G_STRUCT_OFFSET (myGimpPreviewClass, update_preview),
                   NULL,
                   NULL,
                   g_cclosure_marshal_VOID__POINTER,
@@ -200,7 +200,7 @@
     g_signal_new ("preview_changed",
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (GimpPreviewClass, preview_changed),
+                  G_STRUCT_OFFSET (myGimpPreviewClass, preview_changed),
                   NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
   klass->update_preview = NULL;
@@ -212,7 +212,7 @@
 
 
 void
-gimp_preview_set_scale_amount(GimpPreview *preview, gdouble scale_amount)
+gimp_preview_set_scale_amount(myGimpPreview *preview, gdouble scale_amount)
 {
   /*
    * If the caller wants to set the scale amount, let them do so.
@@ -269,7 +269,7 @@
  * by GTK's internal mechanisms.
  */
 static void
-gimp_preview_init (GimpPreview * preview)
+gimp_preview_init (myGimpPreview * preview)
 {
   gchar buffer[10];
 
@@ -277,7 +277,7 @@
   GTK_WIDGET_SET_FLAGS (preview, GTK_NO_WINDOW);
   GTK_CONTAINER (preview)->resize_mode = GTK_RESIZE_IMMEDIATE;
 
-  preview->private_data = g_malloc0 (sizeof (GimpPreviewData));
+  preview->private_data = g_malloc0 (sizeof (myGimpPreviewData));
 
 
   PREVIEW_DATA (preview)->label = gtk_label_new ("");
@@ -307,7 +307,7 @@
 gimp_preview_new_with_args (GimpDrawable * drawable, gint cb_preview_size,
                             gdouble cb_scale_amount, gint cb_allow_scale)
 {
-  GimpPreview *preview;
+  myGimpPreview *preview;
   GtkWidget *frame;
   GtkWidget *hbox;
   GtkWidget *event_box;
@@ -337,14 +337,14 @@
 
 
   /* Now allocate the actual preview window. */
-  preview = GIMP_PREVIEW (g_object_new (gimp_preview_get_type (), NULL));
+  preview = MY_GIMP_PREVIEW (g_object_new (gimp_preview_get_type (), NULL));
 
   /* Set the scale amount. */
   gimp_preview_set_scale_amount(preview, cb_scale_amount);
 
   /* Save the drawable info. */
   preview->drawable = drawable;
-  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->id);
+  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
 
   /* Calculate our preview size. */
   if (preview_size == PREVIEW_FIXED_SIZE)
@@ -352,8 +352,8 @@
       preview_width = i2p (drawable->width, preview->scale);
       preview_height = i2p (drawable->height, preview->scale);
 
-      GIMP_PREVIEW (preview)->width = preview_width;
-      GIMP_PREVIEW (preview)->height = preview_height;
+      MY_GIMP_PREVIEW (preview)->width = preview_width;
+      MY_GIMP_PREVIEW (preview)->height = preview_height;
     }
   else
     {
@@ -454,7 +454,7 @@
 static void
 gimp_preview_size_request (GtkWidget * widget, GtkRequisition * requisition)
 {
-  GimpPreview *preview = GIMP_PREVIEW (widget);
+  myGimpPreview *preview = MY_GIMP_PREVIEW (widget);
   GtkRequisition resize_box_requisition;
 
 #ifdef PREVIEW_DEBUG
@@ -478,7 +478,7 @@
 static void
 gimp_preview_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
 {
-  GimpPreview *preview = GIMP_PREVIEW (widget);
+  myGimpPreview *preview = MY_GIMP_PREVIEW (widget);
   GtkAllocation resize_box_allocation, progress_bar_allocation,
     event_box_allocation;
   GtkRequisition resize_box_requisition;
@@ -543,7 +543,7 @@
                      gboolean include_internals,
                      GtkCallback callback, gpointer callback_data)
 {
-  GimpPreview *preview = GIMP_PREVIEW (container);
+  myGimpPreview *preview = MY_GIMP_PREVIEW (container);
 
   if (PREVIEW_DATA (preview)->resize_box)
     {
@@ -564,7 +564,7 @@
  * Plug-ins call this to do an update of the preview area.
  */
 void
-gimp_preview_update (GimpPreview * preview)
+gimp_preview_update (myGimpPreview * preview)
 {
   gimp_preview_recompute_sizes (preview, preview->scale);
   gimp_preview_update_preview (preview);
@@ -579,11 +579,11 @@
 static void
 gimp_preview_plus_callback (GtkWidget * widget, gpointer data)
 {
-  GimpPreview *preview;
+  myGimpPreview *preview;
   gchar buffer[10];
   gdouble new_scale;
 
-  preview = GIMP_PREVIEW (data);
+  preview = MY_GIMP_PREVIEW (data);
   if (PREVIEW_DATA (preview)->scale_n == PREVIEW_SCALE_LAST)
     return;
 
@@ -616,11 +616,11 @@
 static void
 gimp_preview_minus_callback (GtkWidget * widget, gpointer data)
 {
-  GimpPreview *preview;
+  myGimpPreview *preview;
   gchar buffer[10];
   gdouble new_scale;
 
-  preview = GIMP_PREVIEW (data);
+  preview = MY_GIMP_PREVIEW (data);
   if (PREVIEW_DATA (preview)->scale_n == 0)
     return;
 
@@ -651,12 +651,12 @@
 static gint
 gimp_preview_event (GtkWidget * widget, GdkEvent * event, gpointer data)
 {
-  GimpPreview *preview;
+  myGimpPreview *preview;
   GdkEventButton *button_event;
   gint x, y;
   gint dx, dy;
 
-  preview = GIMP_PREVIEW (data);
+  preview = MY_GIMP_PREVIEW (data);
   button_event = (GdkEventButton *) event;
 
   switch (event->type)
@@ -733,7 +733,7 @@
  * This function is also used for initializing the preview.
  */
 static void
-gimp_preview_recompute_sizes (GimpPreview * preview, gdouble new_scale)
+gimp_preview_recompute_sizes (myGimpPreview * preview, gdouble new_scale)
 {
 
   /* The center of the preview in image coordinates.
@@ -765,7 +765,7 @@
 }
 
 void
-gimp_preview_generate_update_event (GimpPreview * preview)
+gimp_preview_generate_update_event (myGimpPreview * preview)
      /* Signal the user that the preview must be updated */
 {
   const gdouble scale = preview->scale;
@@ -783,7 +783,7 @@
            0,
            preview->drawable->height - image_y);
 
-  GimpPreviewEvent preview_event;
+  myGimpPreviewEvent preview_event;
 
   preview_event.event_id = PREVIEW_DATA (preview)->current_event_id;
   preview_event.scale = preview->scale;
@@ -814,7 +814,7 @@
  * to step through source and destination!
  */
 static void
-gimp_preview_update_preview (GimpPreview * preview)
+gimp_preview_update_preview (myGimpPreview * preview)
 {
   GimpPixelRgn region;
   guchar *image_data = NULL;
@@ -1012,7 +1012,7 @@
 
 
 void
-gimp_preview_force_redraw (GimpPreview * preview)
+gimp_preview_force_redraw (myGimpPreview * preview)
 {
   gtk_widget_queue_draw (GTK_WIDGET (PREVIEW_DATA (preview)->image));
 }
@@ -1022,7 +1022,7 @@
 gboolean
 gimp_preview_update_preview_idle_fun (gpointer data)
 {
-  GimpPreview *preview = GIMP_PREVIEW (data);
+  myGimpPreview *preview = MY_GIMP_PREVIEW (data);
   gint event_id = PREVIEW_DATA (preview)->current_event_id;
 
 #ifdef PREVIEW_DEBUG
@@ -1041,7 +1041,7 @@
 }
 
 void
-gimp_preview_schedule_update (GimpPreview * preview)
+gimp_preview_schedule_update (myGimpPreview * preview)
 {
   PREVIEW_DATA (preview)->current_event_id++;
 
@@ -1082,7 +1082,7 @@
 }
 
 void
-gimp_preview_image_set_size (GimpPreview * preview, gint width, gint height)
+gimp_preview_image_set_size (myGimpPreview * preview, gint width, gint height)
 {
   const gint real_width = MIN (preview->max_width, width);
   const gint real_height = MIN (preview->max_height, height);
@@ -1120,8 +1120,8 @@
 
 /**
  * gimp_preview_draw_row:
- * @preview: the #GimpPreview
- * @event_id: event_id that was sent with the #GimpPreviewEvent.
+ * @preview: the #myGimpPreview
+ * @event_id: event_id that was sent with the #myGimpPreviewEvent.
  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
  * @row:the relative number of the row within the preview.
  * The top row of the preview is number 0.
@@ -1137,7 +1137,7 @@
  * with the same event-id will be ignored by the preview.
  **/
 gboolean
-gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
+gimp_preview_draw_row (myGimpPreview * preview, const gint event_id,
                        GimpImageType type, gint row,
                        const guchar * const data)
 {
@@ -1247,8 +1247,8 @@
 
 /**
  * gimp_preview_draw_unscaled_row:
- * @preview: the #GimpPreview
- * @event_id: event_id that was sent with the #GimpPreviewEvent.
+ * @preview: the #myGimpPreview
+ * @event_id: event_id that was sent with the #myGimpPreviewEvent.
  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
  * @row:row is the relative position of the row w.r.t. preview_event->image_y.
  * The top row has number 0.
@@ -1267,7 +1267,7 @@
  * with the same event-id will be ignored by the preview.
  **/
 gboolean
-gimp_preview_draw_unscaled_row (GimpPreview * preview, const gint event_id,
+gimp_preview_draw_unscaled_row (myGimpPreview * preview, const gint event_id,
                                 GimpImageType type, const gint row,
                                 const guchar * const data)
 {
@@ -1445,8 +1445,8 @@
 
 /**
  * gimp_preview_progress_set_fraction:
- * @preview: the #GimpPreview.
- * @event_id: event_id that was sent with the #GimpPreviewEvent.
+ * @preview: the #myGimpPreview.
+ * @event_id: event_id that was sent with the #myGimpPreviewEvent.
  * @fraction: the fraction completed.
  *
  * Set the progress bar of the preview to @fraction completed.
@@ -1456,7 +1456,7 @@
  * with the same event-id will be ignored by the preview.
  **/
 gboolean
-gimp_preview_progress_set_fraction (GimpPreview * preview,
+gimp_preview_progress_set_fraction (myGimpPreview * preview,
                                     const gint event_id, double fraction)
 {
   const gboolean return_status =




--- src/gimppreview.h	2014-03-27 20:00:17.000000000 -0300
+++ src/gimppreview.h	2014-03-27 20:00:38.000000000 -0300
@@ -32,25 +32,25 @@
 
 #define PREVIEW_FIXED_SIZE           0
 #define PREVIEW_DEFAULT_SIZE         -1
-#define GIMP_TYPE_PREVIEW            (gimp_preview_get_type ())
-#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview))
-#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, GimpPreviewClass))
-#define GIMP_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW))
-#define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW))
-typedef struct _GimpPreview GimpPreview;
-typedef struct _GimpPreviewClass GimpPreviewClass;
-typedef struct _GimpPreviewEvent GimpPreviewEvent;
+//#define GIMP_TYPE_PREVIEW            (gimp_preview_get_type ())
+#define MY_GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, myGimpPreview))
+#define MY_GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, myGimpPreviewClass))
+//#define GIMP_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW))
+//#define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW))
+typedef struct _myGimpPreview myGimpPreview;
+typedef struct _myGimpPreviewClass myGimpPreviewClass;
+typedef struct _myGimpPreviewEvent myGimpPreviewEvent;
 
-struct _GimpPreviewClass
+struct _myGimpPreviewClass
 {
   GtkContainerClass parent_class;
 
-  void (*update_preview) (GimpPreview * preview, GimpPreviewEvent * event);
-  void (*preview_changed) (GimpPreview * preview);
+  void (*update_preview) (myGimpPreview * preview, myGimpPreviewEvent * event);
+  void (*preview_changed) (myGimpPreview * preview);
 };
 
 
-struct _GimpPreview
+struct _myGimpPreview
 {
   GtkContainer parent;
 
@@ -75,13 +75,13 @@
 };
 
 /**
- * GimpPreviewEvent:
+ * myGimpPreviewEvent:
  * @event_id: Id of this event. This is needed for gimp_preview_draw_row,
  * gimp_preview_draw_unscaled_row and gimp_preview_progress_set_fraction.
  * @scale: Current scale of the preview.
  *
  **/
-struct _GimpPreviewEvent
+struct _myGimpPreviewEvent
 {
   gint event_id;                /* Id of this event */
   gdouble scale;                /* Scale of preview */
@@ -113,20 +113,20 @@
                                        gint preview_size,
                                        gdouble scale_amount,
                                        gint allow_scale);
-void gimp_preview_update (GimpPreview * preview);
+void gimp_preview_update (myGimpPreview * preview);
 
-gboolean gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
+gboolean gimp_preview_draw_row (myGimpPreview * preview, const gint event_id,
                                 GimpImageType type, const gint row,
                                 const guchar * const data);
 
-gboolean gimp_preview_draw_unscaled_row (GimpPreview * preview,
+gboolean gimp_preview_draw_unscaled_row (myGimpPreview * preview,
                                          const gint event_id,
                                          GimpImageType type, const gint row,
                                          const guchar * const data);
 
-void gimp_preview_force_redraw (GimpPreview * preview);
+void gimp_preview_force_redraw (myGimpPreview * preview);
 
-gboolean gimp_preview_progress_set_fraction (GimpPreview * preview,
+gboolean gimp_preview_progress_set_fraction (myGimpPreview * preview,
                                              const gint event_id,
                                              double fraction);
 




--- src/prevman.c	2014-03-27 20:00:17.000000000 -0300
+++ src/prevman.c	2014-03-27 20:00:23.000000000 -0300
@@ -52,7 +52,7 @@
   tile_source->width = drawable->width;
   tile_source->height = drawable->height;
   tile_source->bpp = drawable->bpp;
-  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->id);
+  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
   tile_source->un.drw.drawable = drawable;
   gimp_pixel_rgn_init (&tile_source->un.drw.pixel_rgn, drawable, x, y, width,
                        height, FALSE, FALSE);
@@ -144,7 +144,7 @@
   tile_sink->width = drawable->width;
   tile_sink->height = drawable->height;
   tile_sink->bpp = drawable->bpp;
-  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
   gimp_pixel_rgn_init (&tile_sink->un.drw.pixel_rgn, drawable, x, y, width,
                        height, TRUE, TRUE);
 }
@@ -159,7 +159,7 @@
   tile_sink->width = width;
   tile_sink->height = height;
   tile_sink->bpp = drawable->bpp;
-  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
   tile_sink->un.prv.data = g_new (guchar,
                                   tile_sink->width * tile_sink->height *
                                   tile_sink->bpp);




--- src/refocus.c	2014-03-27 20:00:17.000000000 -0300
+++ src/refocus.c	2014-03-27 20:00:38.000000000 -0300
@@ -45,9 +45,9 @@
 
 /* Declare local functions. */
 static void query (void);
-static void run (char *name,
+static void run (const gchar *name,
                  gint nparams,
-                 GimpParam * param,
+                 const GimpParam * param,
                  gint * nreturn_vals, GimpParam ** return_vals);
 static gint dialog ();
 static void doit (void);
@@ -111,7 +111,6 @@
     {GIMP_PDB_FLOAT, "noise", "Noise to Signal ratio"},
   };
   static GimpParamDef *return_vals = NULL;
-  static gint nargs = (gint) (sizeof (args) / sizeof (args[0]));
   static gint nreturn_vals = 0;
 
   gimp_install_procedure ("plug_in_refocus",
@@ -123,15 +122,15 @@
                           "<Image>/Filters/Enhance/Refocus ...",
                           "RGB*, GRAY*",
                           GIMP_PLUGIN,
-                          nargs, nreturn_vals, args, return_vals);
+                          G_N_ELEMENTS(args), nreturn_vals, args, return_vals);
 }
 
 static void
-run (char *name, gint n_params, GimpParam * param,
+run (const gchar *name, gint n_params, const GimpParam * param,
      gint * nreturn_vals, GimpParam ** return_vals)
 {
   static GimpParam values[1];
-  GimpRunModeType run_mode;
+  GimpRunMode run_mode;
   GimpPDBStatusType status = GIMP_PDB_SUCCESS;
 
   (void) name;                  /* Shut up warnings about unused parameters. */
@@ -186,8 +185,8 @@
     {
 
       /*  Make sure that the drawable is gray or RGB color  */
-      if (gimp_drawable_is_rgb (drawable->id) ||
-          gimp_drawable_is_gray (drawable->id))
+      if (gimp_drawable_is_rgb (drawable->drawable_id) ||
+          gimp_drawable_is_gray (drawable->drawable_id))
         {
           doit ();
 
@@ -336,7 +335,7 @@
   (void) data;
   set_busy_cursor (widget, TRUE);
   update_matrix ();
-  gimp_preview_update (GIMP_PREVIEW (my_widgets.preview));
+  gimp_preview_update (MY_GIMP_PREVIEW (my_widgets.preview));
   set_busy_cursor (widget, FALSE);
 }
 
@@ -369,11 +368,11 @@
 {
   gint event_id = GPOINTER_TO_INT (data);
   return (gimp_preview_progress_set_fraction
-          (GIMP_PREVIEW (my_widgets.preview), event_id, arg));
+          (MY_GIMP_PREVIEW (my_widgets.preview), event_id, arg));
 }
 
 static void
-preview_callback (GtkWidget * widget, GimpPreviewEvent * event, gpointer data)
+preview_callback (GtkWidget * widget, myGimpPreviewEvent * event, gpointer data)
 {
   TileSource source;
   TileSink sink;
@@ -393,7 +392,7 @@
                                       im_width, im_height);
       tile_sink_init_for_preview (&sink, drawable, image_x, image_y,
                                   im_width, im_height);
-      gimp_preview_progress_set_fraction (GIMP_PREVIEW (my_widgets.preview),
+      gimp_preview_progress_set_fraction (MY_GIMP_PREVIEW (my_widgets.preview),
                                           event->event_id, 0);
       bd_closure_init (&update_progress_closure,
                        preview_progress_update_fun,
@@ -409,9 +408,9 @@
         {
           tile_sink_get_row (&sink, buf, image_x, image_y + row, im_width);
           event_is_current =
-            gimp_preview_draw_unscaled_row (GIMP_PREVIEW (my_widgets.preview),
+            gimp_preview_draw_unscaled_row (MY_GIMP_PREVIEW (my_widgets.preview),
                                             event->event_id,
-                                            gimp_drawable_type (drawable->id),
+                                            gimp_drawable_type (drawable->drawable_id),
                                             row, buf);
         };
       g_free (buf);
@@ -583,7 +582,7 @@
 
   gtk_widget_show (dlg);
   redraw_all ();
-  gimp_preview_update (GIMP_PREVIEW (preview));
+  gimp_preview_update (MY_GIMP_PREVIEW (preview));
   gtk_main ();
   gdk_flush ();
   return run_flag;
@@ -608,7 +607,7 @@
   gimp_progress_init ("Computing matrix");
   update_matrix ();
   gimp_progress_init ("Applying convolution");
-  gimp_drawable_mask_bounds (drawable->id, &sx1, &sy1, &sx2, &sy2);
+  gimp_drawable_mask_bounds (drawable->drawable_id, &sx1, &sy1, &sx2, &sy2);
   width = sx2 - sx1;
   height = sy2 - sy1;
   tile_source_init_from_drawable (&source, drawable, sx1, sy1, width, height);
@@ -618,7 +617,7 @@
                   matrix, 2 * my_config.mat_width + 1,
                   &update_progress_closure);
   gimp_drawable_flush (drawable);
-  gimp_drawable_merge_shadow (drawable->id, TRUE);
-  gimp_drawable_update (drawable->id, sx1, sy1, width, height);
+  gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
+  gimp_drawable_update (drawable->drawable_id, sx1, sy1, width, height);
   g_free (matrix);
 }




--- src/tilebuf.c	2014-03-27 20:00:17.000000000 -0300
+++ src/tilebuf.c	2014-03-27 20:00:58.000000000 -0300
@@ -18,6 +18,7 @@
  * Version $Id: tilebuf.c,v 1.1.1.1 2003/01/30 21:30:19 ernstl Exp $
  */
 
+#include <stdio.h>
 #include "tilebuf.h"
 #include "util.h"
 #include <string.h>
@@ -39,6 +40,11 @@
 guchar *
 pixpos_in_buf (TileStripBuffer * buf, const gint x, const gint y)
 {
+  /*
+    & data = array(? lines x row_stride columns)
+    & pixpos_in_buf = &data[(x - real_x)*bytes_per_pixel, y - real_y]
+    & (real_x, real_y) = origin of tile.
+   */
   return (&buf->data[buf->row_stride * (y - buf->real_y) +
                      buf->bpp * (x - buf->real_x)]);
 }
@@ -140,7 +146,10 @@
 
         for (x = x_lo - 1; x >= buf->real_x; x--)
           {
-            copy_col (buf, 2 * x_lo - x, y_start, y_end - y_start, x);
+            gint sx = 2 * x_lo - x;
+            copy_col (buf,
+                      sx<=buf->real_x+buf->real_width-1?sx:buf->real_x+buf->real_width-1,
+                      y_start, y_end - y_start, x);
           };
       }
       break;
@@ -171,7 +180,9 @@
 
         for (x = x_hi; x < buf->real_x + buf->real_width; x++)
           {
-            copy_col (buf, 2 * (x_hi - 1) - x, y_start, y_end - y_start, x);
+            gint sx = 2 * (x_hi - 1) - x;
+            copy_col (buf, sx>=buf->real_x?sx:buf->real_x,
+                      y_start, y_end - y_start, x);
           };
       }
       break;
@@ -200,7 +211,10 @@
 
         for (y = y_lo - 1; y >= buf->real_y; y--)
           {
-            copy_row (buf, buf->real_x, 2 * y_lo - y, buf->real_width, y);
+            gint sy = 2 * y_lo - y;
+            copy_row (buf, buf->real_x,
+                      sy<=buf->real_y+buf->real_height-1?sy:buf->real_y+buf->real_height-1,
+                      buf->real_width, y);
           };
       }
       break;
@@ -212,7 +226,7 @@
 static void
 fix_bottom_boundary (TileStripBuffer * buf, const gint y_hi)
 {
-  if (y_hi >= buf->real_y + buf->real_height)
+  if (y_hi >= buf->real_y + buf->real_height)       /* (1) */
     {
       return;
     };
@@ -226,12 +240,32 @@
       break;
     case TB_BOUNDARY_MIRROR:
       {
-        register gint y;
+        register gint y2;
 
-        for (y = y_hi; y < buf->real_y + buf->real_height; y++)
+        /*if (y_hi < buf->y_limit)*/
+        for (y2 = y_hi; y2 < buf->real_y + buf->real_height; y2++) /*(2)*/
           {
-            copy_row (buf, buf->real_x, 2 * (y_hi - 1) - y, buf->real_width,
-                      y);
+            /*
+              &1 y < y_hi              [domain of y, definition of y_hi, (1)]
+              &2 y_hi <= y2 < buf->real_y + buf->real_height  [(1),(2)]
+              &3 i = 0, 1, ...
+              &4 y=y_hi-i-1 -> y2=y_hi+i               [definition of mirror]
+              &5 y = y2 - 2*i - 1                      [4]
+              &6 y = 2*y2 - 2*i - y2 - 1               [5,algebra]
+              &7 y = 2*y_hi - y2 - 1                   [4,6]
+            */
+            gint y =  2*y_hi - y2 - 1;
+            if (y < buf->real_y) break;
+#ifdef RLXTEST
+           printf("fix_bottom_boundary: Copying row %d to %d, width %d, buf_loc %d %d, real_y %d\n",
+                  2*y_hi - y2 - 1, y2, buf->real_width,
+                  buf->row_stride * (2*y_hi - y2 - 1 - buf->real_y) +
+                   buf->bpp * (buf->real_x - buf->real_x),
+                  buf->row_stride * (y2 - buf->real_y) +
+                   buf->bpp * (buf->real_x - buf->real_x),
+                   buf->real_y);
+#endif
+            copy_row (buf, buf->real_x, y, buf->real_width,y2);
           };
       }
       break;
@@ -253,7 +287,21 @@
   const gint y_lo = MAX (buf->real_y, source->y);
   const gint y_hi = MIN (buf->real_y + buf->real_height,
                          source->y + source->height);
-
+  /*
+    y:  domain of y.
+    & 0 <= y.  y is a 0-index.
+    & | & y in the source image
+        & 0 <=  source->y <= y < source->y + source->height
+      | & y in the buffer
+        & 0 <= buf->real_y <= y < buf->real_y + buf->real_height
+    x:  domain of x = domain of y with mapping y -> x, height -> width.
+   */
+
+#ifdef RLXTEST
+  printf("buf->real_y %d, buf->real_height %d, source->y %d, source->heigh %d, y_hi %d\n",
+         buf->real_y,  buf->real_height,
+       source->y, source->height, y_hi);
+#endif
   fix_left_boundary (buf, x_lo, first_time ? buf->y : buf->y + tile_height (),
                      y_hi);
   fix_right_boundary (buf, x_hi,
@@ -262,7 +310,15 @@
     {
       fix_top_boundary (buf, y_lo);
     };
+#ifdef RLXTEST
+  printf("fix_boundaries: Now goto fix_bottom_boundary: y_hi %d, real_y + real_height %d, data[%d]\n",
+         y_hi, buf->real_y + buf->real_height,
+         buf->real_height * buf->row_stride);
+#endif
   fix_bottom_boundary (buf, y_hi);
+#ifdef RLXTEST
+  printf("bottom boundary fixed\n");
+#endif
 }
 
 void
@@ -309,6 +365,14 @@
   gint x;
   gboolean not_finished = TRUE;
 
+  /*
+    & y_limit = height of picture, if full picture.
+   */
+#ifdef RLXTEST
+  printf("buf->y %d + tile_height%d () >= buf->y_limit %d\n",
+         buf->y,tile_height(),buf->y_limit);
+#endif
+
   if (buf->first_time)
     {
       /* Buf must already have been initialized so there is nothing to do */
@@ -321,19 +385,31 @@
     }
   else
     {
+#ifdef RLXTEST
+      printf("shift_buf: tile_height %d\n", tile_height());
+#endif
       memmove (pixpos_in_buf (buf, buf->real_x,
                               buf->real_y),
                pixpos_in_buf (buf, buf->real_x,
                               buf->real_y + tile_height ()),
                buf->row_stride * (tile_height () + buf->border_width));
       buf->y += tile_height ();
+#ifdef RLXTEST
+      printf("shift_buf: y %d, y_limit %d\n", buf->y,  buf->y_limit);
+#endif
       buf->real_y = buf->y - buf->border_width;
       for (x = buf->x - tile_width ();
            x <= buf->x + buf->width; x += tile_width ())
         {
           copy_tile_to_buf (buf, source, x, buf->y + tile_height ());
+#ifdef RLXTEST
+          printf("shift_buf: x %d\n", x);
+#endif
         };
       fix_boundaries (buf, source, FALSE);
     };
+#ifdef RLXTEST
+  printf("shift_buf: done\n");
+#endif
   return (not_finished);
 }

Removed Link Here

(-)graphics/gimp-refocus-plugin/files/patch-src__util.c (-49 lines)
1	--- src/util.c 2014-03-27 20:00:17.000000000 -0300
2	+++ src/util.c 2014-03-27 20:00:58.000000000 -0300
3	@@ -18,6 +18,7 @@
4	* Version $Id: util.c,v 1.1.1.1 2003/01/30 21:30:19 ernstl Exp $
5	*/
6
7	+#include <stdio.h>
8	#include "util.h"
9	#include <string.h>
10	#include <math.h>
11	@@ -30,14 +31,38 @@
12	gint
13	floorm (gint a, gint b)
14	/* return largest multiple of b that is <= a */
15	+ /*
16	+ & & m = floorm(a,b)
17	+ & a = b*m + r
18	+ & 0 <= r < b
19	+ */
20	{
21	+#ifdef RLXTEST
22	+ printf("floorm: a/b %d, fl %g\n", a/b, floor ((gdouble) a / b));
23	+#endif
24	return (b * floor ((gdouble) a / b));
25	}
26
27	gint
28	ceilm (gint a, gint b)
29	/* return least multiple of b that is >= a */
30	+ /*
31	+ & m = ceilm(a,b)
32	+ & a = b*m - r;
33	+ & m = a/b
34	+ % r = a%b
35	+ & -a = -b*m + r
36	+
37	+ & ceilm = (r == 0 ? bm : (b+1)m)
38	+ */
39	{
40	+#ifdef RLXTEST
41	+ printf("ceil: a %d, b %d, -(-a/b) %d,a/b+(a%b != 0 ? 1:0) %d, fl %g\n",
42	+ a,b,
43	+ -((-a)/b),
44	+ a/b+(a%b != 0 ? 1:0),
45	+ ceil ((gdouble) a / b) );
46	+#endif
47	return (b * ceil ((gdouble) a / b));
48	}
49





OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} -e 's|^CC=|#CC=|g ; \
		 s|-Wall -pedantic|$$(CFLAGS)|g' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e '/typedef unsigned char/d' ${WRKSRC}/exif.h
	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/psm*.c

do-install:
.for file in psmdel psmdir psmget psmsho
	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin




# $FreeBSD$

PORTNAME=	opencolorio
PORTVERSION=	g20200916
PORTEPOCH=	1
PORTREVISION?=	1
CATEGORIES=	graphics multimedia

MAINTAINER?=	FreeBSD@Shaneware.biz
COMMENT?=	Complete color management solution

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}

USES=		alias cmake compiler:c++11-lang localbase:ldflags pkgconfig \
		shebangfix python:3.5+

USE_GITHUB=	yes
GH_ACCOUNT=	imageworks
GH_PROJECT=	OpenColorIO
GH_TAGNAME=	268238bd

CMAKE_ON=	USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML
CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC

CXXFLAGS_gcc=	-Wno-unused-function -Wno-error
CXXFLAGS_clang=	-Wno-deprecated-register

SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceSimple.py share/sphinx/ExtractRstFromSourceCPP.py
		share/sphinx/ExtractRstFromSourceSimple.py \
		src/pyglue/createPyDocH.py

OPTIONS_DEFINE=		DOCS



PLIST_SUB+=		LIBVERS=${PORTVERSION}

CMAKE_OFF+=	OCIO_BUILD_TESTS OCIO_BUILD_GPU_TESTS

.if ${MACHINE_CPU:Msse2}
CMAKE_ON+=	OCIO_USE_SSE
.else

CMAKE_OFF+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
LDFLAGS+=	-lOpenColorIO
USES+=		gl xorg
USE_GL=		egl gl glu glut glew
USE_XORG=	xi xmu
PLIST=		${PKGDIR}/pkg-plist-tools
EXTRA_PATCHES=	${PATCHDIR}/tools
.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
		libOpenColorIO.so:graphics/opencolorio
USES+=		python
USE_PYTHON=	flavors
LDFLAGS+=	-lOpenColorIO
CMAKE_ON+=	OCIO_BUILD_PYGLUE OCIO_PYGLUE_LINK
CMAKE_OFF+=	OCIO_BUILD_APPS OCIO_BUILD_SHARED
CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD} -Dpystring_ROOT=${LOCALBASE}
PLIST=		${PKGDIR}/pkg-plist-pyglue
USE_PYTHON=	flavors
.else # master port
CMAKE_ON+=	USE_EXTERNAL_LCMS OCIO_BUILD_SHARED
CMAKE_OFF+=	OCIO_BUILD_APPS
USES+=		gl xorg
USE_GL=		gl glu glut glew
USE_XORG=	xi xmu
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}sphinx-tabs>0:textproc/py-sphinx-tabs@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}recommonmark>=0:textproc/py-recommonmark@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}testresources>=0:devel/py-testresources@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}sphinx_press_theme>=0:textproc/py-sphinx_press_theme@${PY_FLAVOR}

LIB_DEPENDS=	libexpat.so:textproc/expat2 \
		libHalf.so:graphics/ilmbase \
		liblcms2.so:graphics/lcms2 \
		libpystring.so:devel/pystring \
		libtinyxml.so:textproc/tinyxml \
		libyaml-cpp.so:devel/yaml-cpp

.if ${PORT_OPTIONS:MDOCS}
USES+=		python:3.5+,build
.else
USES+=		python:build
.endif
USE_LDCONFIG=	yes
CMAKE_ON+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
CMAKE_OFF+=	OCIO_BUILD_APPS
CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD} -DPYTHON_LIBRARY=${PYTHON_LIBDIR}
# we enable pyglue in master port. This makes the python module
# available when generating docs, we leave the python header in place
# but only install the python module with the py-opencolorio port

# doc building fails using python3 - but the py-opencolorio port can still
# be used to build a python 3 module
PLIST=		${PKGDIR}/pkg-plist
EXTRA_PATCHES=	${PATCHDIR}/libs
.endif

.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
do-install:
.for BIN in ociobakelut ociocheck ociochecklut ocioconvert ociodisplay ociolutimage ociomakeclf ocioperf ociowrite
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/apps/${BIN}/${BIN} ${STAGEDIR}${PREFIX}/bin/${BIN}
.endfor
	@${REINPLACE_CMD} -e '/YAML_CPP_LIBRARY/ s|yaml-cpp|&03|' \
		${WRKSRC}/CMakeLists.txt
	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.cpp
.if ${SLAVE_PORT} == yes
	@${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \
		${REINPLACE_CMD} '/namespace OIIO/d'
.endif

.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
do-install:
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
	${INSTALL_LIB} ${BUILD_WRKSRC}/src/bindings/python/PyOpenColorIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
.elif !defined(OCIO_SLAVE)
post-install:
	@${RM} -R ${STAGEDIR}${PYTHON_LIBDIR}

Lines 1-3 Link Here

(-)graphics/opencolorio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557638944	1	TIMESTAMP = 1600267246
2	SHA256 (imageworks-OpenColorIO-v1.1.1_GH0.tar.gz) = c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8	2	SHA256 (imageworks-OpenColorIO-g20200916-268238bd_GH0.tar.gz) = 0b004452ba1349e332ad711d89778ab16f71c653df563c75d033b56007f01e1e
3	SIZE (imageworks-OpenColorIO-v1.1.1_GH0.tar.gz) = 13828483	3	SIZE (imageworks-OpenColorIO-g20200916-268238bd_GH0.tar.gz) = 9577856




--- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
+++ ./CMakeLists.txt
@@ -596,7 +599,7 @@ if(TARGET OpenColorIO_STATIC)
         set(OCIO_STATIC_COMPILE_DEFINITIONS )
     endif()
 endif()
-install(EXPORT OpenColorIO DESTINATION cmake)
+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
 file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
     "
     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
     "
 )
-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)

Removed Link Here

(-)graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt (-8 lines)
1	--- src/core/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC
2	+++ src/core/CMakeLists.txt
3	@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
4	configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
5	${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
6	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
7	- DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
8	+ DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/)




--- CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
+++ CMakeLists.txt
@@ -3,6 +3,10 @@ set(OCIO_VERSION_MAJOR 1)
 set(OCIO_VERSION_MINOR 1)
 set(OCIO_VERSION_PATCH 0)
 
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/share/cmake)
 if(NOT DEFINED CMAKE_FIRST_RUN)
@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
         ## => great news when build staticaly since we do not want another client project have to link also with tinyxml when he want to use this project
         ## => could be problematic if the client project use another version of tinyxml... In this case build tinyxml as shared lib with all projects could be a solution
         ## => TODO: so maybe provide a simple cmake way to build 3rdParty as shared and auto install with this project ?
-        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
-        add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and also need to be propagated in child projects (client projects)
+        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
         list(APPEND EXTERNAL_OBJECTS $<TARGET_OBJECTS:TINYXML_LIB>)
     else()
         find_package(Git REQUIRED) ## in order to apply patch (for crossplateform compatibility)
@@ -384,7 +387,7 @@ else()
     set(OCIO_INLINES_HIDDEN OFF)
 endif()
 
-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
+set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
 
 set(EXTERNAL_LINK_FLAGS "")
 set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)




--- docs/CMakeLists.txt.orig	2020-09-16 03:35:02 UTC
+++ docs/CMakeLists.txt
@@ -147,17 +147,14 @@ if(${Python_VERSION_MAJOR} GREATER_EQUAL 3)
     ### Installation ###
 
     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencolorio
             PATTERN .* EXCLUDE
     )
 
     ###############################################################################
     ### PDF target ###
 
-    find_package(LATEX)
-    package_root_message(LATEX)
-
-    if(PDFLATEX_COMPILER)
+    if(0)
 
         add_custom_target(latex
             COMMAND

Removed Link Here

(-)graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake (-11 lines)
1	--- share/cmake/OCIOMacros.cmake.orig 2015-08-29 00:58:36 UTC
2	+++ share/cmake/OCIOMacros.cmake
3	@@ -168,7 +168,7 @@ MACRO(OCIOFindPython)
4	file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS)
5
6	FIND_LIBRARY(PYTHON_LIBRARY
7	- NAMES "python${PYTHON_VERSION}"
8	+ NAMES "${PYTHON_VERSION}${PYTHON_ABIVER}"
9	PATHS ${PYTHON_LIBRARY_DIRS}
10	NO_DEFAULT_PATH # Don't be "helpful" and randomly grab library from /usr/lib etc
11	)

Removed Link Here

(-)graphics/opencolorio/files/patch-src_core_Config.cpp (-11 lines)
1	--- src/core/Config.cpp.orig 2018-09-04 18:15:21 UTC
2	+++ src/core/Config.cpp
3	@@ -324,7 +324,7 @@ OCIO_NAMESPACE_ENTER
4	sanitytext_ = rhs.sanitytext_;
5
6	cacheids_ = rhs.cacheids_;
7	- cacheidnocontext_ = cacheidnocontext_;
8	+ cacheidnocontext_ = rhs.cacheidnocontext_;
9	}
10	return *this;
11	}




--- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
+++ ./CMakeLists.txt
@@ -457,7 +460,7 @@ endif()
 ###############################################################################
 ### APPS ###
 
-if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
+if(OCIO_BUILD_APPS)
 
     # Try to find OpenImageIO (OIIO) and OpenGL stuff
     OCIOFindOpenImageIO()
@@ -531,7 +534,7 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
+#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
 
 ###############################################################################
 ### CPACK ###
@@ -596,7 +595,7 @@ if(TARGET OpenColorIO_STATIC)
         set(OCIO_STATIC_COMPILE_DEFINITIONS )
     endif()
 endif()
-install(EXPORT OpenColorIO DESTINATION cmake)
+#install(EXPORT OpenColorIO DESTINATION cmake)
 file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
     "
     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
     "
 )
-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
+#install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)




--- src/core/CMakeLists.txt.orig	2018-02-05 14:07:04 UTC
+++ src/core/CMakeLists.txt
@@ -105,15 +105,3 @@ macro(target_link_OCIO target)
         set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS OpenColorIO_STATIC)
     endif()
 endmacro()
-
-
-# public interface
-install(FILES ${core_export_headers}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
-
-# pkg-config
-message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")
-configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
-    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)




include/OpenColorIO/OpenColorIO.h
include/OpenColorIO/OpenColorTransforms.h
include/OpenColorIO/OpenColorTypes.h
include/OpenColorIO/apphelpers/CategoryNames.h
include/OpenColorIO/apphelpers/ColorSpaceHelpers.h
include/OpenColorIO/apphelpers/DisplayViewHelpers.h
include/OpenColorIO/apphelpers/MixingHelpers.h
include/OpenColorIO/apphelpers/ViewingPipeline.h
lib/libOpenColorIO.so
lib/libOpenColorIO.so.2.0
lib/libOpenColorIO.so.2.0.0
lib/libOpenColorIOapphelpers.a
libdata/pkgconfig/OpenColorIO.pc
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.html
%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.html
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
%%PORTDOCS%%%%DOCSDIR%%/README.html
%%PORTDOCS%%%%DOCSDIR%%/V2_DOC_README.html
%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
%%PORTDOCS%%%%DOCSDIR%%/License.html
%%PORTDOCS%%%%DOCSDIR%%/_images/gn10_to_linear_light.jpeg
%%PORTDOCS%%%%DOCSDIR%%/_images/gnf_to_linear_light.jpeg
%%PORTDOCS%%%%DOCSDIR%%/_images/lg10_to_linear_light.jpeg

%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_proof_setup.png
%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_reveal_profile.png
%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_select_profile.png
%%PORTDOCS%%%%DOCSDIR%%/_sources/CHANGELOG.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/CMakeLists.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/INSTALL.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/README.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/V2_DOC_README.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/bindings/PythonAPI.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/bindings/PythonTransforms.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/bindings/PythonTypes.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_baker.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_colorspace.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_colorspaceset.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_config.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_context.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_cpuprocessor.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_dynamicproperty.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_filerules.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_formatmetadata.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_gpuprocessor.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_gpushadercreator.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_gpushaderdesc.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_imagedesc.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_look.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_packedimagedesc.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_planarimagedesc.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_processor.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_viewingrules.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/change_log.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/transforms.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/api/types.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/aswf_docker.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/charter.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/cla_dco.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/license.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/configuration_files.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/glossary.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/internal_architecture.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/introduction.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/overview.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/publications/publications.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/aces_1.0.3.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTypes.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/allocation_vars.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/authoring.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/colorspaces.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/config_syntax.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/contexts.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/displays_views.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/looks.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/looks_example.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/overview.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/rules.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/transforms.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/architectural_notes.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/coding_style_guide.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/contributing.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/documentation_guidelines.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/doxygen_style_guide.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/getting_started.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/issues.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/repository_structure.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/submitting_changes.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/unit_tests.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/developing/app_helpers.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/developing/developing.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/developing/usage_examples.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/compatible_software.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/faq.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/tool_overview.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/using_ocio.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/downloads.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_artists.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_config_authors.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_contributors.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_devs.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/installation.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/requirements.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/README.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/README_theme.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/archetypes/default.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/author/john-doe.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/author/mark-dinn.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/installation.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-1.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-2.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-3.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-4.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-5.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-6.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-7.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-8.md.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/toc_redirect.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorials/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorials/baking_luts.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorials/contributing.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/upgrading_v2/_index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/upgrading_v2/how_to.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_static/OpenColorIO_withText.svg
%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
%%PORTDOCS%%%%DOCSDIR%%/_static/bg-page.png
%%PORTDOCS%%%%DOCSDIR%%/_static/bullet_orange.png
%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_lm10.0101.jpg
%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_lnf.0101.jpg
%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_vd16.0101.jpg
%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
%%PORTDOCS%%%%DOCSDIR%%/_static/documentation_options.js
%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
%%PORTDOCS%%%%DOCSDIR%%/_static/jquery-3.5.1.js
%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
%%PORTDOCS%%%%DOCSDIR%%/_static/language_data.js
%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
%%PORTDOCS%%%%DOCSDIR%%/_static/ocio_b.svg
%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_press_theme.css
%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/menu.min.css
%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/segment.min.css
%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/tab.min.css
%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/tab.min.js
%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/tabs.css
%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/tabs.js
%%PORTDOCS%%%%DOCSDIR%%/_static/theme-vendors.js
%%PORTDOCS%%%%DOCSDIR%%/_static/theme.css
%%PORTDOCS%%%%DOCSDIR%%/_static/theme.js
%%PORTDOCS%%%%DOCSDIR%%/_static/underscore-1.3.1.js
%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
%%PORTDOCS%%%%DOCSDIR%%/api/_index.html
%%PORTDOCS%%%%DOCSDIR%%/api/bindings/PythonAPI.html
%%PORTDOCS%%%%DOCSDIR%%/api/bindings/PythonTransforms.html
%%PORTDOCS%%%%DOCSDIR%%/api/bindings/PythonTypes.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_baker.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_colorspace.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_colorspaceset.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_config.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_context.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_cpuprocessor.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_dynamicproperty.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_filerules.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_formatmetadata.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_gpuprocessor.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_gpushadercreator.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_gpushaderdesc.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_imagedesc.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_look.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_packedimagedesc.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_planarimagedesc.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_processor.html
%%PORTDOCS%%%%DOCSDIR%%/api/c_viewingrules.html
%%PORTDOCS%%%%DOCSDIR%%/api/change_log.html
%%PORTDOCS%%%%DOCSDIR%%/api/transforms.html
%%PORTDOCS%%%%DOCSDIR%%/api/types.html
%%PORTDOCS%%%%DOCSDIR%%/aswf/_index.html
%%PORTDOCS%%%%DOCSDIR%%/aswf/aswf_docker.html
%%PORTDOCS%%%%DOCSDIR%%/aswf/charter.html
%%PORTDOCS%%%%DOCSDIR%%/aswf/cla_dco.html
%%PORTDOCS%%%%DOCSDIR%%/aswf/license.html
%%PORTDOCS%%%%DOCSDIR%%/concepts/_index.html
%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/configuration_files.html
%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/glossary.html
%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/internal_architecture.html
%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/introduction.html
%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/overview.html
%%PORTDOCS%%%%DOCSDIR%%/concepts/publications/publications.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/_index.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/aces_1.0.3.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTypes.html
%%PORTDOCS%%%%DOCSDIR%%/developers/api/index.html
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonAPI.html
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTransforms.html
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTypes.html
%%PORTDOCS%%%%DOCSDIR%%/developers/coding_guidelines.html
%%PORTDOCS%%%%DOCSDIR%%/developers/documentation_guidelines.html
%%PORTDOCS%%%%DOCSDIR%%/developers/getting_started.html
%%PORTDOCS%%%%DOCSDIR%%/developers/index.html
%%PORTDOCS%%%%DOCSDIR%%/developers/internal_architecture.html
%%PORTDOCS%%%%DOCSDIR%%/developers/issues.html
%%PORTDOCS%%%%DOCSDIR%%/developers/submitting_changes.html
%%PORTDOCS%%%%DOCSDIR%%/developers/usage_examples.html
%%PORTDOCS%%%%DOCSDIR%%/downloads.html
%%PORTDOCS%%%%DOCSDIR%%/genindex.html
%%PORTDOCS%%%%DOCSDIR%%/guides/_index.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/allocation_vars.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/authoring.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/colorspaces.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/config_syntax.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/contexts.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/displays_views.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/looks.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/looks_example.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/overview.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/rules.html
%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/transforms.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/architectural_notes.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/coding_style_guide.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/contributing.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/documentation_guidelines.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/doxygen_style_guide.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/getting_started.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/issues.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/repository_structure.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/submitting_changes.html
%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/unit_tests.html
%%PORTDOCS%%%%DOCSDIR%%/guides/developing/app_helpers.html
%%PORTDOCS%%%%DOCSDIR%%/guides/developing/developing.html
%%PORTDOCS%%%%DOCSDIR%%/guides/developing/usage_examples.html
%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/compatible_software.html
%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/faq.html
%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/tool_overview.html
%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/using_ocio.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/installation.html
%%PORTDOCS%%%%DOCSDIR%%/introduction.html
%%PORTDOCS%%%%DOCSDIR%%/objects.inv
%%PORTDOCS%%%%DOCSDIR%%/quick_start/_index.html
%%PORTDOCS%%%%DOCSDIR%%/quick_start/downloads.html
%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_artists.html
%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_config_authors.html
%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_contributors.html
%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_devs.html
%%PORTDOCS%%%%DOCSDIR%%/quick_start/installation.html
%%PORTDOCS%%%%DOCSDIR%%/requirements.html
%%PORTDOCS%%%%DOCSDIR%%/search.html
%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
%%PORTDOCS%%%%DOCSDIR%%/site/README.html
%%PORTDOCS%%%%DOCSDIR%%/site/README_theme.html
%%PORTDOCS%%%%DOCSDIR%%/site/archetypes/default.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/author/john-doe.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/author/mark-dinn.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/installation.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-1.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-2.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-3.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-4.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-5.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-6.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-7.html
%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-8.html
%%PORTDOCS%%%%DOCSDIR%%/toc_redirect.html
%%PORTDOCS%%%%DOCSDIR%%/tutorials/_index.html
%%PORTDOCS%%%%DOCSDIR%%/tutorials/baking_luts.html
%%PORTDOCS%%%%DOCSDIR%%/tutorials/contributing.html
%%PORTDOCS%%%%DOCSDIR%%/upgrading_v2/_index.html
%%PORTDOCS%%%%DOCSDIR%%/upgrading_v2/how_to.html

Lines 1-5 Link Here

(-)graphics/opencolorio/pkg-plist-tools (+4 lines)
1	bin/ociobakelut	1	bin/ociobakelut
2	bin/ociocheck	2	bin/ociocheck
		3	bin/ociochecklut
3	bin/ocioconvert	4	bin/ocioconvert
4	bin/ociodisplay	5	bin/ociodisplay
5	bin/ociolutimage	6	bin/ociolutimage
		7	bin/ociomakeclf
		8	bin/ocioperf
		9	bin/ociowrite

Lines 152-161 _OPT_FLAGS+= -mstackrealign Link Here

(-)graphics/rawtherapee/Makefile (-4 lines)
152		152
153	.include <bsd.port.pre.mk>	153	.include <bsd.port.pre.mk>
154		154
155	post-patch:
156	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
157	${WRKSRC}/CMakeLists.txt
158
159	TESTIMAGES= ${FILESDIR}/../testimages	155	TESTIMAGES= ${FILESDIR}/../testimages
160		156
161	# paranoia: run rawtherapee to be sure it finds all its	157	# paranoia: run rawtherapee to be sure it finds all its





MMX_CPPFLAGS=		-DHAVE_MMX

post-patch:
	@${REINPLACE_CMD} -e \
		'/<malloc.h>/d ; \
		 s|__i386__|HAVE_MMX| ; \
		 s|__x86_64__|__amd64__|' ${WRKSRC}/*.[ch]

post-install:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	(cd ${WRKSRC}/example && ${INSTALL_DATA} *.png \

Lines 39-49 MAKE_ENV= TARGETS="${BIN_TARGETS}" \ Link Here

(-)graphics/separate/Makefile (-5 lines)
39		39
40	OPTIONS_DEFINE= DOCS EXAMPLES	40	OPTIONS_DEFINE= DOCS EXAMPLES
41		41
42	post-patch:
43	@${REINPLACE_CMD} \
44	'/^CC/s\|=\|?=\|; s\| make\| ${MAKE_CMD}\|; /^LIBS/s/$$/ -lm/;' \
45	${WRKSRC}/Makefile ${WRKSRC}/po/Makefile
46
47	do-install:	42	do-install:
48	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gimp/2.2/plug-ins	43	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gimp/2.2/plug-ins
49	.for plugin in ${BIN_TARGETS}	44	.for plugin in ${BIN_TARGETS}

Lines 15-22 GNU_CONFIGURE= yes Link Here

(-)graphics/stamp/Makefile (-4 lines)
15	CPPFLAGS+= -I${LOCALBASE}/include	15	CPPFLAGS+= -I${LOCALBASE}/include
16	LIBS+= -L${LOCALBASE}/lib	16	LIBS+= -L${LOCALBASE}/lib
17		17
18	post-patch:
19	@${REINPLACE_CMD} -e 's#/usr/local/share/stamp#${DATADIR}#' \
20	${WRKSRC}/configure
21
22	.include <bsd.port.mk>	18	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)graphics/stamp/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig 2011-03-12 21:24:42.000000000 +0100	1	--- Makefile.in.orig 1999-03-10 10:54:42 UTC
2	+++ Makefile.in 2011-03-12 21:25:00.000000000 +0100	2	+++ Makefile.in
3	@@ -329,12 +329,12 @@ maintainer-clean-generic clean mostlycle	3	@@ -329,12 +329,12 @@ maintainer-clean-generic clean mostlyclean distclean m
4	.PHONY: files	4	.PHONY: files
5		5
6	files:	6	files:

Lines 1-5 Link Here

(-)graphics/stamp/files/patch-gstamp_gstamp.c (-2 / +2 lines)
1	--- gstamp/gstamp.c.orig 2011-03-12 21:29:21.000000000 +0100	1	--- gstamp/gstamp.c.orig 1999-03-10 06:27:04 UTC
2	+++ gstamp/gstamp.c 2011-03-12 21:29:42.000000000 +0100	2	+++ gstamp/gstamp.c
3	@@ -7,6 +7,7 @@	3	@@ -7,6 +7,7 @@
4		4
5	#include <gtk/gtk.h>	5	#include <gtk/gtk.h>

Removed Link Here

(-)graphics/stamp/files/patch-gstamp_gstamp_misc.c (-10 lines)
1	--- gstamp/gstamp_misc.c.orig 2011-03-12 21:33:49.000000000 +0100
2	+++ gstamp/gstamp_misc.c 2011-03-12 21:34:16.000000000 +0100
3	@@ -2,6 +2,7 @@
4	Eric Werner - 19 FEB 1999
5	ebw@city-net.com
6	*/
7	+#include <sys/shm.h>
8	#include <stdlib.h>
9	#include <string.h>
10	#include <unistd.h>

Removed Link Here

(-)graphics/stamp/files/patch-gstamp_gstamp_signals.c (-10 lines)
1	--- gstamp/gstamp_signals.c.orig 2011-03-12 21:31:32.000000000 +0100
2	+++ gstamp/gstamp_signals.c 2011-03-12 21:31:44.000000000 +0100
3	@@ -3,6 +3,7 @@
4	ebw@city-net.com
5	*/
6	#include <gtk/gtk.h>
7	+#include <stdlib.h>
8	#include <string.h>
9	#include "gstamp.h"
10	#include "../lib/rcfile.h"

Removed Link Here

(-)graphics/stamp/files/patch-gstamp_gstamp_ui.c (-7 lines)
1	--- gstamp/gstamp_ui.c.orig 2011-03-12 21:31:56.000000000 +0100
2	+++ gstamp/gstamp_ui.c 2011-03-12 21:32:20.000000000 +0100
3	@@ -1,3 +1,4 @@
4	+#include <string.h>
5	#include <gtk/gtk.h>
6	#include "gstamp.h"
7

Lines 1-5 Link Here

(-)graphics/stamp/files/patch-lib_common.c (-2 / +2 lines)
1	--- lib/common.c.orig 2011-03-12 21:28:20.000000000 +0100	1	--- lib/common.c.orig 1999-03-11 08:29:53 UTC
2	+++ lib/common.c 2011-03-12 21:28:30.000000000 +0100	2	+++ lib/common.c
3	@@ -1,5 +1,6 @@	3	@@ -1,5 +1,6 @@
4	#include <stdio.h>	4	#include <stdio.h>
5	#include <stdlib.h>	5	#include <stdlib.h>

Lines 1-6 Link Here

(-)graphics/stamp/files/patch-lib_rcfile.c (-3 / +3 lines)
1	--- lib/rcfile.c.orig Fri Dec 24 15:02:25 1999	1	--- lib/rcfile.c.orig 1999-03-11 08:30:32 UTC
2	+++ lib/rcfile.c Fri Dec 24 15:06:09 1999	2	+++ lib/rcfile.c
3	@@ -101,8 +101,8 @@	3	@@ -101,8 +101,8 @@ if ((!(strcmp(Args->LowerFont,""))) &&
4	exit(ERR_NOLFONT) ;	4	exit(ERR_NOLFONT) ;
5	}	5	}
6		6

Lines 1-5 Link Here

(-)graphics/stamp/files/patch-lib_transmogrify.c (-2 / +2 lines)
1	--- lib/transmogrify.c.orig 2011-03-12 21:28:42.000000000 +0100	1	--- lib/transmogrify.c.orig 1999-03-10 11:40:33 UTC
2	+++ lib/transmogrify.c 2011-03-12 21:28:55.000000000 +0100	2	+++ lib/transmogrify.c
3	@@ -1,5 +1,6 @@	3	@@ -1,5 +1,6 @@
4	#include <stdio.h>	4	#include <stdio.h>
5	#include <stdlib.h>	5	#include <stdlib.h>

Lines 23-32 PLIST_FILES= bin/${PORTNAME} Link Here

(-)graphics/synaesthesia/Makefile (-4 lines)
23		23
24	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= DOCS
25		25
26	post-patch:
27	@${REINPLACE_CMD} -e 's,stdint\.h,inttypes.h,' ${WRKSRC}/*.c?
28	@${REINPLACE_CMD} -e 's,int16_t,u_int16_t,' ${WRKSRC}/sound.cc
29
30	do-install:	26	do-install:
31	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	27	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
32		28




.endif

post-patch:
	@${REINPLACE_CMD} "/\.po 0/d" \
		${WRKSRC}/man/fax2ps.1 \
		${WRKSRC}/man/fax2tiff.1 \
		${WRKSRC}/man/pal2rgb.1 \
		${WRKSRC}/man/ppm2tiff.1 \
		${WRKSRC}/man/raw2tiff.1 \
		${WRKSRC}/man/tiff2bw.1 \
		${WRKSRC}/man/tiff2ps.1 \
		${WRKSRC}/man/tiff2rgba.1 \
		${WRKSRC}/man/tiffcmp.1 \
		${WRKSRC}/man/tiffcp.1 \
		${WRKSRC}/man/tiffcrop.1 \
		${WRKSRC}/man/tiffdither.1 \
		${WRKSRC}/man/tiffdump.1 \
		${WRKSRC}/man/tiffgt.1 \
		${WRKSRC}/man/tiffinfo.1 \
		${WRKSRC}/man/tiffmedian.1 \
		${WRKSRC}/man/tiffset.1 \
		${WRKSRC}/man/tiffsplit.1

pre-configure:
	${REINPLACE_CMD} \




GH_ACCOUNT=	linuxmint
USE_GNOME=	atk cairo gdkpixbuf2 gtk30 introspection pango
USE_XORG=	x11
GLIB_SCHEMAS=	org.x.viewer.enums.xml \
		org.x.viewer.gschema.xml
INSTALLS_ICONS=	yes

OPTIONS_DEFINE=		JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
OPTIONS_DEFAULT=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
XMP_DESC=		Adobe Extensible Metadata Platform support
OPTIONS_SUB=		yes

JPEG_USES=		jpeg
JPEG_CONFIGURE_OFF=	--without-libjpeg

XMP_LIB_DEPENDS=	libexempi.so:textproc/exempi
XMP_CONFIGURE_OFF=	--without-xmp

post-patch:
	@${REINPLACE_CMD} -e '/CINNAMON_DESKTOP_REQUIRED/s,3\.2\.0,2.4.2,' \
		${WRKSRC}/configure.ac

.include <bsd.port.mk>

Lines 30-36 ZIP_CONFIGURE_OFF= --disable-zip Link Here

(-)graphics/zphoto/Makefile (-3 lines)
30	NLS_USES= gettext	30	NLS_USES= gettext
31	NLS_CONFIGURE_ENABLE= nls	31	NLS_CONFIGURE_ENABLE= nls
32		32
33	post-patch:
34	@${REINPLACE_CMD} -e 's\|<ming.h>\|<ming/ming.h>\|g' ${WRKSRC}/*.c ${WRKSRC}/configure
35
36	.include <bsd.port.mk>	33	.include <bsd.port.mk>




--- templates/default/all/Makefile.in.org	2014-06-21 19:51:31.487457236 +0900
+++ templates/default/all/Makefile.in	2014-06-21 19:51:46.935435015 +0900
@@ -369,9 +369,9 @@
 	| sh
 
 install-data-local:
-	mkdir -p $(templatesdir)
-	cp -p *.html.* $(templatesdir)
-	cp -p *.js.* $(templatesdir)
+	mkdir -p $(DESTDIR)$(templatesdir)
+	cp -p *.html.* $(DESTDIR)$(templatesdir)
+	cp -p *.js.* $(DESTDIR)$(templatesdir)
 
 clean:
 	rm -f zphoto.css .photo.html *.html.* *.js.* *.txt




--- configure.orig	2004-07-20 16:49:27 UTC
+++ configure
@@ -4277,7 +4277,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <ming.h>
+#include <ming/ming.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4321,7 +4321,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ming.h>
+#include <ming/ming.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4488,13 +4488,13 @@ fi
 echo "$as_me:$LINENO: checking whether ming 0.2a (old API) is used" >&5
 echo $ECHO_N "checking whether ming 0.2a (old API) is used... $ECHO_C" >&6
 cat > tmp.c <<'EOF'
-#include <ming.h>
+#include <ming/ming.h>
 int main () {
     SWFMovie movie;
     SWFMovie_save(movie, "foo"); /* 0.2a API */
 }
 EOF




--- exif.c.orig	2004-06-07 09:58:04 UTC
+++ exif.c
@@ -33,11 +33,11 @@ enum {
     HEADER_OFFSET2 = 8
 };
 

 
 #define SWAP_ENDIAN_SHORT(val) ((unsigned short) ( \
     (((unsigned short) (val) & (unsigned short) 0x00ff) << 8) | \
@@ -46,14 +46,14 @@ enum {
 static int 
 is_little_endian ()
 {

 	if (memcmp(p, x, 4) == 0) {
 	    retval = 1;
 	} else {
@@ -63,8 +63,8 @@ is_little_endian ()
     return retval;
 }
 

 {
     if (is_little_endian()) {
 	return x;
@@ -83,8 +83,8 @@ ushort_from_be (unsigned short x)
     }
 }
 

 {
     if (is_little_endian()) {
 	return SWAP_ENDIAN_LONG(x);
@@ -115,7 +115,7 @@ efread (void *ptr, size_t size, size_t nmemb, FILE *st
 
 
 static int

 {
     int x = fseek(stream, offset, whence);
     if (x != 0)
@@ -142,16 +142,16 @@ zphoto_exif_file_p (const char *file_name)
 typedef void	(*TraverseFunc)	 (FILE *fp,
                                   unsigned short tag, 
                                   unsigned short type, 

                     void *data)
 {
     if (tag == 0x8769) {
@@ -163,12 +163,12 @@ static void
 get_time (FILE *fp, 
           unsigned short tag,
           unsigned short type,

         char buf[BUFSIZ];
         struct tm t;
 
@@ -204,16 +204,16 @@ read_ushort (FILE *fp, int le_exif_p)
         return ushort_from_be(x);
 }
 

 }
 
 static int
@@ -225,12 +225,12 @@ read_directory (FILE *fp, TraverseFunc func, void *dat
     n = read_ushort(fp, le_exif_p);
     for (i = 0; i < n; i++) {
         unsigned short tag, type;

Lines 1-6 Link Here

(-)graphics/zphoto/files/patch-image.cpp (-1 / +1 lines)
1	--- image.cpp.orig 2004-07-20 16:48:11 UTC	1	--- image.cpp.orig 2004-07-20 16:48:11 UTC
2	+++ image.cpp	2	+++ image.cpp
3	@@ -554,8 +554,8 @@ restore_mtime (const char *file_name, ti	3	@@ -554,8 +554,8 @@ restore_mtime (const char *file_name, time_t mtime)
4	static int	4	static int
5	convert_needed_p (const char src, const char dest)	5	convert_needed_p (const char src, const char dest)
6	{	6	{

Lines 1-6 Link Here

(-)graphics/zphoto/files/patch-util.c (-3 / +3 lines)
1	--- util.c.orig 2010-12-04 00:36:16.000000000 +0900	1	--- util.c.orig 2004-07-20 16:48:11 UTC
2	+++ util.c 2010-12-04 00:36:52.000000000 +0900	2	+++ util.c
3	@@ -389,7 +389,7 @@	3	@@ -389,7 +389,7 @@ char **
4	zphoto_get_image_suffixes (void)	4	zphoto_get_image_suffixes (void)
5	{	5	{
6	static char *empty[] = { NULL };	6	static char *empty[] = { NULL };

Lines 30-36 OPTIONS_SUB= yes Link Here

(-)irc/insub/Makefile (-1 / +1 lines)
30	COWS_DESC= Install a collection of cowsay(1) cows	30	COWS_DESC= Install a collection of cowsay(1) cows
31		31
32	post-patch:	32	post-patch:
33	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \	33	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
34	${WRKSRC}/${PORTNAME}.py ${WRKSRC}/irssi/${PORTNAME}.pl	34	${WRKSRC}/${PORTNAME}.py ${WRKSRC}/irssi/${PORTNAME}.pl
35		35
36	do-install:	36	do-install:




.endif

post-patch:
	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
		-e "s,%%RUNDIR%%,${RUNDIR}," \
		-e "s,%%USERS%%,${USERS}," \
		-e "s,%%GROUPS%%,${GROUPS}," \
		-e "s,%%LOGDIR%%,${LOGDIR}," ${WRKSRC}/include/config.h
	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
		-e "s,%%LOGDIR%%,${LOGDIR}," ${WRKSRC}/doc/example.conf
	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/ircd.c
	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/modules.c
	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/s_conf.c
	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/url.c
.if defined(WITH_SQLMOD)
	@${PATCH} -d ${WRKSRC} < ${WRKSRC}/SQLMod/patch
.endif
	@${REINPLACE_CMD} -e "/Your system does not support IPv6/ s|as_fn_error|echo|" ${WRKSRC}/configure

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${STAGEDIR}${PREFIX}/libexec/ircd




PORTVERSION=	19990714
PORTREVISION=	5
CATEGORIES=	japanese
MASTER_SITES=	http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
		http://www.bcit-broadcast.com/monash/ \
		ftp://ftp.mirrorservice.org/sites/ftp.cc.monash.edu.au/pub/nihongo/ \
		ftp://ftp.edrdg.org/pub/Nihongo/ \

		ftp://ftp.funet.fi/pub/culture/japan/mirrors/monash/pub/nihongo/ \
		ftp://ftp.uni-duisburg.de/Mirrors/ftp.monash.edu.au/pub/nihongo/ \
		ftp://ftp.monash.edu.au/pub/nihongo/
DISTFILES=	${DICTFILES} \
		${SRCFILES} \
		${DOCFILES}
DIST_SUBDIR=	edict
EXTRACT_ONLY=	${SRCFILES}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Japanese-English dictionaries with access and maintenance utilities

LICENSE=	GPLv1
LICENSE_FILE=	${WRKSRC}/gnu_license

DICTFILES=	4jword3_edict.zip aviation.zip compdic.gz concrete.zip \
		ediclsd3.zip edict.gz edicth enamdict.gz findic.zip geodic.gz \
		j_places.gz kanjd212.gz kanjidic.gz lawgledt.zip lingdic.zip \
		mktdic.zip pandpdic.zip
		aviation.zip findic.zip mktdic.zip \
		4jword3_edict.zip concrete.zip

SRCFILES=	xjdic23.tgz

DOCFILES=	4jword3_inf.txt aviation.txt concrete.doc ediclsd3.rme \
		edict_doc.html edicth.doc enamdict_doc.html enamdict_doc.txt \
		findic.doc geodic.doc j_places.inf kanjd212.doc kanjidic.doc \
		lawgldoc.new lingdic.txt mktdic.doc
		findic.doc mktdic.doc 4jword3_inf.txt \
		concrete.doc

BINFILES=	exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen



OPTIONS_DEFINE=	DOCS

post-patch:
	@${GREP} -l '^main' ${WRKSRC}/*.c | ${XARGS} ${REINPLACE_CMD} \
		-e '/argv/s/unsigned//'

do-install:
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin)
	@${MKDIR} ${STAGEDIR}${DATADIR}

	${LN} -s ${PREFIX}/bin/xjdic_sa ${STAGEDIR}${PREFIX}/bin/xjdic
	(cd ${WRKSRC} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \
		romkana.cnv vconj ${STAGEDIR}${DATADIR})
#
# Only 9 dictionaries can be enabled
#
	@${ECHO_CMD} dicdir ${DATADIR} > ${STAGEDIR}${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile edict >> ${STAGEDIR}${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile enamdict >> ${STAGEDIR}${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile compdic >> ${STAGEDIR}${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile ediclsd3 >> ${STAGEDIR}${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile j_places >> ${STAGEDIR}${DATADIR}/.xjdicrc
	# @${ECHO_CMD} dicfile lawgledt >> ${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile geodic >> ${STAGEDIR}${DATADIR}/.xjdicrc
	# @${ECHO_CMD} dicfile pandpdic >> ${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile aviation >> ${STAGEDIR}${DATADIR}/.xjdicrc
	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc
	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc
	@${ECHO_CMD} dicfile 4jword3_edict.euc >> ${STAGEDIR}${DATADIR}/.xjdicrc
	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc
	@${CHMOD} ${SHAREMODE} ${STAGEDIR}${DATADIR}/.xjdicrc
	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${STAGEDIR}${PREFIX}/man/man1
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 9-14 Link Here

(-)japanese/edict/files/patch-exjdxgen.c (+9 lines)
9	#include <ctype.h>	9	#include <ctype.h>
10	#include <string.h>	10	#include <string.h>
11	#include "xjdic.h"	11	#include "xjdic.h"
		12	@@ -68,7 +68,7 @@ int stringcomp(unsigned char s1, unsigned char s2)
		13	/====function to Load Dictionary and load/create index table=======/
		14	main(argc,argv)
		15	int argc;
		16	-unsigned char **argv;
		17	+ char **argv;
		18	{
		19	FILE fp,fopen();
		20	unsigned long schi,diclen,indlen;
12	@@ -229,6 +229,7 @@ unsigned char **argv;	21	@@ -229,6 +229,7 @@ unsigned char **argv;
13	jindex[0] = diclen+jiver;	22	jindex[0] = diclen+jiver;
14	fwrite(jindex,sizeof(long),indptr+2,fp);	23	fwrite(jindex,sizeof(long),indptr+2,fp);




--- xjdfrontend.c.orig	1998-09-16 00:28:03 UTC
+++ xjdfrontend.c
@@ -55,6 +55,8 @@ IOCTL_RAW
 
 #ifdef __STRICT_BSD__
 static struct sgttyb    orig,new;

 #else
 static struct termio    orig,new;
 #endif
@@ -240,6 +242,11 @@ void    ioctlraw()
     ioctl(0, TIOCGETP, &orig); ioctl(0, TIOCGETP, &new);
     new.sg_flags |= CBREAK; new.sg_flags &= ~ECHO;
     ioctl(0, TIOCSETP, &new);

 #else
     ioctl(0, TCGETA, &orig); ioctl(0, TCGETA, &new);
     new.c_lflag &= ~ICANON; new.c_lflag &= ~ISIG; new.c_lflag &= ~ECHO;
@@ -255,6 +262,8 @@ void    ioctlorig()
 {
 #ifdef __STRICT_BSD__
    ioctl(0, TIOCSETP, &orig);

 #else
    ioctl(0, TCSETA, &orig);
 #endif
@@ -2519,7 +2528,7 @@ void FiltSet()
 
 main(argc,argv)
 int argc;
-unsigned char **argv;
+ char **argv;
 
 {
 	int i,j,ip,cmdmode,bit8,escf;

Lines 1-5 Link Here

(-)japanese/edict/files/patch-xjdic.h (-2 / +2 lines)
1	--- xjdic.h.orig Thu Sep 3 02:05:28 1998	1	--- xjdic.h.orig 1998-09-03 09:05:28 UTC
2	+++ xjdic.h Wed Oct 7 11:55:52 1998	2	+++ xjdic.h
3	@@ -3,7 +3,7 @@	3	@@ -3,7 +3,7 @@
4	#define NRKANA 2502 / size of the romaji to kana tables*/	4	#define NRKANA 2502 / size of the romaji to kana tables*/
5	#define NOFILT 10 /* maximum number of general filters */	5	#define NOFILT 10 /* maximum number of general filters */

Lines 9-14 Link Here

(-)japanese/edict/files/patch-xjdxgen.c (+9 lines)
9	#include <ctype.h>	9	#include <ctype.h>
10	#include <string.h>	10	#include <string.h>
11	#include "xjdic.h"	11	#include "xjdic.h"
		12	@@ -76,7 +76,7 @@ int stringcomp(unsigned char s1, unsigned char s2)
		13	/====function to Load Dictionary and load/create index table=======/
		14	main(argc,argv)
		15	int argc;
		16	-unsigned char **argv;
		17	+ char **argv;
		18	{
		19	FILE fp,fopen();
		20	unsigned long possav,schi,diclen,indlen;
12	@@ -154,7 +154,7 @@ unsigned char **argv;	21	@@ -154,7 +154,7 @@ unsigned char **argv;
13	db[diclen] = 10;	22	db[diclen] = 10;
14	db[0] = 10;	23	db[0] = 10;

Lines 41-48 CXXFLAGS:= ${CXXFLAGS:N-mretpoline} Link Here

(-)lang/gcc9/Makefile (+7 lines)
41		41
42	OPTIONS_DEFINE= BOOTSTRAP GRAPHITE PLUGINS	42	OPTIONS_DEFINE= BOOTSTRAP GRAPHITE PLUGINS
43	OPTIONS_DEFAULT= BOOTSTRAP PLUGINS	43	OPTIONS_DEFAULT= BOOTSTRAP PLUGINS
		44	OPTIONS_DEFINE_amd64= SANITIZER
		45	OPTIONS_DEFAULT_amd64= SANITIZER
44	BOOTSTRAP_DESC= Build using a full bootstrap	46	BOOTSTRAP_DESC= Build using a full bootstrap
45	GRAPHITE_DESC= Support for Graphite loop optimizations	47	GRAPHITE_DESC= Support for Graphite loop optimizations
		48	SANITIZER_DESC= Build and install libsanitizer
46		49
47	.if exists(/usr/lib32/libc.so)	50	.if exists(/usr/lib32/libc.so)
48	OPTIONS_DEFINE_amd64+= MULTILIB	51	OPTIONS_DEFINE_amd64+= MULTILIB
Lines 59-64 PLUGINS_CONFIGURE_ENABLE= plugin Link Here
59		62
60	.include <bsd.port.pre.mk>	63	.include <bsd.port.pre.mk>
61		64
		65	.if ${PORT_OPTIONS:MSANITIZER}
		66	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-libsanitizer_configure.tgt
		67	.endif
		68
62	.if ${ARCH} == amd64	69	.if ${ARCH} == amd64
63	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	70	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
64		71




# $FreeBSD$

PORTNAME=	gjs
PORTVERSION=	1.66.0
PORTREVISION=	4
CATEGORIES=	lang gnome
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome3

LICENSE_FILE_MPL11=	${WRKSRC}/COPYING
LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LGPL

LIB_DEPENDS=	libmozjs-78.so:lang/spidermonkey78 \
		libffi.so:devel/libffi

USES=		compiler:c++17-lang gettext gmake gnome libtool \
		localbase pathfix pkgconfig python:build readline tar:xz xorg meson
USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection glib20
USE_XORG=	x11 xext
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
CONFIGURE_ARGS+=--disable-profiler
USE_LDCONFIG=	yes

MESON_ARGS=	-Dinstalled_tests=false

CONFIGURE_ENV=	PYTHONDONTWRITEBYTECODE=1
MAKE_ENV=	PYTHONDONTWRITEBYTECODE=1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)lang/gjs/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539116944	1	TIMESTAMP = 1600144389
2	SHA256 (gnome3/gjs-1.52.4.tar.xz) = 9c160cf9383ca20fcba3b75154c9d19efae9decf63bec6164a81403092d3b4f7	2	SHA256 (gnome3/gjs-1.66.0.tar.xz) = f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
3	SIZE (gnome3/gjs-1.52.4.tar.xz) = 626960	3	SIZE (gnome3/gjs-1.66.0.tar.xz) = 439596




bin/gjs-console
include/gjs-1.0/gjs/context.h
include/gjs-1.0/gjs/coverage.h
include/gjs-1.0/gjs/error-types.h
include/gjs-1.0/gjs/gjs.h
include/gjs-1.0/gjs/macros.h
include/gjs-1.0/gjs/mem.h
include/gjs-1.0/gjs/profiler.h
include/gjs-1.0/util/error.h
lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib
lib/libgjs.so
lib/libgjs.so.0

Lines 57-63 post-patch: Link Here

(-)lang/lua52/Makefile (-1 / +1 lines)
57	@${REINPLACE_CMD} -e "/LUA_ROOT/s\|/usr/local\|${LUA_PREFIX}\| ; \	57	@${REINPLACE_CMD} -e "/LUA_ROOT/s\|/usr/local\|${LUA_PREFIX}\| ; \
58	s,readline/,editline/,g ; \	58	s,readline/,editline/,g ; \
59	/history\.h/d" \	59	/history\.h/d" \
60	${WRKSRC}/src/luaconf.h ${WRKSRC}/src/lua.c	60	${WRKSRC}/src/lua.c
61		61
62	post-install:	62	post-install:
63	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblua-${LUA_VER}.so	63	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblua-${LUA_VER}.so




.endif

post-patch:
.if ${LOCALBASE} != "/usr/local"
	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
.endif
.if !defined(IAMDEFAULTPERL)
	${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
		/^if.*nopods.*versiononly || /s/.*/if (1) {/' \
		${WRKSRC}/installperl
.endif
.if ${ARCH} == "riscv64"
	${REINPLACE_CMD} -e 's/-DHAS_FPSETMASK //' ${WRKSRC}/hints/freebsd.sh
.endif

post-install:
	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \





DEPRECATED=	EOLed upstream
EXPIRATION_DATE=	2020-12-31
BROKEN=		Deprecated

USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
PATHFIX_MAKEFILEIN=	Makefile.pre.in

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
		${WRKSRC}/Lib/cgi.py
	@${REINPLACE_CMD} -e \
		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
		${PATCH_WRKSRC}/Lib/pydoc.py

.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \

Lines 1-6 Link Here

(-)lang/python27/files/patch-Doc__library__fcntl.rst (-3 / +3 lines)
1	--- ./Doc/library/fcntl.rst.orig 2014-07-03 21:53:41.473098625 +1000	1	--- Doc/library/fcntl.rst.orig 2019-10-19 18:38:44 UTC
2	+++ ./Doc/library/fcntl.rst 2014-07-03 21:54:04.342833056 +1000	2	+++ Doc/library/fcntl.rst
3	@@ -50,7 +50,6 @@ The module defines the following functio	3	@@ -52,7 +52,6 @@ The module defines the following functions:
4	operations are typically defined in the library module :mod:`termios` and the	4	operations are typically defined in the library module :mod:`termios` and the
5	argument handling is even more complicated.	5	argument handling is even more complicated.
6		6

Lines 3-10 Link Here

(-)lang/python27/files/patch-Lib_distutils_command_build__scripts.py (-2 / +2 lines)
3	# installation.	3	# installation.
4	# Submitted by: mva	4	# Submitted by: mva
5		5
6	--- Lib/distutils/command/build_scripts.py.orig 2014-07-26 09:52:20.000000000 UTC	6	--- Lib/distutils/command/build_scripts.py.orig 2019-10-19 18:38:44 UTC
7	+++ Lib/distutils/command/build_scripts.py 2014-07-26 09:52:56.000000000 UTC	7	+++ Lib/distutils/command/build_scripts.py
8	@@ -126,6 +126,9 @@ class build_scripts (Command):	8	@@ -126,6 +126,9 @@ class build_scripts (Command):
9	file, oldmode, newmode)	9	file, oldmode, newmode)
10	os.chmod(file, newmode)	10	os.chmod(file, newmode)




Should solve issue 20397, where using the --record argument results
in files that failed to generate bytecode files are added to the
record file nonetheless.
--- Lib/distutils/command/install_lib.py.orig	2019-10-19 18:38:44 UTC
 Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
 Lib/distutils/tests/test_install_lib.py |  8 ++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

--- Lib/distutils/command/install_lib.py.orig	2015-12-05 19:46:56 UTC
+++ Lib/distutils/command/install_lib.py
@@ -168,10 +168,14 @@ class install_lib(Command):
             ext = os.path.splitext(os.path.normcase(py_file))[1]




Should solve issue 20397, where using the --record argument results
in files that failed to generate bytecode files are added to the
record file nonetheless.
--- Lib/distutils/tests/test_install_lib.py.orig	2019-10-19 18:38:44 UTC
 Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
 Lib/distutils/tests/test_install_lib.py |  8 ++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

--- Lib/distutils/tests/test_install_lib.py.orig	2015-12-05 19:46:57 UTC
+++ Lib/distutils/tests/test_install_lib.py
@@ -64,8 +64,12 @@ class InstallLibTestCase(support.TempdirManager,
         cmd.distribution.packages = [pkg_dir]
         cmd.distribution.script_name = 'setup.py'
 




# PR: ports/149167 ports/184517
# Patch by: cognet@ (to be upstreamed @ LLVM)

--- Modules/_ctypes/libffi/src/arm/ffi.c.orig	2019-10-19 18:38:44 UTC
+++ Modules/_ctypes/libffi/src/arm/ffi.c
@@ -33,6 +33,11 @@
 
 #include <stdlib.h>

 /* Forward declares. */
 static int vfp_type_p (ffi_type *);
 static void layout_vfp_args (ffi_cif *);
@@ -750,6 +755,16 @@ ffi_closure_free (void *ptr)
 }
 
 #else
+
+#if defined(__FreeBSD__) && defined(__arm__)
+#define __clear_cache(start, end) do { \
+		struct arm_sync_icache_args ua; 		\

+		sysarch(ARM_SYNC_ICACHE, &ua);			\
+	} while (0);
+#endif
 
 #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)				\
 ({ unsigned char *__tramp = (unsigned char*)(TRAMP);			\
    unsigned int  __fun = (unsigned int)(FUN);				\




--- Modules/fcntlmodule.c.orig	2019-10-19 18:38:44 UTC
+++ Modules/fcntlmodule.c
@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *args)
 {
 #define IOCTL_BUFSZ 1024
     int fd;

     int arg;
     int ret;
     char *str;
@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
     int mutate_arg = 1;
     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
 

                          conv_descriptor, &fd, &code,
                          &str, &len, &mutate_arg)) {
         char *arg;
@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
     }
 
     PyErr_Clear();

                          conv_descriptor, &fd, &code, &str, &len)) {
         if (len > IOCTL_BUFSZ) {
             PyErr_SetString(PyExc_ValueError,
@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
     PyErr_Clear();
     arg = 0;
     if (!PyArg_ParseTuple(args,




# in include/python2.7/pyconfig.h
# Submitted by: antoine

--- configure.orig	2019-10-19 18:38:44 UTC
+++ configure
@@ -3007,13 +3007,6 @@ $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
 
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables

 # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
 
 $as_echo "#define _BSD_TYPES 1" >>confdefs.h
@@ -3394,9 +3387,8 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
   # but used in struct sockaddr.sa_family. Reported by Tim Rice.
   SCO_SV/3.2)
     define_xopen_source=no;;

     define_xopen_source=no;;
   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if
   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
--- configure.ac.orig	2019-10-19 18:38:44 UTC
+++ configure.ac
@@ -91,11 +91,6 @@ AC_DEFINE(_GNU_SOURCE, 1, [Define on Linux to activate
 AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables

 # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
 AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
 
@@ -444,9 +439,8 @@ case $ac_sys_system/$ac_sys_release in
   # but used in struct sockaddr.sa_family. Reported by Tim Rice.
   SCO_SV/3.2)
     define_xopen_source=no;;





# Description: ossaudiodev detection fix backport

--- setup.py.orig	2019-10-19 18:38:44 UTC
+++ setup.py
@@ -15,6 +15,7 @@ from distutils.core import Extension, setup
 from distutils.command.build_ext import build_ext
 from distutils.command.install import install
 from distutils.command.install_lib import install_lib

 
 def add_dir_to_list(dirlist, dir):
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
@@ -1280,7 +1281,7 @@ class PyBuildExt(build_ext):
                 sysroot = macosx_sdk_root()
                 f = os.path.join(sysroot, f[1:])
 

             data = open(f).read()
             m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
             if m is not None:
@@ -1665,9 +1666,10 @@ class PyBuildExt(build_ext):
         else:
             missing.append('linuxaudiodev')
 

             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
         else:
             missing.append('ossaudiodev')
@@ -2290,6 +2292,22 @@ class PyBuildInstallLib(install_lib):
     def is_chmod_supported(self):
         return hasattr(os, 'chmod')
 

 SUMMARY = """
 Python is an interpreted, interactive, object-oriented programming
 language. It is often compared to Tcl, Perl, Scheme or Java.
@@ -2335,7 +2353,9 @@ def main():
           platforms = ["Many"],
 
           # Build info

                       'install_lib':PyBuildInstallLib},
           # The struct module is defined here, because build_ext won't be
           # called unless there's at least one extension module defined.
@@ -2343,8 +2363,7 @@ def main():
 
           # Scripts to install
           scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',

Lines 17-22 LIB_DEPENDS= libnspr4.so:devel/nspr \ Link Here

(-)lang/spidermonkey52/Makefile (+1 lines)
17	libffi.so:devel/libffi \	17	libffi.so:devel/libffi \
18	libicudata.so:devel/icu	18	libicudata.so:devel/icu
19		19
		20	BROKEN= Needs python2
20	HAS_CONFIGURE= yes	21	HAS_CONFIGURE= yes
21	USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \	22	USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \
22	python:2.7,build tar:xz	23	python:2.7,build tar:xz

Lines 14-27 COMMENT= Standalone JavaScript based from Mozilla 60-esr Link Here

(-)lang/spidermonkey60/Makefile (-2 / +7 lines)
14	LICENSE= MPL20	14	LICENSE= MPL20
15	LICENSE_FILE= ${WRKSRC}/LICENSE	15	LICENSE_FILE= ${WRKSRC}/LICENSE
16		16
17	BUILD_DEPENDS= autoconf-2.13:devel/autoconf213	17	BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \
		18	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
		19
18	LIB_DEPENDS= libnspr4.so:devel/nspr \	20	LIB_DEPENDS= libnspr4.so:devel/nspr \
19	libffi.so:devel/libffi \	21	libffi.so:devel/libffi \
20	libicudata.so:devel/icu	22	libicudata.so:devel/icu
21		23
22	HAS_CONFIGURE= yes	24	HAS_CONFIGURE= yes
23	USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \	25	USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \
24	python:2.7,build tar:xz	26	python:build tar:xz
25	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
26	SP_VER= 60	28	SP_VER= 60
27		29
Lines 58-63 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} Link Here
58	USE_GCC= 9+	60	USE_GCC= 9+
59	.endif	61	.endif
60		62
		63	post-patch:
		64	${REINPLACE_CMD} 's\|%%PYTHON_CMD%%\|${PYTHON_CMD}\|g' ${WRKSRC}/js/src/configure
		65
61	post-install:	66	post-install:
62	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs	67	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
63	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1	68	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1

Lines 24-30 LIB_DEPENDS= libnspr4.so:devel/nspr \ Link Here

(-)lang/spidermonkey68/Makefile (-1 / +1 lines)
24	libicudata.so:devel/icu	24	libicudata.so:devel/icu
25		25
26	USES= compiler gmake localbase pathfix pkgconfig \	26	USES= compiler gmake localbase pathfix pkgconfig \
27	python:2.7,build tar:xz	27	python:build tar:xz
28	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
29	SP_VER= 68	29	SP_VER= 68
30	HAS_CONFIGURE= yes	30	HAS_CONFIGURE= yes

Lines 1-7 Link Here

(-)lang/spidermonkey78/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= spidermonkey	3	PORTNAME= spidermonkey
4	DISTVERSION= 78.2.0	4	DISTVERSION= 78.3.0
5	CATEGORIES= lang	5	CATEGORIES= lang
6	MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source	6	MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source
7	PKGNAMESUFFIX= ${SP_VER}	7	PKGNAMESUFFIX= ${SP_VER}

Lines 1-3 Link Here

(-)lang/spidermonkey78/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1600105157	1	TIMESTAMP = 1600826847
2	SHA256 (firefox-78.2.0esr.source.tar.xz) = 965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918	2	SHA256 (firefox-78.3.0esr.source.tar.xz) = 85273e22d6c31ccd000d72af47530cea3dc52f63f06e53701d9c6c82f68f7bf7
3	SIZE (firefox-78.2.0esr.source.tar.xz) = 331996944	3	SIZE (firefox-78.3.0esr.source.tar.xz) = 331073228

Lines 33-41 post-patch: Link Here

(-)mail/proxsmtp/Makefile (-3 lines)
33	-e 's\|250 smtp.passthru\|${PROXSMTP_HELO_RSP}\|g' \	33	-e 's\|250 smtp.passthru\|${PROXSMTP_HELO_RSP}\|g' \
34	-e 's\|250-smtp.passthru\|${PROXSMTP_SMTP_EHLO_RSP}\|g' \	34	-e 's\|250-smtp.passthru\|${PROXSMTP_SMTP_EHLO_RSP}\|g' \
35	${WRKSRC}/common/smtppass.c	35	${WRKSRC}/common/smtppass.c
36	@${REINPLACE_CMD} -e \
37	'/^acx_pthread_flags/s\|=.*\|="-lpthread"\|' \
38	${WRKSRC}/configure
39		36
40	post-install:	37	post-install:
41	(cd ${WRKSRC}/doc && ${INSTALL_DATA} proxsmtpd.conf \	38	(cd ${WRKSRC}/doc && ${INSTALL_DATA} proxsmtpd.conf \

Lines 17-22 LIB_DEPENDS= libAnalitza.so:math/analitza \ Link Here

(-)math/cantor/Makefile (+2 lines)
17	BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \	17	BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
18	docbook-xml>0:textproc/docbook-xml	18	docbook-xml>0:textproc/docbook-xml
19		19
		20	MAKE_JOBS_UNSAFE= yes
		21
20	USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \	22	USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
21	pkgconfig python:3.4+ qt:5 tar:xz	23	pkgconfig python:3.4+ qt:5 tar:xz
22	USE_KDE= attica auth archive bookmarks codecs completion config \	24	USE_KDE= attica auth archive bookmarks codecs completion config \

Lines 15-20 LIB_DEPENDS+= librtmidi.so:audio/rtmidi Link Here

(-)math/octave-forge-audio/Makefile (+3 lines)
15		15
16	USES= compiler:c++11-lang pkgconfig	16	USES= compiler:c++11-lang pkgconfig
17		17
		18	LICENSE= GPLv2
		19	LICENSE_FILE= ${WRKSRC}/../COPYING
		20
18	# OCTSRC is the name of the directory of the package.	21	# OCTSRC is the name of the directory of the package.
19	# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.	22	# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
20	OCTSRC= ${DISTNAME}	23	OCTSRC= ${DISTNAME}

Lines 3-8 Link Here

(-)math/py-mpmath/Makefile (+2 lines)
3		3
4	PORTNAME= mpmath	4	PORTNAME= mpmath
5	PORTVERSION= 1.1.0	5	PORTVERSION= 1.1.0
		6	PORTREVISION= 1
6	CATEGORIES= math python	7	CATEGORIES= math python
7	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 13-18 COMMENT= Python Library for Arbitrary-precision Floating-point Arithmetic Link Here
13	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
14		15
15	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${PY_FLAVOR}	16	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${PY_FLAVOR}
		17	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${PY_FLAVOR}
16		18
17	USES= python	19	USES= python
18	USE_PYTHON= distutils autoplist	20	USE_PYTHON= distutils autoplist

Lines 14-20 USES= gmake Link Here

(-)math/reed-solomon/Makefile (-3 lines)
14	USE_LDCONFIG= yes	14	USE_LDCONFIG= yes
15	MAKEFILE= makefile	15	MAKEFILE= makefile
16		16
17	post-patch:
18	@${REINPLACE_CMD} -e 's\|gcc\|${CC}\|' ${WRKSRC}/makefile.in
19
20	.include <bsd.port.mk>	17	.include <bsd.port.mk>

Lines 31-37 NLS_VARS= CONFIGURE_FAIL_MESSAGE="Rebuild lang/${PERL_PORT} and devel/p5-Locale Link Here

(-)misc/help2man/Makefile (-1 / +1 lines)
31	NLS_VARS_OFF= NO_ARCH=yes	31	NLS_VARS_OFF= NO_ARCH=yes
32		32
33	.for lang in de es fr pl pt_BR sv ta uk zh_CN	33	.for lang in de es fr pl pt_BR sv ta uk zh_CN
34	NLS_INFO+= help2man-${lang}	34	NLS_INFO+= help2man-${lang}
35	.endfor	35	.endfor
36		36
37	.for lang in da de el eo es fi fr hr hu it ja nb pl pt_BR ru sr sv ta uk vi zh_CN	37	.for lang in da de el eo es fi fr hr hu it ja nb pl pt_BR ru sr sv ta uk vi zh_CN





LICENSE=	GPLv3+

USES=		dos2unix gmake tar:tgz
DOS2UNIX_FILES=	JDebug.cpp JDebug.h JDefs.h JDiff.cpp JDiff.h JFile.h \
		JFileAhead.cpp JFileAhead.h JFileIStream.cpp JFileIStream.h \
		JFileIStreamAhead.cpp JFileIStreamAhead.h JHashPos.cpp \
		JHashPos.h JMatchTable.cpp JMatchTable.h JOut.h JOutAsc.cpp \
		JOutAsc.h JOutBin.cpp JOutBin.h JOutRgn.cpp JOutRgn.h \
		jpatch.cpp Makefile
MAKE_ARGS=	CC="${CC}" \
		CFLAGS="${CFLAGS}" \
		CPP="${CXX}"
WRKSRC_SUBDIR=	src

PLIST_FILES=	bin/jdiff \
		bin/jptch
PORTDOCS=	readme.htm readme.txt

OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} -E 's,P(RI|8)(zd|hkey), & ,g' \
		${WRKSRC}/JFileAhead.cpp ${WRKSRC}/JFileIStreamAhead.cpp \
		${WRKSRC}/JHashPos.cpp ${WRKSRC}/JOutAsc.cpp \
		${WRKSRC}/JOutRgn.cpp ${WRKSRC}/jpatch.cpp \
		${WRKSRC}/main.cpp
	@${REINPLACE_CMD} -e 's,is %d bit,is %zu bit,' \
		${WRKSRC}/jpatch.cpp ${WRKSRC}/main.cpp

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/j???? ${STAGEDIR}${PREFIX}/bin






PORTNAME=	libkate
PORTVERSION=	0.4.1
PORTREVISION=	11
CATEGORIES=	multimedia
MASTER_SITES=	http://downloads.xiph.org/releases/kate/


CFLAGS+=	"-I${LOCALBASE}/include"

MANPAGE=	katalyzer.1 kateenc.1 katedec.1
OPTIONS_DEFINE=	DOXYGEN HTMLDOCS DOCS

HTMLDOCS_DESC=	Install bundled html documentation
KATEDJ_DESC=	Install KateDJ (Huge dependencies list)

PORTDOCS=	*


CONFIGURE_ARGS+=	--disable-doc
.endif

.if ${PORT_OPTIONS:MKATEDJ}
RUN_DEPENDS=	${LOCALBASE}/bin/oggz:audio/liboggz
USES+=		python:2.7 shebangfix
SHEBANG_FILES=	tools/KateDJ/KateDJ
USE_WX=		3.0+
WX_COMPS=	wx python:lib
MANPAGE+=	KateDJ.1
PLIST_SUB+=	KATEDJ=""
.else
PLIST_SUB+=	KATEDJ="@comment "
.endif

post-patch:
.if ${PORT_OPTIONS:MKATEDJ}
	@${REINPLACE_CMD} -e 's|PYTHON=python|PYTHON=${PYTHON_CMD}|' \
		${WRKSRC}/misc/autotools/py-compile
.else
	@${REINPLACE_CMD} -e \
		"s|  HAVE_PYTHON_TRUE=$$|  HAVE_PYTHON_TRUE='#'|; \
			s|  HAVE_PYTHON_FALSE='#'$$|  HAVE_PYTHON_FALSE=|" \
		${WRKSRC}/configure
.endif

	@${REINPLACE_CMD} -E -e \
		"s|^(install-data-am: ).*|\1|" \




%%KATEDJ%%bin/KateDJ
bin/katalyzer
bin/katedec
bin/kateenc

man/man1/katalyzer.1.gz
man/man1/katedec.1.gz
man/man1/kateenc.1.gz
%%KATEDJ%%man/man1/KateDJ.1.gz
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyo
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.py
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyc
%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyo

Lines 14-20 COMMENT= Flexible Communications Framework Link Here

(-)net-im/libtelepathy/Makefile (-1 / +1 lines)
14	LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib \	14	LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib \
15	libdbus-glib-1.so:devel/dbus-glib	15	libdbus-glib-1.so:devel/dbus-glib
16		16
17	USES= gmake gnome libtool pathfix pkgconfig python:2.7,build	17	USES= gmake gnome libtool pathfix pkgconfig python:build
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19	USE_GNOME= glib20 libxslt:build	19	USE_GNOME= glib20 libxslt:build
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes

Lines 1-7 Link Here

(-)net-im/purple-slack/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= purple-slack	3	PORTNAME= purple-slack
4	PORTVERSION= 20180508	4	PORTVERSION= 20200506
5	CATEGORIES= net-im	5	CATEGORIES= net-im
6		6
7	MAINTAINER= aou@eecs.berkeley.edu	7	MAINTAINER= aou@eecs.berkeley.edu
Lines 20-26 USE_LDCONFIG= yes Link Here
20	USE_GITHUB= yes	20	USE_GITHUB= yes
21	GH_ACCOUNT= dylex	21	GH_ACCOUNT= dylex
22	GH_PROJECT= slack-libpurple	22	GH_PROJECT= slack-libpurple
23	GH_TAGNAME= 0179b2c	23	GH_TAGNAME= 03ac750
24		24
25	PLIST_FILES= lib/purple-2/libslack.so \	25	PLIST_FILES= lib/purple-2/libslack.so \
26	share/pixmaps/pidgin/protocols/16/slack.png \	26	share/pixmaps/pidgin/protocols/16/slack.png \

Lines 1-3 Link Here

(-)net-im/purple-slack/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1526319813	1	TIMESTAMP = 1588779488
2	SHA256 (dylex-slack-libpurple-20180508-0179b2c_GH0.tar.gz) = 7bcd47a8ac817bb8230764ff7a8048768ebd3a00dab48b322f7ec67204f51697	2	SHA256 (dylex-slack-libpurple-20200506-03ac750_GH0.tar.gz) = 77feab161b051e907c123ee2e3ddbf03f48ce62fd6e5b5c0a5fd95fd8627fb0a
3	SIZE (dylex-slack-libpurple-20180508-0179b2c_GH0.tar.gz) = 49883	3	SIZE (dylex-slack-libpurple-20200506-03ac750_GH0.tar.gz) = 54044

Lines 28-34 RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ Link Here

(-)net-im/telepathy-gabble/Makefile (-1 / +1 lines)
28		28
29	PORTSCOUT= limitw:1,even	29	PORTSCOUT= limitw:1,even
30		30
31	USES= alias gmake gnome libtool pathfix pkgconfig python:2.7,build \	31	USES= alias gmake gnome libtool pathfix pkgconfig python:build \
32	shebangfix sqlite ssl	32	shebangfix sqlite ssl
33	USE_GNOME= glib20 gtksourceview3 libxslt:build	33	USE_GNOME= glib20 gtksourceview3 libxslt:build
34	GNU_CONFIGURE= yes	34	GNU_CONFIGURE= yes

Lines 1-2 Link Here

(-)net-im/telepathy-gabble/distinfo (+1 lines)
		1	TIMESTAMP = 1600948310
1	SHA256 (telepathy-gabble-0.18.3.tar.gz) = 8ec714607e9bcb8d5a3f44adf871e7b07d5db8e326e47536e74e09cba59989c2	2	SHA256 (telepathy-gabble-0.18.3.tar.gz) = 8ec714607e9bcb8d5a3f44adf871e7b07d5db8e326e47536e74e09cba59989c2
2	SIZE (telepathy-gabble-0.18.3.tar.gz) = 2793195	3	SIZE (telepathy-gabble-0.18.3.tar.gz) = 2793195

Lines 1-6 Link Here

(-)net-im/telepathy-gabble/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig 2010-09-18 17:29:38.000000000 +0000	1	--- Makefile.in.orig 2020-09-24 11:51:08 UTC
2	+++ Makefile.in 2010-09-18 17:29:53.000000000 +0000	2	+++ Makefile.in
3	@@ -267,7 +267,7 @@	3	@@ -349,7 +349,7 @@ top_build_prefix = @top_build_prefix@
4	top_builddir = @top_builddir@	4	top_builddir = @top_builddir@
5	top_srcdir = @top_srcdir@	5	top_srcdir = @top_srcdir@
6	ACLOCAL_AMFLAGS = -I m4	6	ACLOCAL_AMFLAGS = -I m4

Lines 1-6 Link Here

(-)net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c (-4 / +4 lines)
1	--- lib/gibber/gibber-unix-transport.c.orig 2010-06-09 16:09:58.000000000 +0000	1	--- lib/gibber/gibber-unix-transport.c.orig 2013-10-04 15:51:47 UTC
2	+++ lib/gibber/gibber-unix-transport.c 2010-09-18 21:24:44.000000000 +0000	2	+++ lib/gibber/gibber-unix-transport.c
3	@@ -375,6 +375,167 @@ gibber_unix_transport_recv_credentials (	3	@@ -374,6 +374,167 @@ gibber_unix_transport_recv_credentials (GibberUnixTran
4	return TRUE;	4	return TRUE;
5	}	5	}
6		6
Lines 168-174 Link Here
168	#else /* OSs where we have no implementation */	168	#else /* OSs where we have no implementation */
169		169
170	gboolean	170	gboolean
171	@@ -393,9 +554,7 @@ gibber_unix_transport_recv_credentials (	171	@@ -392,9 +553,7 @@ gibber_unix_transport_recv_credentials (GibberUnixTran
172	}	172	}
173		173
174	gboolean	174	gboolean

Lines 20-26 RUN_DEPENDS= vapigen:lang/vala Link Here

(-)net-im/telepathy-glib/Makefile (-1 / +1 lines)
20		20
21	PORTSCOUT= limitw:1,even	21	PORTSCOUT= limitw:1,even
22		22
23	USES= gmake gnome libtool pathfix pkgconfig python:2.7,build	23	USES= gmake gnome libtool pathfix pkgconfig python:build
24	USE_GNOME= glib20 introspection:build libxslt:build	24	USE_GNOME= glib20 introspection:build libxslt:build
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes

Lines 14-20 COMMENT= IRC Connection Manager for Telepathy Framework Link Here

(-)net-im/telepathy-idle/Makefile (-1 / +1 lines)
14	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \	14	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
15	libtelepathy-glib.so:net-im/telepathy-glib	15	libtelepathy-glib.so:net-im/telepathy-glib
16		16
17	USES= gmake gnome libtool pathfix pkgconfig python:2.7,build ssl	17	USES= gmake gnome libtool pathfix pkgconfig python:build ssl
18	USE_GNOME= glib20 libxslt:build	18	USE_GNOME= glib20 libxslt:build
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	CPPFLAGS+= -I${LOCALBASE}/include	20	CPPFLAGS+= -I${LOCALBASE}/include

Lines 18-24 LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ Link Here

(-)net-im/telepathy-logger/Makefile (-1 / +1 lines)
18	libtelepathy-glib.so:net-im/telepathy-glib	18	libtelepathy-glib.so:net-im/telepathy-glib
19		19
20	USES= gettext-tools gmake gnome libtool pathfix pkgconfig \	20	USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
21	python:2.7,build sqlite tar:bzip2	21	python:build sqlite tar:bzip2
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24	USE_GNOME= glib20 intltool libxml2 \	24	USE_GNOME= glib20 intltool libxml2 \

Lines 1-6 Link Here

(-)net-im/telepathy-logger/files/patch-configure (-3 / +3 lines)
1	--- configure.orig 2010-08-18 14:48:05.000000000 +0200	1	--- configure.orig 2015-04-30 11:32:10 UTC
2	+++ configure 2010-08-18 14:49:13.000000000 +0200	2	+++ configure
3	@@ -13281,8 +13281,8 @@	3	@@ -14348,8 +14348,8 @@ install-data-am: install-gsettings-schemas
4	.SECONDARY: $(gsettings_SCHEMAS)	4	.SECONDARY: $(gsettings_SCHEMAS)
5		5
6	gsettings__base_list = \	6	gsettings__base_list = \




#    $MCom: ports/trunk/net-im/telepathy-mission-control/Makefile 19955 2014-10-15 10:15:00Z gusi $

PORTNAME=	telepathy-mission-control
PORTVERSION=	5.16.6
PORTREVISION=	1
CATEGORIES=	net-im devel
MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-control/

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Telepathy component to apps to abstract details of connection managers

LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib \
		libdbus-glib-1.so:devel/dbus-glib \
		libdbus-1.so:devel/dbus

USES=		gmake gnome libtool pathfix pkgconfig python:build
USE_GNOME=	glib20 libxslt
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include

Lines 1-2 Link Here

(-)net-im/telepathy-mission-control/distinfo (-2 / +3 lines)
1	SHA256 (telepathy-mission-control-5.16.3.tar.gz) = 71575d2ff8aa7337aca355e3d921eba5cd2ff050fabc01e51577343093e98b7d	1	TIMESTAMP = 1600879605
2	SIZE (telepathy-mission-control-5.16.3.tar.gz) = 1096019	2	SHA256 (telepathy-mission-control-5.16.6.tar.gz) = 2df8ae3995e919a7670e01aa3568215ef0777e34961ace1cac1c6477cb297a45
		3	SIZE (telepathy-mission-control-5.16.6.tar.gz) = 1127785




man/man1/mc-tool.1.gz
man/man1/mc-wait-for-name.1.gz
man/man8/mission-control-5.8.gz
%%DOCSDIR%%/mission-control-plugins/McpAccountManager.html
%%DOCSDIR%%/mission-control-plugins/McpDispatchOperation.html
%%DOCSDIR%%/mission-control-plugins/McpDispatchOperationPolicy.html
%%DOCSDIR%%/mission-control-plugins/McpRequest.html
%%DOCSDIR%%/mission-control-plugins/McpRequestPolicy.html
%%DOCSDIR%%/mission-control-plugins/annotation-glossary.html
%%DOCSDIR%%/mission-control-plugins/api-index-full.html
%%DOCSDIR%%/mission-control-plugins/ch01.html
%%DOCSDIR%%/mission-control-plugins/ch02.html
%%DOCSDIR%%/mission-control-plugins/ch03.html
%%DOCSDIR%%/mission-control-plugins/ch04.html
%%DOCSDIR%%/mission-control-plugins/home.png
%%DOCSDIR%%/mission-control-plugins/index.html
%%DOCSDIR%%/mission-control-plugins/left-insensitive.png
%%DOCSDIR%%/mission-control-plugins/left.png
%%DOCSDIR%%/mission-control-plugins/mission-control-plugins-McpAccountStorage.html
%%DOCSDIR%%/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
%%DOCSDIR%%/mission-control-plugins/mission-control-plugins.devhelp2
%%DOCSDIR%%/mission-control-plugins/object-tree.html
%%DOCSDIR%%/mission-control-plugins/right-insensitive.png
%%DOCSDIR%%/mission-control-plugins/right.png
%%DOCSDIR%%/mission-control-plugins/style.css
%%DOCSDIR%%/mission-control-plugins/up-insensitive.png
%%DOCSDIR%%/mission-control-plugins/up.png
share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service

Lines 19-25 LIB_DEPENDS= libavahi-glib.so:net/avahi-app \ Link Here

(-)net-im/telepathy-salut/Makefile (-1 / +1 lines)
19	libsoup-2.4.so:devel/libsoup	19	libsoup-2.4.so:devel/libsoup
20		20
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	USES= gmake gnome libtool pathfix pkgconfig python:2.7,build sqlite ssl	22	USES= gmake gnome libtool pathfix pkgconfig python:build sqlite ssl
23	USE_GNOME= glib20 libxslt:build	23	USE_GNOME= glib20 libxslt:build
24	CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no	24	CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no
25	LDFLAGS+= -lpthread	25	LDFLAGS+= -lpthread

Lines 3-8 Link Here

(-)net-mgmt/netxms/Makefile (+1 lines)
3		3
4	PORTNAME= netxms	4	PORTNAME= netxms
5	PORTVERSION= 2.2.2	5	PORTVERSION= 2.2.2
		6	PORTREVISION= 1
6	CATEGORIES= net-mgmt	7	CATEGORIES= net-mgmt
7	MASTER_SITES= http://www.netxms.org/download/releases/2.2/${PORTVERSION}/	8	MASTER_SITES= http://www.netxms.org/download/releases/2.2/${PORTVERSION}/
8		9

Lines 2-7 Link Here

(-)net-mgmt/rtrlib/Makefile (+1 lines)
2		2
3	PORTNAME= rtrlib	3	PORTNAME= rtrlib
4	PORTVERSION= 0.6.3	4	PORTVERSION= 0.6.3
		5	PORTREVISION= 1
5	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
6	CATEGORIES= net-mgmt sysutils	7	CATEGORIES= net-mgmt sysutils
7		8





PORTNAME=	wmi
PORTVERSION=	1.3.16
PORTREVISION=	3
CATEGORIES=	net-mgmt
MASTER_SITES=	http://dev.zenoss.org/trac/export/26435/trunk/inst/externallibs/ \
		http://www.openvas.org/download/wmi/ \

MAINTAINER=	koichiro@rworks.jp
COMMENT=	DCOM/WMI client implementation

OPTIONS_DEFINE=	PYTHON
PYTHON_DESC=	Build Python bindings

USES=		autoreconf:build gmake iconv tar:bzip2

MAKEFILE=	GNUmakefile


.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MPYTHON}
USES+=		python:2.7
MAKE_ARGS+=	PYTHON="${PYTHON_CMD}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}"
PLIST_SUB+=	PYTHON=""
.else
PLIST_SUB+=	PYTHON="@comment "
.endif

.if !${PORT_OPTIONS:MPYTHON}
do-install:
.for x in ${PROGS}
	@${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}
.endfor
.endif

.include <bsd.port.mk>




bin/winexe
bin/wmic
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0.0.2
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/talloc.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/watcher.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/connect.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/wmic.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/library.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/composite_context.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/ndr.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/Rpc.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/credentials.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/dcerpc.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/rpc_request.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/oxidresolver.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/Query.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/wbem.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/callback.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/reactor.py

Lines 27-33 OPTIONS_DEFINE= DOCS Link Here

(-)net/3proxy/Makefile (-1 lines)
27	3PROXY_LOGDIR= /var/log/${PORTNAME}	27	3PROXY_LOGDIR= /var/log/${PORTNAME}
28		28
29	post-patch:	29	post-patch:
30	@${REINPLACE_CMD} -e 's\|%%CFLAGS%%\|${CFLAGS}\|' ${WRKSRC}/${MAKEFILE}
31	@${REINPLACE_CMD} -e 's\|%%3PROXY_LOGDIR%%\|${3PROXY_LOGDIR}\|' ${WRKSRC}/cfg/3proxy.cfg.sample	30	@${REINPLACE_CMD} -e 's\|%%3PROXY_LOGDIR%%\|${3PROXY_LOGDIR}\|' ${WRKSRC}/cfg/3proxy.cfg.sample
32		31
33	post-build:	32	post-build:




${p}_CONFIGURE_ENABLE=		${p:tl}
.endfor

SED_WRAP_CLOSE=	{ \
		i\\\n \
		\#ifdef SHIM_SYS_SHIM_HELPERS\\\n \
		\#undef close\\\n \
		\#endif\n \
		a\\\n \
		\#ifdef SHIM_SYS_SHIM_HELPERS\\\n \
		\#define close epoll_shim_close\\\n \
		\#endif\n \
		}

post-patch:
	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<asm/types\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<asm/types\.h>|<sys/types.h>|'
	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<malloc\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<malloc\.h>|<stdlib.h>|'
	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<alloca\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<alloca\.h>|<stdlib.h>|'
	@${GREP} -Flr --include='*.c' '.close' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} $$'/\\.close/${SED_WRAP_CLOSE}'
	@${REINPLACE_CMD} $$'/fi_ops.*close/${SED_WRAP_CLOSE}' ${WRKSRC}/src/fabric.c
	@${REINPLACE_CMD} $$'/[*>]close/${SED_WRAP_CLOSE}' ${WRKSRC}/include/rdma/fabric.h

.include <bsd.port.mk>

Lines 2-8 Link Here

(-)net/py-amqp/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= amqp	4	PORTNAME= amqp
5	PORTVERSION= 2.5.2	5	PORTVERSION= 2.6.0
6	CATEGORIES= net python	6	CATEGORIES= net python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)net/py-amqp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1576935968	1	TIMESTAMP = 1591193914
2	SHA256 (amqp-2.5.2.tar.gz) = 77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d	2	SHA256 (amqp-2.6.0.tar.gz) = 24dbaff8ce4f30566bb88976b398e8c4e77637171af3af6f1b9650f48890e60b
3	SIZE (amqp-2.5.2.tar.gz) = 117788	3	SIZE (amqp-2.6.0.tar.gz) = 119679

Lines 2-8 Link Here

(-)net/py-kombu/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kombu	4	PORTNAME= kombu
5	PORTVERSION= 4.6.9	5	PORTVERSION= 4.6.10
6	CATEGORIES= net python	6	CATEGORIES= net python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 13-19 COMMENT= AMQP messaging framework for Python Link Here
13	LICENSE= BSD3CLAUSE	13	LICENSE= BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
15		15
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.5.2<2.6:net/py-amqp@${PY_FLAVOR}	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.6.0:net/py-amqp@${PY_FLAVOR}
17		17
18	USES= python:3.6+	18	USES= python:3.6+
19	USE_PYTHON= autoplist distutils	19	USE_PYTHON= autoplist distutils

Lines 1-3 Link Here

(-)net/py-kombu/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1591096845	1	TIMESTAMP = 1591193664
2	SHA256 (kombu-4.6.9.tar.gz) = aece08f48706743aaa1b9d607fee300559481eafcc5ee56451aa0ef867a3be07	2	SHA256 (kombu-4.6.10.tar.gz) = 437b9cdea193cc2ed0b8044c85fd0f126bb3615ca2f4d4a35b39de7cacfa3c1a
3	SIZE (kombu-4.6.9.tar.gz) = 405851	3	SIZE (kombu-4.6.10.tar.gz) = 406494

Lines 1-6 Link Here

(-)net/remmina-plugin-nx/Makefile (+1 lines)
1	# Created by: Koichiro IWAO <meta+ports@vmeta.jp>	1	# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
		4	PORTREVISION= 1
4	PKGNAMESUFFIX= -nx	5	PKGNAMESUFFIX= -nx
5		6
6	COMMENT= Remmina plugin for NX	7	COMMENT= Remmina plugin for NX

Lines 3-8 Link Here

(-)net/sshping/Makefile (+1 lines)
3		3
4	PORTNAME= sshping	4	PORTNAME= sshping
5	PORTVERSION= 0.1.4	5	PORTVERSION= 0.1.4
		6	PORTREVISION= 1
6	DISTVERSIONPREFIX= v	7	DISTVERSIONPREFIX= v
7	CATEGORIES= net	8	CATEGORIES= net
8		9

Lines 24-33 LDFLAGS+= -L${LOCALBASE} Link Here

(-)net/tinyfugue/Makefile (-4 lines)
24		24
25	PLIST_SUB= DISTNAME=${DISTNAME}	25	PLIST_SUB= DISTNAME=${DISTNAME}
26		26
27	post-patch:
28	${REINPLACE_CMD} 's:@.*dir@:$${DESTDIR}&:' ${WRKSRC}/unix/vars.mak.in
29	${REINPLACE_CMD} '/ln -s/s@(TF)@(TF:T)@' ${WRKSRC}/unix/unix.mak
30
31	post-build:	27	post-build:
32	${STRIP_CMD} ${WRKSRC}/src/tf	28	${STRIP_CMD} ${WRKSRC}/src/tf
33		29

Lines 3-8 Link Here

(-)net/x2goclient/Makefile (+1 lines)
3		3
4	PORTNAME= x2goclient	4	PORTNAME= x2goclient
5	PORTVERSION= 4.1.2.1	5	PORTVERSION= 4.1.2.1
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7	MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/	8	MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/
8		9




PORTNAME=	synth
DISTVERSIONPREFIX=	v
DISTVERSION=	2.08
PORTREVISION=	1
CATEGORIES=	ports-mgmt

MAINTAINER=	ericbsd@FreeBSD.org

LICENSE=	ISCL
LICENSE_FILE=	${WRKSRC}/License.txt

BUILD_DEPENDS=	${GPR}/ini_file_manager.gpr:misc/ini_file_manager \
		${GPR}/ini_file_manager.gpr:misc/ini_file_manager \
		${GPR}/adacurses.gpr:devel/adacurses

USES=		ada:6 ncurses
USE_GITHUB=	yes
GH_ACCOUNT=	jrmarino


Lines 53-60 CONFIGURE_ENV+= EMACS=no Link Here

(-)print/a2ps/Makefile (-2 / +2 lines)
53	.endif	53	.endif
54		54
55	post-patch:	55	post-patch:
56	${REINPLACE_CMD} -e 's\|^DESTDIR\|#DESTDIR\|' \	56	@${REINPLACE_CMD} -e 's\|^DESTDIR\|#DESTDIR\|' \
57	`${FIND} ${WRKSRC} -name "Makefile.in"`	57	${WRKSRC}/ppd/Makefile.in ${WRKSRC}/man/Makefile.in ${WRKSRC}/doc/Makefile.in ${WRKSRC}/contrib/sample/Makefile.in ${WRKSRC}/contrib/emacs/Makefile.in ${WRKSRC}/contrib/Makefile.in ${WRKSRC}/Makefile.in ${WRKSRC}/ps/Makefile.in ${WRKSRC}/fonts/Makefile.in ${WRKSRC}/ogonkify/Makefile.in ${WRKSRC}/ogonkify/m4/Makefile.in ${WRKSRC}/ogonkify/doc/Makefile.in ${WRKSRC}/lib/Makefile.in ${WRKSRC}/auxdir/Makefile.in ${WRKSRC}/m4/Makefile.in ${WRKSRC}/sheets/Makefile.in ${WRKSRC}/encoding/Makefile.in ${WRKSRC}/afm/Makefile.in ${WRKSRC}/etc/Makefile.in ${WRKSRC}/tests/Makefile.in ${WRKSRC}/src/Makefile.in
58		58
59	.if ${PORT_OPTIONS:MI18N}	59	.if ${PORT_OPTIONS:MI18N}
60	#DISTFILES+= ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n	60	#DISTFILES+= ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n




 my $programpath = $1;
-my $printcommand = '/usr/bin/lpr -P ';
-my $egrep = '/bin/egrep';
+my $printcommand = '%%LOCALBASE%%/bin/lpr -P ';
+my $egrep = '/usr/bin/egrep';
 my $cat = '/bin/cat';
 my $cut = '/usr/bin/cut';

-my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:/usr/share/alignmargins:/usr/local/share/alignmargins:/usr/share:/usr/local/share:/usr/share/printer-testpages:/usr/local/share/printer-testpages:/usr/share/ghostscript/*/lib:/usr/local/share/ghostscript/*/lib';
-my $ppddir = '/etc/cups/ppd';
-my $printerconffile = '/etc/cups/printers.conf';
+my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:%%DATADIR%%:%%LOCALBASE%%/share/alignmargins:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/printer-testpages:%%LOCALBASE%%/share/ghostscript/*/lib';
+my $ppddir = '%%LOCALBASE%%/etc/cups/ppd';
+my $printerconffile = '%%LOCALBASE%%/etc/cups/printers.conf';
 
 # Find "ælign.ps"
 





.include <bsd.port.pre.mk>

DEFAULT_SUBPIXEL_MODE=	2
SELECTED_MODE=	\
	r=0; \
	for m in ${SUBPIXEL_HINTING_MODE}; \

	done; \
	${ECHO_CMD} $$r

FINAL_SELECTED_MODE=	${SELECTED_MODE:sh}
pre-patch:
	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
		${WRKSRC}/builds/unix/install.mk

post-patch:
.if defined(SUBPIXEL_HINTING_MODE)
.if ${FINAL_SELECTED_MODE} != ${DEFAULT_SUBPIXEL_MODE}
	@${REINPLACE_CMD} \
		-e 's|^\(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING\).*|\1 \
	${SELECTED_MODE:sh}|' \
		${WRKSRC}/include/freetype/config/ftoption.h
.endif
.else
.if ${FINAL_SELECTED_MODE} != ${DEFAULT_SUBPIXEL_MODE}
	@${REINPLACE_CMD} -i '.hinting.bak' \
		-e 's|^\(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING.*\)|/* \1 */|' \
		${WRKSRC}/include/freetype/config/ftoption.h
.endif
.endif

post-patch-DEBUG-on:
	@${REINPLACE_CMD} \
		-e 's|.*\(#define FT_DEBUG_LEVEL_TRACE\).*|\1|' \
		-e 's|.*\(#define FT_DEBUG_MEMORY\).*|\1|' \
		${WRKSRC}/include/freetype/config/ftoption.h

post-patch-LONG_PCF_NAMES-on:
	@${REINPLACE_CMD} \
		-e 's|.*\(#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES\).*|\1|' \
		${WRKSRC}/include/freetype/config/ftoption.h


		${WRKSRC}/modules.cfg

post-patch-TT_SIZE_METRICS-on:
	@${REINPLACE_CMD} \
		-e 's|.*\(#define AF_CONFIG_OPTION_TT_SIZE_METRICS\).*|\1|' \
		${WRKSRC}/include/freetype/config/ftoption.h





PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
PDF_MESON_OFF=		-Dpdf=false

PS_LIB_DEPENDS=	libspectre.so:print/libspectre
PS_MESON_OFF=	-Dps=false

TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
TIFF_MESON_OFF=		-Dtiff=false

XPS_LIB_DEPENDS=	libgxps.so:graphics/libgxps
XPS_MESON_OFF=		-Dxps=false

post-patch:
	@${REINPLACE_CMD} -e '/gdk\/gdkwayland\.h/d' \
		${WRKSRC}/libdocument/ev-document-misc.h

.include <bsd.port.mk>

Lines 1-4 Link Here

(-)science/p5-Chemistry-3DBuilder/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-3DBuilder	3	PORTNAME= Chemistry-3DBuilder
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Generate 3D coordinates from a connection table	12	COMMENT= Generate 3D coordinates from a connection table
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-Bond-Find/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-Bond-Find	3	PORTNAME= Chemistry-Bond-Find
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Detect bonds in a molecule and assign formal bond orders	12	COMMENT= Detect bonds in a molecule and assign formal bond orders
14		13
15	LICENSE= ART10 GPLv1+	14	LICENSE= ART10 GPLv1+

Lines 1-4 Link Here

(-)science/p5-Chemistry-Canonicalize/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-Canonicalize	3	PORTNAME= Chemistry-Canonicalize
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Number the atoms in a molecule in a unique way	12	COMMENT= Number the atoms in a molecule in a unique way
14		13
15	LICENSE= ART10 GPLv1+	14	LICENSE= ART10 GPLv1+

Lines 1-4 Link Here

(-)science/p5-Chemistry-File-MDLMol/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-File-MDLMol	3	PORTNAME= Chemistry-File-MDLMol
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= MDL molfile reader/write	12	COMMENT= MDL molfile reader/write
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-File-Mopac/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-File-Mopac	3	PORTNAME= Chemistry-File-Mopac
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= MOPAC 6 input file reader/writer	12	COMMENT= MOPAC 6 input file reader/writer
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-File-SLN/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-File-SLN	3	PORTNAME= Chemistry-File-SLN
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= SLN linear notation parser/writer	12	COMMENT= SLN linear notation parser/writer
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-File-SMARTS/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-File-SMARTS	3	PORTNAME= Chemistry-File-SMARTS
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= SMARTS chemical substructure pattern linear notation parser	12	COMMENT= SMARTS chemical substructure pattern linear notation parser
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-File-SMILES/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-File-SMILES	3	PORTNAME= Chemistry-File-SMILES
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= SMILES linear notation parser/writer	12	COMMENT= SMILES linear notation parser/writer
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-File-VRML/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-File-VRML	3	PORTNAME= Chemistry-File-VRML
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Generate VRML models for molecules	12	COMMENT= Generate VRML models for molecules
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol

Lines 1-4 Link Here

(-)science/p5-Chemistry-File-XYZ/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-File-XYZ	3	PORTNAME= Chemistry-File-XYZ
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= XYZ molecule format reader/writer	12	COMMENT= XYZ molecule format reader/writer
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol

Lines 1-4 Link Here

(-)science/p5-Chemistry-FormulaPattern/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-FormulaPattern	3	PORTNAME= Chemistry-FormulaPattern
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Match molecule by formula	12	COMMENT= Match molecule by formula
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-InternalCoords/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-InternalCoords	3	PORTNAME= Chemistry-InternalCoords
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Represent the position of an atom using internal coordinates	12	COMMENT= Represent the position of an atom using internal coordinates
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-Isotope/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-Isotope	3	PORTNAME= Chemistry-Isotope
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Table of the isotopes exact mass data	12	COMMENT= Table of the isotopes exact mass data
14		13
15	USES= perl5	14	USES= perl5

Lines 1-4 Link Here

(-)science/p5-Chemistry-MidasPattern/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-MidasPattern	3	PORTNAME= Chemistry-MidasPattern
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Select atoms in macromolecules	12	COMMENT= Select atoms in macromolecules
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-Mok/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-Mok	3	PORTNAME= Chemistry-Mok
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Molecular awk interpreter	12	COMMENT= Molecular awk interpreter
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \

Lines 1-4 Link Here

(-)science/p5-Chemistry-Pattern/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-Pattern	3	PORTNAME= Chemistry-Pattern
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Chemical substructure pattern matching	12	COMMENT= Chemical substructure pattern matching
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol

Lines 1-4 Link Here

(-)science/p5-Chemistry-Reaction/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-Reaction	3	PORTNAME= Chemistry-Reaction
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Represent a ring as a substructure of a molecule	12	COMMENT= Represent a ring as a substructure of a molecule
14		13
15	LICENSE= ART10 GPLv1+	14	LICENSE= ART10 GPLv1+

Lines 1-4 Link Here

(-)science/p5-Chemistry-Ring/Makefile (-2 / +1 lines)
1	# Created by: Steve Wills <steve@mouf.net>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= Chemistry-Ring	3	PORTNAME= Chemistry-Ring
Lines 9-15 MASTER_SITES= CPAN Link Here
9	MASTER_SITE_SUBDIR= CPAN:ITUB	8	MASTER_SITE_SUBDIR= CPAN:ITUB
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= swills@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Represent a ring as a substructure of a molecule	12	COMMENT= Represent a ring as a substructure of a molecule
14		13
15	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \	14	BUILD_DEPENDS= p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \




# $FreeBSD$

PORTNAME=	honeytrap
DISTVERSION=	g20200625
CATEGORIES=	security

MAINTAINER=	ezri.mudde@dutchsec.com
COMMENT=	Framework for running, monitoring and managing honeypots

LICENSE=	ART20

USES=		go:modules
GO_BUILDFLAGS=	-ldflags '-X github.com/honeytrap/honeytrap/cmd.Version=2020-07-22T08:34:55 -X github.com/honeytrap/honeytrap/cmd.ReleaseTag=DEVELOPMENT.2020-07-22T08-34-55Z -X github.com/honeytrap/honeytrap/cmd.CommitID=33bbb2db3a3140b0ce4fbda14747bc954e0bcadd -X github.com/honeytrap/honeytrap/cmd.ShortCommitID=33bbb2db3a31 -extldflags "static"'
USE_GITHUB=	yes
GH_TAGNAME=	33bbb2d
GH_TUPLE=	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
		AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
		BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \
		Logicalis:asn1:c9c836c1a3cd:logicalis_asn1/vendor/github.com/Logicalis/asn1 \
		Shopify:sarama:v1.16.0:shopify_sarama/vendor/github.com/Shopify/sarama \

		yuin:gopher-lua:8bfc7677f583:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua \
		google:gvisor:3eb302470365:google_gvisor/vendor/gvisor.dev/gvisor

HONEYTRAP_USER?=	honeytrap
HONEYTRAP_GROUP?=	honeytrap
HONEYTRAP_DBDIR?=	/var/db/${PORTNAME}

USERS=		${HONEYTRAP_USER}
GROUPS=		${HONEYTRAP_GROUP}
USE_RC_SUBR=	honeytrap
PLIST_FILES=	"@sample(honeytrap,honeytrap,0600) ${ETCDIR}/honeytrap.toml.sample" \
		bin/honeytrap

SUB_LIST=	GROUP=${HONEYTRAP_GROUP} \
		HONEYTRAP_DBDIR=${HONEYTRAP_DBDIR} \
		USER=${HONEYTRAP_USER}

do-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKDIR}/bin/honeytrap ${STAGEDIR}${PREFIX}/bin/honeytrap
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${FILESDIR}/honeytrap.toml ${STAGEDIR}${ETCDIR}/honeytrap.toml.sample

post-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/honeytrap
	${MKDIR} ${STAGEDIR}/var/log/honeytrap

.include <bsd.port.mk>

Lines 1-6 Link Here

(-)security/honeytrap/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1587390791	1	TIMESTAMP = 1595352531
2	SHA256 (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = f565e52e8f4bbebc3765bd2ead68b7ab141da4ef00073749ae55268290f5d13a	2	SHA256 (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = a6390179c0ba3282d7523f3633d4a15852f39081fd666f4ac3a4c37f95fef4c4
3	SIZE (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = 379014	3	SIZE (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = 379053
4	SHA256 (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = c87bf25d12aa9ef597c6a465dd2959d6d7e06d8341030d6d75c8a81ccc388ccd	4	SHA256 (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = c87bf25d12aa9ef597c6a465dd2959d6d7e06d8341030d6d75c8a81ccc388ccd
5	SIZE (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = 7141	5	SIZE (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = 7141
6	SHA256 (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 2c49390424cfb043f803977bce80b1504495bada54f9e845ff8b30a05fab9a36	6	SHA256 (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 2c49390424cfb043f803977bce80b1504495bada54f9e845ff8b30a05fab9a36




[listener]
type="socket"

[service.ssh-simulator]
type="ssh-simulator"
credentials=["root:root", "root:password"]

[[port]]
ports=["tcp/8022"]
services=["ssh-simulator"]

[channel.console]
type="console"

[[filter]]
channel=["console"]

[[logging]]
output="/var/log/honeytrap/logging.log"
level="debug"




# $FreeBSD$
#
# PROVIDE: honeytrap
# REQUIRE: NETWORKING SERVERS DAEMON
# KEYWORD: shutdown

# Add honeytrap_enable="YES" to /etc/rc.conf to enable Honeytrap

# Additional variables you can define are:

# honeytrap_config (path):                Config file path.
#                                         Set to %%ETCDIR%%/honeytrap.toml by default.
# honeytrap_datadir (dir):                Set dir to store honeytrap data in.
#                                         Default is "%%HONEYTRAP_DBDIR%%"
# honeytrap_logdir (dir):                 Set dir to store honeytrap logs in.
#                                         Default is "/var/log/honeytrap"
# honeytrap_user (string):                Set user to run honeytrap.
#                                         Default is "%%USER%%".
# honeytrap_group (string):               Set group to run honeytrap.
#                                         Default is "%%GROUP%%".
# honeytrap_pidfile (string):             Set full path to pid file
#                                         Default is "/var/run/honeytrap.pid"
# honeytrap_syslog_output_enable (bool):  Set to YES to enable syslog output
#                                         Default is "NO". See daemon(8).
# honeytrap_syslog_output_tag (str):      Set syslog tag if syslog enabled.
#                                         Default is "honeytrap". See daemon(8).
# honeytrap_syslog_output_priority (str): Set syslog priority if syslog enabled.
#                                         Default is "info". See daemon(8).
# honeytrap_syslog_output_facility (str): Set syslog facility if syslog enabled.
#                                         Default is "daemon". See daemon(8).
#
# Add these lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# honeytrap_enable (bool):	Set to NO by default.
#				Set it to YES to enable honeytrap.
# honeytrap_datadir (path):	Set to %%PREFIX%%/libdata/honeytrap
#				by default.
# honeytrap_config (path):	Set to %%PREFIX%%/etc/honeytrap.toml
#				by default.

. /etc/rc.subr


load_rc_config $name

: ${honeytrap_enable:="NO"}
: ${honeytrap_config="%%ETCDIR%%/honeytrap.toml"}
: ${honeytrap_datadir:="%%HONEYTRAP_DBDIR%%"}
: ${honeytrap_logdir:="/var/log/honeytrap"}
: ${honeytrap_user:="%%USER%%"}
: ${honeytrap_group:="%%GROUP%%"}
: ${honeytrap_pidfile:="/var/run/${name}.pid"}
: ${honeytrap_syslog_output_enable:="NO"}

pidfile=${honeytrap_pidfile}
procname="%%PREFIX%%/bin/honeytrap"
command="/usr/sbin/daemon"

start_precmd="honeytrap_start_precmd"

if checkyesno honeytrap_syslog_output_enable; then
    if [ -n "${honeytrap_syslog_output_tag}" ]; then
        honeytrap_syslog_output_flags="-T ${honeytrap_syslog_output_tag}"
    else
        honeytrap_syslog_output_flags="-T ${name}"
    fi
    if [ -n "${honeytrap_syslog_output_priority}" ]; then
        honeytrap_syslog_output_flags="${honeytrap_syslog_output_flags} -s ${honeytrap_syslog_output_priority}"
    fi

    if [ -n "${honeytrap_syslog_output_facility}" ]; then
        honeytrap_syslog_output_flags="${honeytrap_syslog_output_flags} -l ${honeytrap_syslog_output_facility}"
    fi
fi

command_args="-f -t ${name} ${honeytrap_syslog_output_flags} -p ${pidfile} /usr/bin/env ${honeytrap_env} ${procname} --data ${honeytrap_datadir} --config ${honeytrap_config} ${honeytrap_flags}"

honeytrap_start_precmd()
{
    if [ ! -e ${pidfile} ]; then
        install -o ${honeytrap_user} -g ${honeytrap_group} /dev/null ${pidfile}
    fi

    if [ ! -d ${honeytrap_datadir} ]; then
        install -d -m 0750 -o ${honeytrap_user} -g ${honeytrap_group} ${honeytrap_datadir}
    fi
    if [ ! -d ${honeytrap_logdir} ]; then
        install -d -m 0750 -o ${honeytrap_user} -g ${honeytrap_group} ${honeytrap_logdir}
    fi
}
 
run_rc_command "$@"

Lines 1-3 Link Here

(-)security/openconnect-gui/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1591544711	1	TIMESTAMP = 1592016430
2	SHA256 (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = a8d156d056a81be1c895738f0a4299b60fc87b608fcb9676b8f2d5215b7101ae	2	SHA256 (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = b9cdddbc9f064386d5ba739522ff861b9dfa0ef746d30f095f0ded79d1cbab25
3	SIZE (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 10025784	3	SIZE (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 635260

Lines 3-8 Link Here

(-)security/openvas8-libraries/Makefile (+1 lines)
3		3
4	PORTNAME?= openvas8-libraries	4	PORTNAME?= openvas8-libraries
5	PORTVERSION?= 8.0.9	5	PORTVERSION?= 8.0.9
		6	PORTREVISION= 1
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES?= http://wald.intevation.org/frs/download.php/2433/	8	MASTER_SITES?= http://wald.intevation.org/frs/download.php/2433/
8	DISTNAME?= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}	9	DISTNAME?= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}




# $FreeBSD$

PORTNAME=	cryptography
PORTVERSION=	2.9.2
CATEGORIES=	security python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.BSD

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR}
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
		${PY_ENUM34} \
		${PY_IPADDRESS} \
		${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR}
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=2.9.2:security/py-cryptography-vectors@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \

	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so

do-test:
	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -m pytest

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)security/py-cryptography/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1551354433	1	TIMESTAMP = 1587899355
2	SHA256 (cryptography-2.6.1.tar.gz) = 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6	2	SHA256 (cryptography-2.9.2.tar.gz) = a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229
3	SIZE (cryptography-2.6.1.tar.gz) = 491580	3	SIZE (cryptography-2.9.2.tar.gz) = 517571




# security/py-cryptography fails to build with libressl-2.9.1
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237487
# Use generic DTLS functions added in LibreSSL 2.9.1
# https://github.com/pyca/cryptography/pull/4855

index 4124dcb879..ac32fdffde 100644
--- src/_cffi_src/openssl/cryptography.py.orig
+++ src/_cffi_src/openssl/cryptography.py
@@ -38,9 +38,12 @@
     (LIBRESSL_VERSION_NUMBER >= 0x2070000f)
 #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \
     (LIBRESSL_VERSION_NUMBER >= 0x2080000f)
+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \
+    (LIBRESSL_VERSION_NUMBER >= 0x2090100f)
 #else
 #define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0)
 #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0)
+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0)
 #endif
 
 #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 92fd1e3ec8..da21f3ce90 100644
--- src/_cffi_src/openssl/ssl.py.orig
+++ src/_cffi_src/openssl/ssl.py
@@ -719,17 +719,20 @@
 static const long TLS_ST_OK = 0;
 #endif
 
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
+/* LibreSSL 2.9.1 added only the DTLS_*_method functions */
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER
 static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
 const SSL_METHOD *(*DTLS_method)(void) = NULL;
 const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
 const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
+#else
+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
+#endif
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
 static const long SSL_OP_NO_DTLSv1 = 0;
 static const long SSL_OP_NO_DTLSv1_2 = 0;
 long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
 long (*DTLS_get_link_min_mtu)(SSL *) = NULL;
-#else
-static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
 #endif
 
 static const long Cryptography_HAS_DTLS = 1;





newentry:
	@${SH} ${FILESDIR}/newentry.sh "${VUXML_FILE}"
#
# make split: create files/vuln-*.xml from the vuln.xml file.
#
split: vuln-all.xml
vuln-all.xml: vuln.xml
	cd ${FILESDIR} && xsltproc split.xsl ${PKGDIR}/vuln.xml \
	    > ${FILESDIR}/${.TARGET}
.PATH: ${FILESDIR}
#
# make concat: create vuln-new.xml file from the files/vuln-*.xml files.
#
concat: vuln-new.xml
vuln-new.xml: vuln-all.xml
	cd ${FILESDIR} && xmllint --xinclude ${FILESDIR}/vuln-all.xml \
	    > ${PKGDIR}/${.TARGET}

.include <bsd.port.pre.mk>
post-clean: clean-vuln
clean-vuln:
	${RM} vuln-new.xml
	${RM} ${FILESDIR}/vuln-*.xml

.if defined(VID) && !empty(VID)
html: work/${VID}.html

Lines 1-7 Link Here

(-)shells/xonsh/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xonsh	3	PORTNAME= xonsh
4	PORTVERSION= 0.7.9	4	PORTVERSION= 0.9.16
5	CATEGORIES= shells python	5	CATEGORIES= shells python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)shells/xonsh/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1537440457	1	TIMESTAMP = 1595300286
2	SHA256 (xonsh-0.7.9.tar.gz) = a90785419da7346927c51135ed4871e17862acad8be7adc557bac15e2cda4825	2	SHA256 (xonsh-0.9.16.tar.gz) = 5531fe79ace9f86312e06a245c95f9ac2d099a32c2958297796695652bb84e26
3	SIZE (xonsh-0.7.9.tar.gz) = 833920	3	SIZE (xonsh-0.9.16.tar.gz) = 981839

Lines 30-37 post-patch: Link Here

(-)sysutils/44bsd-more/Makefile (-2 lines)
30	's!/usr/share/misc/more.help!${PREFIX}/share/misc/44bsd-more.help!'\	30	's!/usr/share/misc/more.help!${PREFIX}/share/misc/44bsd-more.help!'\
31	${WRKSRC}/pathnames.h	31	${WRKSRC}/pathnames.h
32	${CP} ${FILESDIR}/queue.h ${WRKSRC}	32	${CP} ${FILESDIR}/queue.h ${WRKSRC}
33	${REINPLACE_CMD} -e 's/static char \getvar/static const char \getvar/' \
34	${WRKSRC}/ncommand.c
35		33
36	do-install:	34	do-install:
37	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	35	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Lines 17-24 USES= gmake Link Here

(-)sysutils/and/Makefile (-4 lines)
17	ALL_TARGET= default	17	ALL_TARGET= default
18	NOPRECIOUSMAKEVARS= yes	18	NOPRECIOUSMAKEVARS= yes
19		19
20	post-patch:
21	@${REINPLACE_CMD} "s,P_KTHREAD,P_KPROC,g" \
22	${WRKSRC}/Makefile ${WRKSRC}/and-OpenBSD.c
23
24	.include <bsd.port.mk>	20	.include <bsd.port.mk>

Lines 7-13 Link Here

(-)sysutils/and/files/patch-and-OpenBSD.c (-1 / +1 lines)
7	+	7	+
8	+#if defined(__FreeBSD__) && __FreeBSD_version >= 500014	8	+#if defined(__FreeBSD__) && __FreeBSD_version >= 500014
9	+ /* Skip kernel threads */	9	+ /* Skip kernel threads */
10	+ while((openbsd_pt[openbsd_next].ki_flag & P_KTHREAD)	10	+ while((openbsd_pt[openbsd_next].ki_flag & P_KPROC)
11	+ && openbsd_next < openbsd_nproc)	11	+ && openbsd_next < openbsd_nproc)
12	+ openbsd_next++;	12	+ openbsd_next++;
13	+ if (openbsd_next >= openbsd_nproc) return NULL;	13	+ if (openbsd_next >= openbsd_nproc) return NULL;




See: https://github.com/fractalcells/ansible-iocage/pull/18
--- iocage.orig	2019-11-03 14:19:54 UTC
+++ iocage
@@ -148,10 +148,11 @@ def _get_iocage_facts(module, iocage_path, argument="a
                 # non-iocage jails: skip all
                 break
             elif re.match('(\d+|-)',_jid):
-                if l.count('\t') == 10:
-                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template,_basejail) = l.split('\t')
+                _fragments = l.split('\t')
+                if len(_fragments) == 10:
+                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template,_basejail) = _fragments
                 else:
-                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template) = l.split('\t')
+                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template) = _fragments
                 if _name != "":
                     _properties = _jail_get_properties(module, iocage_path, _name)
                     _jails[_name] = { "jid": _jid, "name": _name, "state": _state, "properties": _properties }
@@ -504,7 +505,7 @@ def main():
             cmd          = dict(default="", required=False),
             clone_from   = dict(default="", required=False),
             release      = dict(default="", required=False),
-            update       = dict(default="", required=False, type='bool'),
+            update       = dict(default=False, required=False, type='bool'),
             components   = dict(default="", aliases=["files","component"], required=False, type='list')),
         supports_check_mode = True
     )




LIB_DEPENDS=	libinotify.so:devel/libinotify
BUILD_DEPENDS=	db2x_xsltproc:textproc/docbook2X \
		docbook-xsl>=0:textproc/docbook-xsl \
		gsed:textproc/gsed \
		xsltproc:textproc/libxslt

USES=		cmake:noninja compiler:c++11-lib cpe gettext-runtime iconv \
		localbase lua:52 pkgconfig tar:bzip2

CMAKE_ARGS=	-DAPP_SED=${LOCALBASE}/bin/gsed \
		-DBUILD_IBM:BOOL=false \
		-DBUILD_HDDTEMP:BOOL=false \
		-DBUILD_IOSTATS:BOOL=false \
		-DBUILD_AUDACIOUS:BOOL=false \
		-DBUILD_DOCS:BOOL=true \
		-DBUILD_HDDTEMP:BOOL=false \
		-DBUILD_IBM:BOOL=false \
		-DBUILD_IOSTATS:BOOL=false \
		-DBUILD_PORT_MONITORS:BOOL=false
CONFLICTS?=	conky-awesome-[0-9]*

SLAVEDIRS=	sysutils/conky-awesome
PLIST_FILES=	bin/conky \
		man/man1/conky.1.gz
PORTEXAMPLES=	conky.conf conky_no_x11.conf convert.lua
PORTDOCS=	html/config_settings.html html/docs.html html/lua.html \
		html/variables.html

USE_GITHUB=	yes
GH_ACCOUNT=	brndnmtthws

OPTIONS_DEFINE=	APCUPSD CURL DOCS EXAMPLES IPV6 METAR MOC MPD NCURSES RSS X11 \
		XMMS2 XOAP

OPTIONS_GROUP?=		X11
OPTIONS_GROUP_X11=	ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO \
			LUA_IMLIB2 LUA_RSVG
OPTIONS_DEFAULT?=	ARGB DOUBLE_BUFFER LUA_CAIRO X11 XFT

APCUPSD_DESC=		Monitor APCUPSD
APCUPSD_CMAKE_BOOL=	BUILD_APCUPSD

CURL_CMAKE_BOOL=	BUILD_CURL
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl

DOUBLE_BUFFER_DESC=		X11 double buffering
DOUBLE_BUFFER_CMAKE_BOOL=	BUILD_XDBE
DOUBLE_BUFFER_IMPLIES=		X11

IMLIB2_CMAKE_BOOL=	BUILD_IMLIB2
IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2

LUA_CAIRO_DESC=		Lua-Cairo binding
LUA_CAIRO_CMAKE_BOOL=	BUILD_LUA_CAIRO
LUA_CAIRO_USES=		gnome
LUA_CAIRO_USE=		GNOME=cairo
LUA_CAIRO_PLIST_FILES=	lib/conky/libcairo.so
LUA_CAIRO_IMPLIES=	X11


LUA_RSVG_DESC=		Lua-rsvg binding
LUA_RSVG_CMAKE_BOOL=	BUILD_LUA_RSVG
LUA_RSVG_USES=		gnome
LUA_RSVG_USE=		GNOME=librsvg2
LUA_RSVG_PLIST_FILES=	lib/conky/librsvg.so
LUA_RSVG_IMPLIES=	X11


METAR_CMAKE_BOOL=	BUILD_WEATHER_METAR
METAR_IMPLIES=		CURL

MOC_DESC=	Control MOC (Music On Console)
MOC_CMAKE_BOOL=	BUILD_MOC

MPD_DESC=	Control MPD (Music Player Daemon)
MPD_CMAKE_BOOL=	BUILD_MPD

NCURSES_DESC=		Use ncurses to draw on terminals
NCURSES_CMAKE_BOOL=	BUILD_NCURSES
NCURSES_USES=		ncurses

RSS_DESC=	Display RSS feeds
RSS_CMAKE_BOOL=	BUILD_RSS
RSS_USES=	gnome
RSS_USE=	GNOME=glib20,libxml2
RSS_IMPLIES=	CURL

X11_USES=	xorg
X11_USE=	XORG=x11,xdamage,xext,xfixes
X11_CMAKE_BOOL=	BUILD_X11 OWN_WINDOW
X11_VARS=	EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf
X11_VARS_OFF=	EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf

XFT_CMAKE_BOOL=	BUILD_XFT
XFT_USE=	XORG=xft
XFT_IMPLIES=	X11

XINERAMA_CMAKE_BOOL=	BUILD_XINERAMA
XINERAMA_USE=		XORG=xinerama
XINERAMA_IMPLIES=	X11

XMMS2_DESC=		Control XMMS2 media player

XOAP_CMAKE_BOOL=	BUILD_WEATHER_XOAP
XOAP_IMPLIES=		CURL METAR
XOAP_USES=		gnome
XOAP_USE=		GNOME=libxml2

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2}
PLIST_FILES+=	lib/conky/libcairo_imlib2_helper.so
.endif

# disable apm on non-x86 archs
.if ${ARCH} != amd64 && ${ARCH} != i386
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_CMakeLists.txt
.endif

post-patch:

Lines 2-9 Link Here

(-)sysutils/ipfs-go/Makefile (-2 / +1 lines)
2		2
3	PORTNAME= ipfs	3	PORTNAME= ipfs
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.4.23	5	DISTVERSION= 0.6.0
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/	7	MASTER_SITES= https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/
9	PKGNAMESUFFIX= -go	8	PKGNAMESUFFIX= -go

Lines 5-11 DISTVERSION= 2.8.16 Link Here

(-)sysutils/py-google-compute-engine/Makefile (-1 / +1 lines)
5	CATEGORIES= sysutils python	5	CATEGORIES= sysutils python
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= swills@FreeBSD.org
9	COMMENT= Guest Environment for Google Compute Engine	9	COMMENT= Guest Environment for Google Compute Engine
10		10
11	LICENSE= APACHE20	11	LICENSE= APACHE20




LICENSE=	GPLv3

OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
OPTIONS_DEFAULT=	INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC
OPTIONS_SINGLE=		IPC
OPTIONS_SINGLE=		IPC NCURSES
OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
OPTIONS_SINGLE_NCURSES=	NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
NETHACK_DESC=		Enable nethack-style messages
XTERM_256_DESC=		Enable support for 256 colour xterm
SHOWENC_DESC=		Show encoding on the status line
SOCKETS_DESC=		Use new (4.2.1+) sockets for IPC (default)
NAMED_PIPES_DESC=	Use legacy (4.0.3) named pipes for IPC (override)
SYSTEM_SCREENRC_DESC=	Install system screenrc with helpful status line
NCURSES_DEFAULT_DESC=	Depend on ncurses (ports if installed, otherwise base)
NCURSES_BASE_DESC=	Depend on ncurses in base
NCURSES_PORT_DESC=	Depend on devel/ncurses in ports

NCURSES_DEFAULT_USES=	ncurses
NCURSES_BASE_USES=	ncurses:base
NCURSES_PORT_USES=	ncurses:port

OPTIONS_SUB=

USES=		gmake cpe ncurses:base
MAKE_ARGS+=	WITH_MAN=1

CPE_VENDOR=	gnu




CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lprocstat

.include <bsd.port.options.mk>

# Hack around nonfunctional --disable-gtktest flag
.if ! ${PORT_OPTIONS:MGUI}
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-gui-off
.endif

# SLURM's configure enables interactive jobs if pty.h exists.  Replacing
# #include <pty.h> with appropriate headers will therefore not work, so instead
# add a pty.h for the build.
pre-configure:
	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
	@${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \
		${WRKSRC}/configure

	@${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \
		-e 's|(/proc)|(/compat/linux/proc)|g' \
		${WRKSRC}/src/slurmd/slurmstepd/req.c \
		${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \
		${WRKSRC}/src/slurmd/common/xcpuinfo.c \
		${WRKSRC}/src/slurmd/common/xcgroup.c \
		${WRKSRC}/src/slurmd/common/set_oomadj.c \
		${WRKSRC}/src/slurmd/common/proctrack.c \
		${WRKSRC}/src/common/callerid.c \
		${WRKSRC}/src/plugins/task/affinity/affinity.c \
		${WRKSRC}/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \
		${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \
		${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \
		${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \
		${WRKSRC}/src/plugins/switch/cray_aries/scaling.c \
		${WRKSRC}/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c \
		${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \
		${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \
		${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \
		${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \
		${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \
		${WRKSRC}/contribs/cray/pam_job.c

	@if ${WHICH} sbatch > /dev/null; then \
		${ECHO_CMD} "********************************************"; \
		${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \




--- src/plugins/jobacct_gather/common/common_jag.c.orig	2020-01-18 14:05:02 UTC
+++ src/plugins/jobacct_gather/common/common_jag.c
@@ -233,7 +233,7 @@ static int _get_sys_interface_freq_line(uint32_t cpu, 
 	} else {
 		/* frequency scaling not enabled */
 		if (!cpunfo_frequency) {
-			snprintf(freq_file, 14, "/proc/cpuinfo");
+			snprintf(freq_file, 14, "/compat/linux/proc/cpuinfo");
 			debug2("_get_sys_interface_freq_line: filename = %s ",
 			       freq_file);
 			if ((sys_fp = fopen(freq_file, "r")) != NULL) {
@@ -250,6 +250,11 @@ static int _get_sys_interface_freq_line(uint32_t cpu, 
 	return 0;
 }

 static int _is_a_lwp(uint32_t pid)
 {
 	char *filename = NULL;
@@ -259,8 +264,12 @@ static int _is_a_lwp(uint32_t pid)
 	ssize_t n;
 	char *tgids = NULL;
 	pid_t tgid = -1;
 
-	xstrfmtcat(filename, "/proc/%u/status", pid);
+	// Disable check for now, this will only skew process accounting
+	// slightly by including threads
+	return 0;
 
+	xstrfmtcat(filename, "/compat/linux/proc/%u/status", pid);
+
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
 		error("%s: open() %s failed: %m", __func__, filename);
@@ -634,9 +643,9 @@ static List _get_precs(List task_list, bool pgid_plugi
 			goto finished;
 		}
 		for (i = 0; i < npids; i++) {
-			snprintf(proc_stat_file, 256, "/proc/%d/stat", pids[i]);
-			snprintf(proc_io_file, 256, "/proc/%d/io", pids[i]);
-			snprintf(proc_smaps_file, 256, "/proc/%d/smaps", pids[i]);
+			snprintf(proc_stat_file, 256, "/compat/linux/proc/%d/stat", pids[i]);
+			snprintf(proc_io_file, 256, "/compat/linux/proc/%d/io", pids[i]);
+			snprintf(proc_smaps_file, 256, "/compat/linux/proc/%d/smaps", pids[i]);
 			_handle_stats(prec_list, proc_stat_file, proc_io_file,
 				      proc_smaps_file, callbacks,
 				      jobacct ? jobacct->tres_count : 0);
@@ -649,16 +658,16 @@ static List _get_precs(List task_list, bool pgid_plugi
 		if (slash_proc_open) {
 			rewinddir(slash_proc);
 		} else {
-			slash_proc=opendir("/proc");
+			slash_proc=opendir("/compat/linux/proc");
 			if (slash_proc == NULL) {
 				perror("opening /proc");
 				goto finished;
 			}
 			slash_proc_open=1;
 		}
-		strcpy(proc_stat_file, "/proc/");
-		strcpy(proc_io_file, "/proc/");
-		strcpy(proc_smaps_file, "/proc/");
+		strcpy(proc_stat_file, "/compat/linux/proc/");
+		strcpy(proc_io_file, "/compat/linux/proc/");
+		strcpy(proc_smaps_file, "/compat/linux/proc/");
 
 		while ((slash_proc_entry = readdir(slash_proc))) {
 
@@ -669,7 +678,7 @@ static List _get_precs(List task_list, bool pgid_plugi
 			 * should be a pid). Then do the same for the
 			 * /proc/<pid>/io file name.
 			 */
-			optr = proc_stat_file + sizeof("/proc");
+			optr = proc_stat_file + sizeof("/compat/linux/proc");
 			iptr = slash_proc_entry->d_name;
 			i = 0;
 			do {
@@ -689,7 +698,7 @@ static List _get_precs(List task_list, bool pgid_plugi
 			} while (*iptr);
 			*optr = 0;
 
-			optr2 = proc_io_file + sizeof("/proc");
+			optr2 = proc_io_file + sizeof("/compat/linux/proc");
 			iptr = slash_proc_entry->d_name;
 			i = 0;
 			do {
@@ -708,7 +717,7 @@ static List _get_precs(List task_list, bool pgid_plugi
 			} while (*iptr);
 			*optr2 = 0;
 
-			optr2 = proc_smaps_file + sizeof("/proc");
+			optr2 = proc_smaps_file + sizeof("/compat/linux/proc");
 			iptr = slash_proc_entry->d_name;
 			i = 0;
 			do {

Removed Link Here

(-)sysutils/slurm-wlm/files/pty.h (-4 lines)
1	#include <sys/types.h>
2	#include <sys/ioctl.h>
3	#include <termios.h>
4	#include <libutil.h>

Lines 9-14 CATEGORIES= sysutils Link Here

(-)sysutils/uefi-edk2-bhyve/Makefile (+1 lines)
9		9
10	MAINTAINER= araujo@FreeBSD.org	10	MAINTAINER= araujo@FreeBSD.org
11	COMMENT?= UEFI-EDK2 firmware for bhyve	11	COMMENT?= UEFI-EDK2 firmware for bhyve
		12	BROKEN= Needs python2
12		13
13	LICENSE= BSD2CLAUSE	14	LICENSE= BSD2CLAUSE
14		15

Lines 11-14 COMMENT= Emphatic message generator Link Here

(-)textproc/fist/Makefile (+3 lines)
11	GNU_CONFIGURE= yes	11	GNU_CONFIGURE= yes
12	PLIST_FILES= bin/fist man/man1/fist.1.gz	12	PLIST_FILES= bin/fist man/man1/fist.1.gz
13		13
		14	post-patch:
		15	@${REINPLACE_CMD} -e 's/foo/bar/' ${WRKSRC}/fist.c
		16
14	.include <bsd.port.mk>	17	.include <bsd.port.mk>

Lines 60-66 post-install: Link Here

(-)textproc/libxml2/Makefile (-1 / +1 lines)
60	.include <bsd.port.pre.mk>	60	.include <bsd.port.pre.mk>
61		61
62	post-patch:	62	post-patch:
63	.for d in . doc doc/devhelp doc/examples	63	.for d in doc doc/examples
64	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \	64	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \
65	${WRKSRC}/${d}/Makefile.in	65	${WRKSRC}/${d}/Makefile.in
66	.endfor	66	.endfor

Lines 1-7 Link Here

(-)textproc/p5-XML-Parser/Makefile (-1 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= XML-Parser	3	PORTNAME= XML-Parser
4	PORTVERSION= 2.44	4	PORTVERSION= 2.46
5	CATEGORIES= textproc perl5	5	CATEGORIES= textproc perl5
6	MASTER_SITES= CPAN	6	MASTER_SITES= CPAN
7	PKGNAMEPREFIX= p5-	7	PKGNAMEPREFIX= p5-
Lines 11-17 COMMENT= Perl extension interface to James Clark's XML parser, expat Link Here
11		11
12	LICENSE= ART10 GPLv1+	12	LICENSE= ART10 GPLv1+
13	LICENSE_COMB= dual	13	LICENSE_COMB= dual
		14	LICENSE_FILE= ${WRKSRC}/Parser.pm
14		15
		16	BUILD_DEPENDS= ${RUN_DEPENDS}
		17	RUN_DEPENDS= p5-libwww>=6.43:www/p5-libwww
15	LIB_DEPENDS= libexpat.so:textproc/expat2	18	LIB_DEPENDS= libexpat.so:textproc/expat2
16		19
17	USES= perl5	20	USES= perl5

Lines 1-2 Link Here

(-)textproc/p5-XML-Parser/distinfo (-2 / +3 lines)
1	SHA256 (XML-Parser-2.44.tar.gz) = 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216	1	TIMESTAMP = 1586303346
2	SIZE (XML-Parser-2.44.tar.gz) = 237377	2	SHA256 (XML-Parser-2.46.tar.gz) = d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d
		3	SIZE (XML-Parser-2.46.tar.gz) = 254763




--- inc/Devel/CheckLib.pm.orig	2013-01-11 11:43:02.293444337 +0900
+++ inc/Devel/CheckLib.pm	2013-01-11 11:48:47.556449831 +0900
@@ -222,7 +222,7 @@
     for my $header (@headers) {
         push @use_headers, $header;
         my($ch, $cfile) = File::Temp::tempfile(
-            'assertlibXXXXXXXX', SUFFIX => '.c'
+            'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
         );
         print $ch qq{#include <$_>\n} for @use_headers;
         print $ch qq{int main(void) { return 0; }\n};
@@ -262,7 +262,7 @@
 
     # now do each library in turn with headers
     my($ch, $cfile) = File::Temp::tempfile(
-        'assertlibXXXXXXXX', SUFFIX => '.c'
+        'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
     );
     print $ch qq{#include <$_>\n} foreach (@headers);
     print $ch "int main(void) { ".($args{function} || 'return 0;')." }\n";

Lines 1-7 Link Here

(-)textproc/py-alabaster/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= alabaster	3	PORTNAME= alabaster
4	PORTVERSION= 0.7.6	4	PORTVERSION= 0.7.12
5	CATEGORIES= textproc python	5	CATEGORIES= textproc python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-2 Link Here

(-)textproc/py-alabaster/distinfo (-2 / +3 lines)
1	SHA256 (alabaster-0.7.6.tar.gz) = 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb	1	TIMESTAMP = 1563550321
2	SIZE (alabaster-0.7.6.tar.gz) = 16598	2	SHA256 (alabaster-0.7.12.tar.gz) = a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02
		3	SIZE (alabaster-0.7.12.tar.gz) = 11242

Lines 3-8 Link Here

(-)textproc/py-pykwalify/Makefile (+1 lines)
3	PORTNAME= pykwalify	3	PORTNAME= pykwalify
4	DISTVERSION= 1.7.0-15	4	DISTVERSION= 1.7.0-15
5	DISTVERSIONSUFFIX= -g02b7e21	5	DISTVERSIONSUFFIX= -g02b7e21
		6	PORTREVISION= 1
6	CATEGORIES= textproc python	7	CATEGORIES= textproc python
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8		9

Lines 132-140 GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles Link Here

(-)www/chromium/Makefile (-3 / +3 lines)
132	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .	132	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
133	# Note: these are for FreeBSD use ONLY. For your own distribution,	133	# Note: these are for FreeBSD use ONLY. For your own distribution,
134	# please get your own set of keys.	134	# please get your own set of keys.
135	GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \	135	GN_ARGS+= google_api_key="AIzaSyCel7Soy49Gi5bLtgvIb1gg7b_clF2O6zM" \
136	google_default_client_id="996322985003.apps.googleusercontent.com" \	136	google_default_client_id="1097775399400-4e9dgfp2il6dtj9j44qeul36h519sm5u.apps.googleusercontent.com" \
137	google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"	137	google_default_client_secret="05C5CkbtavjEHbuvdq9FxZeo"
138		138
139	.if !defined(GN_ONLY)	139	.if !defined(GN_ONLY)
140	SUB_FILES= chromium-browser.desktop chrome pkg-message	140	SUB_FILES= chromium-browser.desktop chrome pkg-message

Lines 13-20 LICENSE= APACHE20 Link Here

(-)www/minio/Makefile (-2 / +2 lines)
13	USES= compiler go:modules	13	USES= compiler go:modules
14		14
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GHTAG= RELEASE.2020-09-21T22-31-59Z	16	GHTAG= RELEASE.2020-09-23T19-18-30Z
17	COMMIT_ID= 4c81201f95bb83443fe5b8a188cc44e0fb56dc2b	17	COMMIT_ID= f7f9517b6ae297210aca2a68416e298396c07076
18		18
19	GH_TUPLE= ${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT \	19	GH_TUPLE= ${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT \
20	Azure:azure-pipeline-go:v0.2.2:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \	20	Azure:azure-pipeline-go:v0.2.2:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \

Lines 1-6 Link Here

(-)www/minio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1600779678	1	TIMESTAMP = 1600955330
2	SHA256 (minio/minio-minio-2020.09.21.22.31.59-RELEASE.2020-09-21T22-31-59Z_GH0.tar.gz) = 57aff6a977d70d77c9b3faf1d2f7344b3225e601de1c878e211bbd2e7da12ee6	2	SHA256 (minio/minio-minio-2020.09.23.19.18.30-RELEASE.2020-09-23T19-18-30Z_GH0.tar.gz) = 79933e7878c7799cb65d041da58dee8f8ad229ec387d8e50d9735a5f5c596c63
3	SIZE (minio/minio-minio-2020.09.21.22.31.59-RELEASE.2020-09-21T22-31-59Z_GH0.tar.gz) = 10194714	3	SIZE (minio/minio-minio-2020.09.23.19.18.30-RELEASE.2020-09-23T19-18-30Z_GH0.tar.gz) = 10200483
4	SHA256 (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f	4	SHA256 (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f
5	SIZE (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443	5	SIZE (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443
6	SHA256 (minio/Azure-azure-storage-blob-go-v0.10.0_GH0.tar.gz) = e3d4304b9fcb7dc5911d648a236fa69c06cb3b33ffb05ac4be6bf3d69125f71e	6	SHA256 (minio/Azure-azure-storage-blob-go-v0.10.0_GH0.tar.gz) = e3d4304b9fcb7dc5911d648a236fa69c06cb3b33ffb05ac4be6bf3d69125f71e

Lines 74-80 SNDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-sndio Link Here

(-)www/qt5-webengine/Makefile (-1 / +1 lines)
74	# We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks	74	# We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks
75	# whether webenginewidgets is available, which fails when qmake processes all	75	# whether webenginewidgets is available, which fails when qmake processes all
76	# .pro files at once.	76	# .pro files at once.
77	USES= gl gnome gperf jpeg python:2.7,build pkgconfig \	77	USES= gl gnome gperf jpeg python:3.7,build pkgconfig \
78	qmake:norecursive,outsource qt-dist:5,webengine shebangfix xorg	78	qmake:norecursive,outsource qt-dist:5,webengine shebangfix xorg
79	USE_GL= gl	79	USE_GL= gl
80	USE_GNOME= glib20 libxml2 libxslt	80	USE_GNOME= glib20 libxml2 libxslt

Lines 1-5 Link Here

(-)www/qt5-webengine/files/patch-configure.pri (+9 lines)
1	--- configure.pri.orig 2020-04-08 09:41:36 UTC	1	--- configure.pri.orig 2020-04-08 09:41:36 UTC
2	+++ configure.pri	2	+++ configure.pri
		3	@@ -12,7 +12,7 @@
		4	python_version ~= s/[()]//g
		5	python_version = $$split(python_version, ',')
		6	python_major_version = $$first(python_version)
		7	- greaterThan(python_major_version, 2) {
		8	+ greaterThan(python_major_version, 3) {
		9	qtLog("Python version 3 is not supported by Chromium.")
		10	return(false)
		11	}
3	@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {	12	@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
4	defineTest(qtConfTest_detectPlatform) {	13	defineTest(qtConfTest_detectPlatform) {
5	QT_FOR_CONFIG += gui-private	14	QT_FOR_CONFIG += gui-private

Lines 16-21 PATCHFILES+= edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d.diff:-p1 Link Here

(-)x11-drivers/xf86-video-amdgpu/Makefile (-1 / +5 lines)
16	LICENSE= MIT	16	LICENSE= MIT
17	LICENSE_FILE= ${WRKSRC}/COPYING	17	LICENSE_FILE= ${WRKSRC}/COPYING
18		18
		19	# No amdgpu kernel driver on non-x86 and PC98.
		20	ONLY_FOR_ARCHS= amd64 i386
		21	ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86
		22
19	LIB_DEPENDS= libdrm_amdgpu.so:graphics/libdrm	23	LIB_DEPENDS= libdrm_amdgpu.so:graphics/libdrm
20		24
21	USES= gl xorg-cat:driver	25	USES= gl xorg-cat:driver
Lines 24-30 USE_GL= gbm Link Here
24	ONLY_FOR_ARCHS= aarch64 i386 amd64	28	ONLY_FOR_ARCHS= aarch64 i386 amd64
25	ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86/arm64	29	ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86/arm64
26		30
27	CONFIGURE_ARGS+=--disable-udev	31	CONFIGURE_ARGS+= --disable-udev
28		32
29	PLIST_FILES= lib/xorg/modules/drivers/amdgpu_drv.so \	33	PLIST_FILES= lib/xorg/modules/drivers/amdgpu_drv.so \
30	man/man4/amdgpu.4x.gz \	34	man/man4/amdgpu.4x.gz \




--- src/amdgpu_drm_queue.c.orig	2019-10-11 15:20:30 UTC
+++ src/amdgpu_drm_queue.c
@@ -94,7 +94,7 @@ amdgpu_drm_queue_handler(int fd, unsigned int frame, u
 			 unsigned int usec, void *user_ptr)
 {
 	uintptr_t seq = (uintptr_t)user_ptr;

 
 	xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) {
 		if (e->seq == seq) {
@@ -213,7 +213,7 @@ amdgpu_drm_queue_alloc(xf86CrtcPtr crtc, ClientPtr cli
 void
 amdgpu_drm_abort_client(ClientPtr client)
 {

 
 	xorg_list_for_each_entry(e, &amdgpu_drm_queue, list) {
 		if (e->client == client)
@@ -227,7 +227,7 @@ amdgpu_drm_abort_client(ClientPtr client)
 void
 amdgpu_drm_abort_entry(uintptr_t seq)
 {
-	struct amdgpu_drm_queue_entry *e, *tmp;
+	struct amdgpu_drm_queue_entry *e = NULL, *tmp;
 
 	if (seq == AMDGPU_DRM_QUEUE_ERROR)
 		return;
@@ -260,7 +260,7 @@ amdgpu_drm_abort_entry(uintptr_t seq)
 void
 amdgpu_drm_abort_id(uint64_t id)
 {

 
 	xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) {
 		if (e->id == id) {
@@ -356,7 +356,7 @@ amdgpu_drm_queue_init(ScrnInfoPtr scrn)
 void
 amdgpu_drm_queue_close(ScrnInfoPtr scrn)
 {

Lines 1-8 Link Here

(-)x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c (-3 / +3 lines)
1	--- src/amdgpu_kms.c.orig 2016-11-17 06:07:48 UTC	1	--- src/amdgpu_kms.c.orig 2019-10-11 15:20:30 UTC
2	+++ src/amdgpu_kms.c	2	+++ src/amdgpu_kms.c
3	@@ -723,7 +723,7 @@ amdgpu_dirty_update(ScrnInfoPtr scrn)	3	@@ -930,7 +930,7 @@ static void
		4	amdgpu_dirty_update(ScrnInfoPtr scrn)
4	{	5	{
5	AMDGPUInfoPtr info = AMDGPUPTR(scrn);
6	ScreenPtr screen = scrn->pScreen;	6	ScreenPtr screen = scrn->pScreen;
7	- PixmapDirtyUpdatePtr ent;	7	- PixmapDirtyUpdatePtr ent;
8	+ PixmapDirtyUpdatePtr ent = NULL;	8	+ PixmapDirtyUpdatePtr ent = NULL;

Lines 2-8 This package contains the X.Org xf86-video-amdgpu driver. Link Here

(-)x11-drivers/xf86-video-amdgpu/pkg-descr (-1 / +1 lines)
2		2
3	The amdgpu driver supports AMD Radeon chipsets: OLAND, HAINAN, TAHITI, PITCAIRN,	3	The amdgpu driver supports AMD Radeon chipsets: OLAND, HAINAN, TAHITI, PITCAIRN,
4	VERDE, BONAIRE, KABINI, MULLINS, KAVERI, HAWAII, TOPAZ, TONGA, CARRIZO, FIJI,	4	VERDE, BONAIRE, KABINI, MULLINS, KAVERI, HAWAII, TOPAZ, TONGA, CARRIZO, FIJI,
5	STONEY, POLARIS11, POLARIS10	5	STONEY, POLARIS11, POLARIS10
6		6
7	On FreeBSD requires amdgpu KMS driver from graphics/drm-kmod.	7	On FreeBSD requires amdgpu KMS driver from graphics/drm-kmod.
8		8

Lines 1-5 Link Here

(-)x11-fm/nemo/pkg-descr (-4 / +2 lines)
1	Nautilus is a file manager tightly integrated into the GNOME destkop.	1	Nemo is the file manager for the Cinnamon desktop environment.
2	It is also responsible for desktop and icon management, and provides
3	an intuitive interface for accessing files and webpages.
4		2
5	WWW: http://www.gnome.org/projects/nautilus/	3	WWW: https://github.com/linuxmint/nemo

Lines 9-15 MASTER_SITES= CPAN \ Link Here

(-)x11-toolkits/p5-Gtk2/Makefile (-1 / +1 lines)
9	SF/${PORTNAME:tl}-perl/${PORTNAME}/${PORTVERSION}	9	SF/${PORTNAME:tl}-perl/${PORTNAME}/${PORTVERSION}
10	PKGNAMEPREFIX= p5-	10	PKGNAMEPREFIX= p5-
11		11
12	MAINTAINER= swills@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Perl module for Gtk+ 2.x graphical user interface library	13	COMMENT= Perl module for Gtk+ 2.x graphical user interface library
14		14
15	LICENSE= LGPL21	15	LICENSE= LGPL21

Lines 14-19 DIST_SUBDIR= gnome2 Link Here

(-)x11-toolkits/py-gtk2/Makefile (+1 lines)
14		14
15	MAINTAINER= gnome@FreeBSD.org	15	MAINTAINER= gnome@FreeBSD.org
16	COMMENT= Set of Python bindings for GTK+	16	COMMENT= Set of Python bindings for GTK+
		17	BROKEN= Needs python2
17		18
18	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}	19	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}
19	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}	20	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}

Lines 25-31 INSTALL_TARGET= install-strip Link Here

(-)x11/libX11/Makefile (-2 lines)
25	post-patch:	25	post-patch:
26	@${REINPLACE_CMD} 's/test.-traditional.;/true;/' \	26	@${REINPLACE_CMD} 's/test.-traditional.;/true;/' \
27	${WRKSRC}/configure	27	${WRKSRC}/configure
28	@${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \
29	s/install-specDATA//' ${WRKSRC}/nls/Makefile.in
30		28
31	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 33-39 OPTIONS_DEFINE= PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR \ Link Here

(-)x11/rxvt-unicode/Makefile (-1 / +1 lines)
33		33
34	SHEBANG_FILES= ${WRKSRC}/src/perl/*	34	SHEBANG_FILES= ${WRKSRC}/src/perl/*
35	perl_OLD_CMD= perl	35	perl_OLD_CMD= perl
36	perl_CMD= ${SETENV} perl	36	perl_CMD= /usr/bin/env perl
37		37
38	PERL_DESC= Embedded Perl interpreter	38	PERL_DESC= Embedded Perl interpreter
39	XIM_DESC= Support for XIM (X Input Method) protocol	39	XIM_DESC= Support for XIM (X Input Method) protocol

Return to bug 249626

Lines 81-87 _USE_GNOME_ALL+= atk cairo \ Link Here

(-)Mk/Uses/gnome.mk (-5 / +1 lines)
81	libgnomecanvas libgnomekbd \	81	libgnomecanvas libgnomekbd \
82	libgnomeui libgsf libgtkhtml libidl librsvg2 libwnck \	82	libgnomeui libgsf libgtkhtml libidl librsvg2 libwnck \
83	libxml2 libxslt \	83	libxml2 libxslt \
84	orbit2 pango pangox-compat pygobject pygtk2 \	84	orbit2 pango pangox-compat pygobject \
85	vte	85	vte
86		86
87	# GNOME 3 components	87	# GNOME 3 components
Lines 303-312 pygobject3_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@$ Link Here
303	pygobject3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}	303	pygobject3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
304	pygobject3_USE_GNOME_IMPL= glib20	304	pygobject3_USE_GNOME_IMPL= glib20
305		305
306	pygtk2_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
307	pygtk2_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
308	pygtk2_USE_GNOME_IMPL= libglade2 pygobject
309
310	intltool_BUILD_DEPENDS= ${LOCALBASE}/bin/intltool-extract:textproc/intltool	306	intltool_BUILD_DEPENDS= ${LOCALBASE}/bin/intltool-extract:textproc/intltool
311		307
312	intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" \| ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \	308	intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" \| ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \

Lines 18-27 Link Here

(-)Mk/Uses/python.mk (-68 / +24 lines)
18	#	18	#
19	# Examples:	19	# Examples:
20	#	20	#
21	# USES=python:2.7 # Supports Python 2.7 Only	21	# USES=python:3.6+ # Supports Python 3.6 or later
22	# USES=python:3.5+ # Supports Python 3.5 or later	22	# USES=python:3.6-3.8 # Supports Python 3.6 to 3.8
23	# USES=python:3.5-3.8 # Supports Python 3.5 to 3.8	23	# USES=python:-3.7 # Supports Python up to 3.7
24	# USES=python:-3.6 # Supports Python up to 3.6
25	# USES=python # Supports any/all Python versions	24	# USES=python # Supports any/all Python versions
26	#	25	#
27	# NOTE: <version-spec> should be as specific as possible, matching the versions	26	# NOTE: <version-spec> should be as specific as possible, matching the versions
Lines 31-37 Link Here
31	#	30	#
32	# Not specifying a <version-spec> should only be used when a more specific	31	# Not specifying a <version-spec> should only be used when a more specific
33	# <version-spec> cannot be specified due to syntax limitations, for	32	# <version-spec> cannot be specified due to syntax limitations, for
34	# example: 2.7,3.4-3.6, but even in this case, X.Y+ (2.7+), or -X.Y (-3.6)	33	# example: 3.4-3.6, but even in this case, X.Y+ (3.4+), or -X.Y (-3.6)
35	# is preferred and likely more correct.	34	# is preferred and likely more correct.
36	#	35	#
37	# patch Python is needed at patch time. Adds dependency to PATCH_DEPENDS.	36	# patch Python is needed at patch time. Adds dependency to PATCH_DEPENDS.
Lines 52-58 Link Here
52	# Exported variables:	51	# Exported variables:
53	#	52	#
54	# PYTHON_VERSION - The chosen Python interpreter including the version,	53	# PYTHON_VERSION - The chosen Python interpreter including the version,
55	# e.g. python2.7, python3.5, etc.	54	# e.g. python3.6, python3.7, etc.
56	#	55	#
57	# Variables, which can be set by the port:	56	# Variables, which can be set by the port:
58	#	57	#
Lines 82-88 Link Here
82	#	81	#
83	# are linked from the prefixed version to the	82	# are linked from the prefixed version to the
84	# prefix-less original name, e.g.	83	# prefix-less original name, e.g.
85	# bin/foo-2.7 --> bin/foo.	84	# bin/foo-3.6 --> bin/foo.
86	#	85	#
87	# cython - Depend on lang/cython at build-time.	86	# cython - Depend on lang/cython at build-time.
88	#	87	#
Lines 176-192 Link Here
176	# PYTHON_PORTSDIR - The port directory of the chosen Python interpreter	175	# PYTHON_PORTSDIR - The port directory of the chosen Python interpreter
177	#	176	#
178	# PYTHON_REL - The release number of the chosen Python interpreter	177	# PYTHON_REL - The release number of the chosen Python interpreter
179	# without dots, e.g. 2706, 3401, ...	178	# without dots, e.g. 3401, 3709, ...
180	#	179	#
181	# PYTHON_SUFFIX - The major-minor release number of the chosen Python	180	# PYTHON_SUFFIX - The major-minor release number of the chosen Python
182	# interpreter without dots, e.g. 27, 36, ...	181	# interpreter without dots, e.g. 36, 37, ...
183	# Used for prefixes and suffixes.	182	# Used for prefixes and suffixes.
184	#	183	#
185	# PYTHON_MAJOR_VER - The major release version of the chosen Python	184	# PYTHON_MAJOR_VER - The major release version of the chosen Python
186	# interpreter, e.g. 2, 3, ...	185	# interpreter, e.g. 3, ...
187	#	186	#
188	# PYTHON_VER - The major-minor release version of the chosen Python	187	# PYTHON_VER - The major-minor release version of the chosen Python
189	# interpreter, e.g. 2.7, 3.6, ...	188	# interpreter, e.g. 3.6, 3.7, ...
190	#	189	#
191	# PYTHON_ABIVER - Additional ABI flags set by the chosen Python	190	# PYTHON_ABIVER - Additional ABI flags set by the chosen Python
192	# interpreter, e.g. md	191	# interpreter, e.g. md
Lines 234-244 Link Here
234	# PYTHON_VER=${PYTHON_VER}	233	# PYTHON_VER=${PYTHON_VER}
235	# PYTHON_VERSION=${PYTHON_VERSION}	234	# PYTHON_VERSION=${PYTHON_VERSION}
236	#	235	#
237	# and PYTHON2 and PYTHON3 will be set according to the Python version:
238	#
239	# PYTHON2="" PYTHON3="@comment " for Python 2.x
240	# PYTHON2="@comment " PYTHON3="" for Python 3.x
241	#
242	# PYDISTUTILS_INSTALLNOSINGLE	236	# PYDISTUTILS_INSTALLNOSINGLE
243	# - Deprecated without replacement	237	# - Deprecated without replacement
244	#	238	#
Lines 250-257 _INCLUDE_USES_PYTHON_MK= yes Link Here
250	# What Python version and what Python interpreters are currently supported?	244	# What Python version and what Python interpreters are currently supported?
251	# When adding a version, please keep the comment in	245	# When adding a version, please keep the comment in
252	# Mk/bsd.default-versions.mk in sync.	246	# Mk/bsd.default-versions.mk in sync.
253	_PYTHON_VERSIONS= 2.7 3.7 3.8 3.6 # preferred first	247	_PYTHON_VERSIONS= 3.7 3.8 3.6 # preferred first
254	_PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VERSIONS:[1]}	248	_PYTHON_PORTBRANCH= 3.7 # ${_PYTHON_VERSIONS:[1]}
255	_PYTHON_BASECMD= ${LOCALBASE}/bin/python	249	_PYTHON_BASECMD= ${LOCALBASE}/bin/python
256	_PYTHON_RELPORTDIR= lang/python	250	_PYTHON_RELPORTDIR= lang/python
257		251
Lines 320-336 _PYTHON_RUN_DEP= yes Link Here
320	_PYTHON_TEST_DEP= yes	314	_PYTHON_TEST_DEP= yes
321	.endif	315	.endif
322		316
323	.if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}	317	.if ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
324	WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"	318	WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
325	.endif	319	.endif
326		320
327	.if ${_PYTHON_ARGS} == 2.7	321	.if ${_PYTHON_ARGS} == 3
328	DEV_WARNING+= "lang/python27 reached End of Life and will be removed on 2020-12-31, consider converting to a modern version of python"
329	.elif ${_PYTHON_ARGS} == 2
330	DEV_ERROR+= "USES=python:2 is no longer supported, use USES=python:2.7"
331	.elif ${_PYTHON_ARGS} == 3
332	DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.6+ or an appropriate version range"	322	DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.6+ or an appropriate version range"
333	.endif # ${_PYTHON_ARGS} == 2.7	323	.endif
334		324
335	_PYTHON_VERSION:= ${PYTHON_DEFAULT}	325	_PYTHON_VERSION:= ${PYTHON_DEFAULT}
336		326
Lines 358-364 _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most Link Here
358	# If we have an unsupported version of Python, try another.	348	# If we have an unsupported version of Python, try another.
359	.if defined(_PYTHON_VERSION_NONSUPPORTED)	349	.if defined(_PYTHON_VERSION_NONSUPPORTED)
360	.undef _PYTHON_VERSION	350	.undef _PYTHON_VERSION
361	.for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}	351	.for ver in ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
362	__VER= ${ver}	352	__VER= ${ver}
363	.if !defined(_PYTHON_VERSION) && \	353	.if !defined(_PYTHON_VERSION) && \
364	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \	354	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
Lines 370-382 _PYTHON_VERSION= ${ver} Link Here
370	.endfor	360	.endfor
371	.if !defined(_PYTHON_VERSION)	361	.if !defined(_PYTHON_VERSION)
372	IGNORE= needs an unsupported version of Python	362	IGNORE= needs an unsupported version of Python
		363	# Set this to not bail out too early
		364	_PYTHON_VERSION= ${PYTHON_DEFAULT}
373	.endif	365	.endif
374	.endif # defined(_PYTHON_VERSION_NONSUPPORTED)	366	.endif # defined(_PYTHON_VERSION_NONSUPPORTED)
375		367
376	# Automatically generates FLAVORS if empty	368	# Automatically generates FLAVORS if empty
377	.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)	369	.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
378	. undef _VALID_PYTHON_VERSIONS	370	. undef _VALID_PYTHON_VERSIONS
379	. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}	371	. for ver in ${PYTHON_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
380	__VER= ${ver}	372	__VER= ${ver}
381	. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \	373	. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
382	${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \	374	${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
Lines 398-404 _ALL_PYTHON_FLAVORS= ${_PYTHON_VERSIONS:S/.//:S/^/py/} Link Here
398	. if defined(BUILD_ALL_PYTHON_FLAVORS) \|\| defined(_PYTHON_FEATURE_ALLFLAVORS)	390	. if defined(BUILD_ALL_PYTHON_FLAVORS) \|\| defined(_PYTHON_FEATURE_ALLFLAVORS)
399	FLAVORS= ${_ALL_PYTHON_FLAVORS}	391	FLAVORS= ${_ALL_PYTHON_FLAVORS}
400	. else	392	. else
401	. for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT}	393	. for _v in ${PYTHON_DEFAULT} ${PYTHON3_DEFAULT}
402	_f= py${_v:S/.//}	394	_f= py${_v:S/.//}
403	. if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}	395	. if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}
404	.if !empty(FLAVORS)	396	.if !empty(FLAVORS)
Lines 414-420 FLAVOR= ${FLAVORS:[1]} Link Here
414	. endif	406	. endif
415	.endif	407	.endif
416		408
417	.if ${FLAVOR:Mpy[23][0-9]}	409	.if ${FLAVOR:Mpy[3][0-9]}
418	_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./}	410	_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./}
419	.endif	411	.endif
420		412
Lines 454-472 PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$ Link Here
454		446
455	# Might be overridden by calling ports	447	# Might be overridden by calling ports
456	PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION}	448	PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION}
457	.if ${PYTHON_VER} != 2.7
458	.if exists(${PYTHON_CMD}-config)	449	.if exists(${PYTHON_CMD}-config)
459	PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags	450	PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags
460	.elif ${PYTHON_REL} < 3800	451	.elif ${PYTHON_REL} < 3800
461	# Default ABI flags for lang/python3[67] ports	452	# Default ABI flags for lang/python3[67] ports
462	PYTHON_ABIVER= m	453	PYTHON_ABIVER= m
463	.endif	454	.endif
464	.endif
465
466	.if ${PYTHON_MAJOR_VER} == 2
467	DEPRECATED?= Uses Python 2.7 which is EOLed upstream
468	EXPIRATION_DATE?= 2020-12-31
469	.endif
470		455
471	.if !defined(PYTHONBASE)	456	.if !defined(PYTHONBASE)
472	PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \	457	PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \
Lines 489-499 PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};} Link Here
489	_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp	474	_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp
490		475
491	# PEP 0488 (https://www.python.org/dev/peps/pep-0488/)	476	# PEP 0488 (https://www.python.org/dev/peps/pep-0488/)
492	.if ${PYTHON_REL} < 3500
493	PYTHON_PYOEXTENSION= pyo
494	.else
495	PYTHON_PYOEXTENSION= opt-1.pyc	477	PYTHON_PYOEXTENSION= opt-1.pyc
496	.endif
497		478
498	# Ports bound to a certain python version SHOULD	479	# Ports bound to a certain python version SHOULD
499	# - use the PYTHON_PKGNAMEPREFIX	480	# - use the PYTHON_PKGNAMEPREFIX
Lines 636-672 PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} Link Here
636	PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR}	617	PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR}
637		618
638	# Common Python modules that can be needed but only for some versions of Python.	619	# Common Python modules that can be needed but only for some versions of Python.
639	.if ${PYTHON_REL} < 3500
640	PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR}
641	PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1:textproc/py-pygments-25@${PY_FLAVOR}
642	PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR}
643	PY_TYPING= ${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR}
644	.else
645	PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}	620	PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
646	PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1:textproc/py-pygments@${PY_FLAVOR}	621	PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1:textproc/py-pygments@${PY_FLAVOR}
647	PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}	622	PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
648	PY_TYPING=
649	.endif
650		623
651	.if ${PYTHON_REL} < 3400	624	# old compat stuff, remove from ports
652	PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1<2.0:devel/py-enum34@${PY_FLAVOR}	625	PY_TYPING=
653	PY_PATHLIB= ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR}
654	.else
655	PY_ENUM34=	626	PY_ENUM34=
656	PY_PATHLIB=	627	PY_PATHLIB=
657	.endif
658
659	.if ${PYTHON_REL} < 3300
660	PY_IPADDRESS= ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.23:net/py-ipaddress@${PY_FLAVOR}
661	.else
662	PY_IPADDRESS=	628	PY_IPADDRESS=
663	.endif
664
665	.if ${PYTHON_REL} < 3200
666	PY_FUTURES= ${PYTHON_PKGNAMEPREFIX}futures>=3.2:devel/py-futures@${PY_FLAVOR}
667	.else
668	PY_FUTURES=	629	PY_FUTURES=
669	.endif
670		630
671	.if ${PYTHON_VER} != ${PYTHON_DEFAULT}	631	.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
672	PY_MERCURIAL= ${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}	632	PY_MERCURIAL= ${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
Lines 700-710 PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \ Link Here
700	PYTHON_SUFFIX=${PYTHON_SUFFIX} \	660	PYTHON_SUFFIX=${PYTHON_SUFFIX} \
701	PYTHON_VER=${PYTHON_VER} \	661	PYTHON_VER=${PYTHON_VER} \
702	PYTHON_VERSION=${PYTHON_VERSION}	662	PYTHON_VERSION=${PYTHON_VERSION}
703	.if ${PYTHON_REL} < 3000
704	PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
705	.else
706	PLIST_SUB+= PYTHON2="@comment " PYTHON3=""	663	PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
707	.endif
708		664
709	_USES_POST+= python	665	_USES_POST+= python
710	.endif # _INCLUDE_USES_PYTHON_MK	666	.endif # _INCLUDE_USES_PYTHON_MK

Lines 4-12 Link Here

(-)Mk/Uses/scons.mk (-6 / +1 lines)
4	#	4	#
5	# Feature: scons	5	# Feature: scons
6	# Usage: USES=scons[:ARGS]	6	# Usage: USES=scons[:ARGS]
7	# Valid ARGS: python2 python3	7	# Valid ARGS: python3
8	#	8	#
9	# python2: Use default python 2.x to run scons
10	# python3: Use default python 3.x to run scons (default)	9	# python3: Use default python 3.x to run scons (default)
11	#	10	#
12	# MAINTAINER: python@FreeBSD.org	11	# MAINTAINER: python@FreeBSD.org
Lines 20-29 scons_ARGS= python3 Link Here
20		19
21	.if ${scons_ARGS} == python3	20	.if ${scons_ARGS} == python3
22	_SCONS_PYTHON_VER= ${PYTHON3_DEFAULT}	21	_SCONS_PYTHON_VER= ${PYTHON3_DEFAULT}
23	.elif ${scons_ARGS} == python2
24	_SCONS_PYTHON_VER= ${PYTHON2_DEFAULT}
25	DEPRECATED?= Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
26	EXPIRATION_DATE?= 2020-12-31
27	.else	22	.else
28	IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' usage	23	IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' usage
29	.endif	24	.endif

Lines 20-26 _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes Link Here

(-)Mk/bsd.default-versions.mk (-4 / +2 lines)
20	LOCALBASE?= /usr/local	20	LOCALBASE?= /usr/local
21		21
22	.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \	22	.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
23	JAVA JULIA LAZARUS LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 \	23	JAVA JULIA LAZARUS LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON \
24	PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH	24	PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
25	.if defined(${lang}_DEFAULT)	25	.if defined(${lang}_DEFAULT)
26	ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"	26	ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
Lines 90-99 PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} Link Here
90	PGSQL_DEFAULT?= 12	90	PGSQL_DEFAULT?= 12
91	# Possible values: 7.2, 7.3, 7.4	91	# Possible values: 7.2, 7.3, 7.4
92	PHP_DEFAULT?= 7.4	92	PHP_DEFAULT?= 7.4
93	# Possible values: 2.7, 3.6, 3.7, 3.8	93	# Possible values: 3.6, 3.7, 3.8
94	PYTHON_DEFAULT?= 3.7	94	PYTHON_DEFAULT?= 3.7
95	# Possible values: 2.7
96	PYTHON2_DEFAULT?= 2.7
97	# Possible values: 3.6, 3.7, 3.8	95	# Possible values: 3.6, 3.7, 3.8
98	PYTHON3_DEFAULT?= 3.7	96	PYTHON3_DEFAULT?= 3.7
99	# Possible values: 2.5, 2.6, 2.7	97	# Possible values: 2.5, 2.6, 2.7

Lines 126-131 you update your ports collection, before attempting any port upgrades. Link Here

(-)UPDATING (+15 lines)
126	upgrade will do the right thing. For the other people, follow the	126	upgrade will do the right thing. For the other people, follow the
127	instructions in entry 20161103, it should still be the same.	127	instructions in entry 20161103, it should still be the same.
128		128
		129	20200802:
		130	AFFECTS: users of databases/mdbtools
		131	AUTHOR: rhurlin@gwdg.de
		132
		133	In MDBTools the build process is broken, if mdbtools is installed
		134	already, because it picks up some files from ${LOCALBASE} instead of
		135	the ports working directory.
		136
		137	If you are using a tool like portmaster or portupgrade, please first
		138	deinstall (any version) of mdbtools, then follow the normal upgrade
		139	method.
		140
		141	# pkg delete -f mdbtools
		142	# rm -R /var/db/pkg/mdbtools-*
		143
129	20200726:	144	20200726:
130	AFFECTS: users of net-mgmt/librenms	145	AFFECTS: users of net-mgmt/librenms
131	AUTHOR: dvl@FreeBSD.org	146	AUTHOR: dvl@FreeBSD.org

Lines 24-37 PORTDOCS= Readme Link Here

(-)archivers/dzip/Makefile (-8 lines)
24		24
25	OPTIONS_DEFINE= DOCS	25	OPTIONS_DEFINE= DOCS
26		26
27	post-extract: .SILENT
28	${REINPLACE_CMD} -e 's/ifdef BIG_ENDIAN/if BYTE_ORDER == BIG_ENDIAN/' \
29	-e 's/ifndef BIG_ENDIAN/if BYTE_ORDER == LITTLE_ENDIAN/' \
30	${WRKSRC}/dzip.h ${WRKSRC}/conmain.c
31	${REINPLACE_CMD} -e '4s,^,#include <machine/endian.h>,' \
32	${WRKSRC}/dzip.h
33	${REINPLACE_CMD} -e '21d;23d' ${WRKSRC}/dzipcon.h
34
35	do-install:	27	do-install:
36	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin	28	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
37		29

Lines 16-27 LICENSE= GPLv2 Link Here

(-)archivers/lzo2/Makefile (-3 / +5 lines)
16		16
17	USES= libtool	17	USES= libtool
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --enable-shared --docdir=${DOCSDIR} --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig	19	CONFIGURE_ARGS= --docdir=${DOCSDIR} \
		20	--enable-shared \
		21	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
20	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
21		23
22	OPTIONS_DEFINE= DOCS EXAMPLES	24	OPTIONS_DEFINE= DOCS EXAMPLES
23		25
24	DOCS_INSTALL_TARGET_OFF= install-exec install-pkgincludeHEADERS install-pkgconfigDATA	26	DOCS_INSTALL_TARGET_OFF= install-exec install-pkgincludeHEADERS \
		27	install-pkgconfigDATA
25		28
26	post-build:	29	post-build:
27	.if !defined(WITHOUT_CHECKS)	30	.if !defined(WITHOUT_CHECKS)
Lines 33-39 post-build: Link Here
33	post-install:	36	post-install:
34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblzo2.so.2	37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblzo2.so.2
35	${MKDIR} ${STAGEDIR}${DOCSDIR}	38	${MKDIR} ${STAGEDIR}${DOCSDIR}
36	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,doc/,,' NEWS README
37	.for i in AUTHORS BUGS COPYING NEWS README THANKS	39	.for i in AUTHORS BUGS COPYING NEWS README THANKS
38	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/	40	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
39	.endfor	41	.endfor

Lines 25-31 BROKEN_powerpc64= fails to build: failed to execute goal org.apache.maven.plugin Link Here

(-)archivers/snappy-java/Makefile (-3 / +2 lines)
25	BUILD_DEPENDS= cmake:devel/cmake \	25	BUILD_DEPENDS= cmake:devel/cmake \
26	sbt:devel/sbt	26	sbt:devel/sbt
27		27
28	USES= gmake	28	USES= dos2unix gmake
		29	DOS2UNIX_FILES= Makefile
29	USE_JAVA= yes	30	USE_JAVA= yes
30	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
31	MAKE_ARGS+= CXX="${CXX}"	32	MAKE_ARGS+= CXX="${CXX}"
Lines 43-50 GH_TAGNAME= ${PORTVERSION} \ Link Here
43	${PORTVERSION:R}:google \	44	${PORTVERSION:R}:google \
44	${BITSHUFFLE_V}:masui	45	${BITSHUFFLE_V}:masui
45		46
46	PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so
47
48	post-extract:	47	post-extract:
49	@${MKDIR} ${WRKSRC}/target	48	@${MKDIR} ${WRKSRC}/target
50	@${RM} ${WRKSRC}/sbt	49	@${RM} ${WRKSRC}/sbt

Lines 9-32 MASTER_SITES= SF Link Here

(-)archivers/xmill/Makefile (-11 / +10 lines)
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Efficient compressor for XML	10	COMMENT= Efficient compressor for XML
11		11
12	WRKSRC= ${WRKDIR}/${PORTNAME}
13
14	USES= dos2unix zip	12	USES= dos2unix zip
15	DOS2UNIX_FILES= ${MAKEFILE} XMill/*.cpp
16	MAKEFILE= makefile
17		13
		14	WRKSRC= ${WRKDIR}/${PORTNAME}
		15	DOS2UNIX_FILES= ${MAKEFILE} XMill/.cpp XMill/.hpp xmillinspect/exprinfo.cpp \
		16	xmillinspect/xmillinspect.h
		17	MAKEFILE= makefile
18	PORTDOCS= *	18	PORTDOCS= *
19	PORTEXAMPLES= *	19	PORTEXAMPLES= *
20	PLIST_FILES= bin/xcmill bin/xdemill bin/xmilltest bin/xmillexample \	20	PLIST_FILES= bin/ppmzip \
21	bin/xmillinspect bin/ppmzip	21	bin/xcmill \
		22	bin/xdemill \
		23	bin/xmillexample \
		24	bin/xmillinspect \
		25	bin/xmilltest
22		26
23	OPTIONS_DEFINE= DOCS EXAMPLES	27	OPTIONS_DEFINE= DOCS EXAMPLES
24		28
25	post-patch:
26	# Allow to build with modern GCC
27	@${REINPLACE_CMD} -e 's,friend,& class,' ${WRKSRC}/XMill/*.?pp \
28	${WRKSRC}/xmillinspect/xmillinspect.h
29
30	do-install:	29	do-install:
31	.for p in ${PLIST_FILES:T}	30	.for p in ${PLIST_FILES:T}
32	(cd ${WRKSRC}/unix && ${INSTALL_PROGRAM} ${p} ${STAGEDIR}${PREFIX}/bin)	31	(cd ${WRKSRC}/unix && ${INSTALL_PROGRAM} ${p} ${STAGEDIR}${PREFIX}/bin)

Lines 1-18 Link Here

(-)archivers/xmill/files/patch-xmillinspect_exprinfo.cpp (-18 / +18 lines)
1	./xmillinspect/exprinfo.cpp:64:10: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'	1	./xmillinspect/exprinfo.cpp:64:10: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
2	return NULL;	2	return NULL;
3	^~~~	3	^~~~
4	/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'	4	/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
5	#define NULL nullptr	5	#define NULL nullptr
6	^~~~~~~	6	^~~~~~~
7		7
8	--- xmillinspect/exprinfo.cpp.orig 2003-03-23 15:06:16 UTC	8	--- xmillinspect/exprinfo.cpp.orig 2003-03-23 15:06:16 UTC
9	+++ xmillinspect/exprinfo.cpp	9	+++ xmillinspect/exprinfo.cpp
10	@@ -61,7 +61,7 @@ int ExprInfo::getSubContainerType(int sub)	10	@@ -61,7 +61,7 @@ int ExprInfo::getSubContainerType(int sub)
11	if (expr) {	11	if (expr) {
12	return expr->getContainerType();	12	return expr->getContainerType();
13	} else {	13	} else {
14	- return NULL;	14	- return NULL;
15	+ return 0;	15	+ return 0;
16	}	16	}
17	}	17	}
18		18

Lines 1-4 Link Here

(-)astro/saoimage/files/patch-makefile.FreeBSD (-3 / +39 lines)
1	--- makefile.FreeBSD.orig 2003-04-01 17:34:57 UTC	1	--- makefile.FreeBSD.orig 2020-01-26 19:05:22 UTC
2	+++ makefile.FreeBSD	2	+++ makefile.FreeBSD
3	@@ -36,9 +36,9 @@	3	@@ -36,9 +36,9 @@
4	# FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of	4	# FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of
Lines 22-28 Link Here
22	# Uncomment these two lines to compile with gcc (add any optimizers you wish).	22	# Uncomment these two lines to compile with gcc (add any optimizers you wish).
23	#CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce	23	#CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce
24	# Delayed branches could win big on RISC: many inner loops have branches	24	# Delayed branches could win big on RISC: many inner loops have branches
25	@@ -76,12 +76,12 @@ MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT	25	@@ -64,24 +64,24 @@ CC = cc
		26
		27	IFLAGS = -DFITS -DOIF -DIMTOOL
		28
		29	-# MFLAGS: machine or library specific code.
		30	+# MYMFLAGS: machine or library specific code.
		31	# -DSUN - SunOS temp file name, IEEE floating point debug, and Sun keyboard
		32	# -DLSB - byte swap for FITS (VAX and DECstations)
		33	# -DSYSV - substitutes for getdtablesize() and setrlimit() not widely known
		34	# -DPSCRIPT - hard copy output to a PostScript printer (else no hardcopy)
		35	# -DMIRIAD - extras
		36
		37	-MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
		38	+MYMFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
		39
26	# OFLAGS: compiler optimization/debug options.	40	# OFLAGS: compiler optimization/debug options.
27		41
28	#OFLAGS = -g -DDEBUG	42	#OFLAGS = -g -DDEBUG
Lines 46-51 Link Here
46	#XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...	60	#XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...
47	#F77LIB = -lF77 -lI77 -lU77	61	#F77LIB = -lF77 -lI77 -lU77
48	F77LIB = -lf2c	62	F77LIB = -lf2c
		63	@@ -106,7 +106,7 @@ RANLIB = ranlib
		64	RM = rm -f
		65	SHELL = /bin/sh
		66
		67	-CFLAGS = $(OFLAGS) $(ADFLAGS) $(MFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
		68	+CFLAGS = $(OFLAGS) $(ADFLAGS) $(MYMFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
		69
		70	# SAOimage libraries that live in subdirectories with their own makefiles.
		71	# This definition must be kept in correspondence with the DEPLIBS target.
		72	@@ -241,10 +241,10 @@ $(PROGRAM): $(DEPLIBS) $(OBJS)
		73
		74	$(DEPLIBS):
		75	@echo Building $(DEPLIBS)...
		76	- cd btnlib; $(MAKE) CFLAGS="-c $(OFLAGS) $(ADFLAGS) $(MFLAGS)" CC=$(CC)
		77	+ cd btnlib; $(MAKE) CFLAGS="-c $(OFLAGS) $(ADFLAGS) $(MYMFLAGS)" CC=$(CC)
		78
		79	lint:
		80	- $(LINT) -DDEBUG $(MFLAGS) $(IFLAGS) $(SRCS)
		81	+ $(LINT) -DDEBUG $(MYMFLAGS) $(IFLAGS) $(SRCS)
		82
		83	clean:
		84	cd btnlib; $(MAKE) clean
49	@@ -307,7 +307,7 @@ tape:	85	@@ -307,7 +307,7 @@ tape:
50	$(MAKE) ARCFILE=$(TAPEDEV) tar	86	$(MAKE) ARCFILE=$(TAPEDEV) tar
51		87
Lines 55-61 Link Here
55	STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \	91	STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
56	hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h	92	hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
57	WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)	93	WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
58	@@ -419,8 +419,8 @@ maininit.o : $(XLIBH) $(STRUCT) hfiles/c	94	@@ -419,8 +419,8 @@ maininit.o : $(XLIBH) $(STRUCT) hfiles/constant.h hfil
59	defs/dispbox.def defs/magnibox.def defs/panbox.def \	95	defs/dispbox.def defs/magnibox.def defs/panbox.def \
60	defs/btnbox.def defs/colorbox.def defs/graphbox.def \	96	defs/btnbox.def defs/colorbox.def defs/graphbox.def \
61	defs/desktop.def defs/cursor.def	97	defs/desktop.def defs/cursor.def

Lines 1-6 Link Here

(-)astro/saoimage/files/patch-rgnwrite.c (-2 / +37 lines)
1	--- rgnwrite.c.orig 1995-09-08 22:29:19 UTC	1	--- rgnwrite.c.orig 2020-01-26 19:05:22 UTC
2	+++ rgnwrite.c	2	+++ rgnwrite.c
3	@@ -183,7 +183,7 @@ static void set_time_string ( time_strin	3	@@ -58,6 +58,9 @@ EditStruct *region_edit;
		4	* Subroutine: write_regions
		5	* Purpose: Write region info to a file
		6	*/
		7	+
		8	+static void write_region_imtool();
		9	+
		10	void write_regions ( cursor, image, output_type )
		11	struct cursorRec *cursor;
		12	struct imageRec *image;
		13	@@ -66,7 +69,6 @@ void write_regions ( cursor, image, output_type )
		14	FILE *fd;
		15	static int last_output_type = 0;
		16	char fname[SZ_FNAME];
		17	- static void write_region_imtool();
		18	int open_output_file();
		19	EditStruct *init_edit_popup();
		20	void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp();
		21	@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, region, image )
		22	* Subroutine: timestamp
		23	* Purpose: Write date and filename (if known) to region file
		24	*/
		25	+
		26	+static void set_time_string();
		27	+
		28	void timestamp ( fd, imagename )
		29	FILE *fd;
		30	char *imagename;
		31	{
		32	char line[SZ_LINE];
		33	int len;
		34	- static void set_time_string();
		35
		36	/* timestamp the first entry in the output file. */
		37	set_time_string (line);
		38	@@ -183,7 +187,7 @@ static void set_time_string ( time_string )
4	#ifdef LONG64	39	#ifdef LONG64
5	int time();	40	int time();
6	#else	41	#else

Lines 12-43 COMMENT= Draw pictures of the earth textured by an image Link Here

(-)astro/xplanet/Makefile (-19 / +18 lines)
12		12
13	GNU_CONFIGURE= yes	13	GNU_CONFIGURE= yes
14	USES= iconv localbase xorg	14	USES= iconv localbase xorg
15	USE_XORG= xt xscrnsaver	15	USE_XORG= xscrnsaver xt
16	CONFIGURE_ARGS= --with-map-extension=jpg	16	CONFIGURE_ARGS= --with-map-extension=jpg
17	CPPFLAGS+= -I${LOCALBASE}/include/netpbm	17	CPPFLAGS+= -I${LOCALBASE}/include/netpbm
18	LIBS+= -lm	18	LIBS+= -lm
19		19
20	OPTIONS_DEFINE= FREETYPE PANGO GIF JPEG PNG PNM TIFF	20	OPTIONS_DEFINE= FREETYPE GIF JPEG PANGO PNG PNM TIFF
21	OPTIONS_DEFAULT= FREETYPE PANGO GIF JPEG PNG PNM TIFF	21	OPTIONS_DEFAULT= FREETYPE GIF JPEG PANGO PNG PNM TIFF
22		22
23	FREETYPE_CONFIGURE_WITH= --with-freetype	23	FREETYPE_CONFIGURE_WITH= --with-freetype
24	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2	24	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
25	PANGO_CONFIGURE_WITH= pango	25	PANGO_CONFIGURE_WITH= pango
26	PANGO_USES= gnome	26	PANGO_USES= gnome
27	PANGO_USE= GNOME=pango	27	PANGO_USE= GNOME=pango
28	GIF_CONFIGURE_WITH= gif	28	GIF_CONFIGURE_WITH= gif
29	GIF_LIB_DEPENDS= libgif.so:graphics/giflib	29	GIF_LIB_DEPENDS= libgif.so:graphics/giflib
30	JPEG_CONFIGURE_WITH= jpeg	30	JPEG_CONFIGURE_WITH= jpeg
31	JPEG_USES= jpeg	31	JPEG_USES= jpeg
32	PNG_CONFIGURE_WITH= png	32	PNG_CONFIGURE_WITH= png
33	PNG_LIB_DEPENDS+= libpng.so:graphics/png	33	PNG_LIB_DEPENDS+= libpng.so:graphics/png
34	PNM_CONFIGURE_WITH= pnm	34	PNM_CONFIGURE_WITH= pnm
35	PNM_LIB_DEPENDS= libnetpbm.so:graphics/netpbm	35	PNM_LIB_DEPENDS= libnetpbm.so:graphics/netpbm
36	TIFF_CONFIGURE_WITH= tiff	36	TIFF_CONFIGURE_WITH= tiff
37	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff	37	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
38		38
39	post-extract:	39	post-patch:
40	@${REINPLACE_CMD} -e "s/default/default.sample/g" ${WRKSRC}/Makefile.in
41	@${MV} ${WRKSRC}/xplanet/config/default ${WRKSRC}/xplanet/config/default.sample	40	@${MV} ${WRKSRC}/xplanet/config/default ${WRKSRC}/xplanet/config/default.sample
42		41
43	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Removed Link Here

(-)astro/xplanet/files/patch-libprojections_stdiofix (-31 lines)
1	--- src/libprojection/ProjectionBonne.cpp.orig 2006-03-26 05:03:20 UTC
2	+++ src/libprojection/ProjectionBonne.cpp
3	@@ -7,6 +7,8 @@
4	http://www.atnf.csiro.au/~mcalabre/WCS
5	*/
6
7	+#include <stdio.h>
8	+
9	#include <cmath>
10	#include <cstdio>
11	#include <sstream>
12	--- src/libprojection/ProjectionGnomonic.cpp.orig 2006-03-26 05:03:20 UTC
13	+++ src/libprojection/ProjectionGnomonic.cpp
14	@@ -7,6 +7,8 @@
15	http://www.atnf.csiro.au/~mcalabre/WCS
16	*/
17
18	+#include <stdio.h>
19	+
20	#include <cmath>
21	#include <cstdio>
22	#include <sstream>
23	--- src/libprojection/ProjectionMercator.cpp.orig 2006-03-26 05:03:20 UTC
24	+++ src/libprojection/ProjectionMercator.cpp
25	@@ -1,4 +1,6 @@
26	#include <cmath>
27	+#include <stdio.h>
28	+
29	#include <cstdio>
30	#include <sstream>
31	using namespace std;

Removed Link Here

(-)astro/xplanet/files/patch-null-comparison-fix (-150 lines)
1	Index: src/libmultiple/RayleighScattering.cpp
2	===================================================================
3	--- src/libmultiple/RayleighScattering.cpp (revision 206)
4	+++ src/libmultiple/RayleighScattering.cpp (revision 207)
5	@@ -369,7 +369,7 @@
6
7	diskTemplate_.clear();
8	limbTemplate_.clear();
9	- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
10	+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
11	{
12	int i = 0;
13	while (isDelimiter(line[i]))
14	@@ -439,7 +439,7 @@
15	values.clear();
16
17	char line[MAX_LINE_LENGTH];
18	- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
19	+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
20	{
21	int i = 0;
22	while (isDelimiter(line[i]))
23	@@ -470,7 +470,7 @@
24	double &value)
25	{
26	char line[MAX_LINE_LENGTH];
27	- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
28	+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
29	{
30	int i = 0;
31	while (isDelimiter(line[i]))
32	Index: src/libmultiple/drawStars.cpp
33	===================================================================
34	--- src/libmultiple/drawStars.cpp (revision 206)
35	+++ src/libmultiple/drawStars.cpp (revision 207)
36	@@ -41,7 +41,7 @@
37	ifstream inFile(starMap.c_str());
38
39	char line[MAX_LINE_LENGTH];
40	- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
41	+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
42	{
43	if (line[0] == '#') continue;
44
45	Index: src/readConfig.cpp
46	===================================================================
47	--- src/readConfig.cpp (revision 206)
48	+++ src/readConfig.cpp (revision 207)
49	@@ -550,7 +550,7 @@
50
51	ifstream inFile(configFile.c_str());
52	char *line = new char[256];
53	- while (inFile.getline(line, 256, '\n') != NULL)
54	+ while (inFile.getline(line, 256, '\n'))
55	readConfig(line, planetProperties);
56
57	// This condition will only be true if [default] is the only
58	Index: src/libannotate/addArcs.cpp
59	===================================================================
60	--- src/libannotate/addArcs.cpp (revision 206)
61	+++ src/libannotate/addArcs.cpp (revision 207)
62	@@ -258,7 +258,7 @@
63	{
64	ifstream inFile(arcFile.c_str());
65	char *line = new char[MAX_LINE_LENGTH];
66	- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
67	+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
68	readArcFile(line, planet, view, projection,
69	planetProperties, annotationMap);
70
71	@@ -292,7 +292,7 @@
72	{
73	ifstream inFile(arcFile.c_str());
74	char *line = new char[256];
75	- while (inFile.getline (line, 256, '\n') != NULL)
76	+ while (inFile.getline (line, 256, '\n'))
77	readArcFile(line, NULL, view, NULL, NULL, annotationMap);
78
79	inFile.close();
80	Index: src/libannotate/addMarkers.cpp
81	===================================================================
82	--- src/libannotate/addMarkers.cpp (revision 206)
83	+++ src/libannotate/addMarkers.cpp (revision 207)
84	@@ -429,7 +429,7 @@
85	{
86	ifstream inFile(markerFile.c_str());
87	char *line = new char[MAX_LINE_LENGTH];
88	- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
89	+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
90	{
91	unsigned char color[3];
92	memcpy(color, planetProperties->MarkerColor(), 3);
93	@@ -475,7 +475,7 @@
94	{
95	ifstream inFile(markerFile.c_str());
96	char *line = new char[MAX_LINE_LENGTH];
97	- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
98	+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
99	{
100	unsigned char color[3];
101	memcpy(color, options->Color(), 3);
102	Index: src/libannotate/addSatellites.cpp
103	===================================================================
104	--- src/libannotate/addSatellites.cpp (revision 206)
105	+++ src/libannotate/addSatellites.cpp (revision 207)
106	@@ -488,10 +488,10 @@
107	{
108	ifstream inFile(tleFile.c_str());
109	char lines[3][80];
110	- while (inFile.getline(lines[0], 80) != NULL)
111	+ while (inFile.getline(lines[0], 80))
112	{
113	- if ((inFile.getline(lines[1], 80) == NULL)
114	- \|\| (inFile.getline(lines[2], 80) == NULL))
115	+ if ((!inFile.getline(lines[1], 80))
116	+ \|\| (!inFile.getline(lines[2], 80)))
117	{
118	ostringstream errStr;
119	errStr << "Malformed TLE file (" << tleFile << ")?\n";
120	@@ -542,7 +542,7 @@
121	{
122	ifstream inFile(satFile.c_str());
123	char *line = new char[MAX_LINE_LENGTH];
124	- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
125	+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
126	readSatelliteFile(line, planet, view, projection,
127	planetProperties, annotationMap);
128
129	Index: src/libannotate/addSpiceObjects.cpp
130	===================================================================
131	--- src/libannotate/addSpiceObjects.cpp (revision 206)
132	+++ src/libannotate/addSpiceObjects.cpp (revision 207)
133	@@ -524,7 +524,7 @@
134	{
135	ifstream inFile(kernelFile.c_str());
136	char *line = new char[MAX_LINE_LENGTH];
137	- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
138	+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
139	{
140	int ii = 0;
141	while (isDelimiter(line[ii]))
142	@@ -576,7 +576,7 @@
143	{
144	ifstream inFile(spiceFile.c_str());
145	char *line = new char[MAX_LINE_LENGTH];
146	- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
147	+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
148	readSpiceFile(line, planetsFromSunMap, view, projection,
149	annotationMap);
150	inFile.close();

Lines 1-4 Link Here

(-)astro/xplanet/files/patch-src_libimage_gif.c (-11 / +11 lines)
1	--- src/libimage/gif.c.orig 2006-03-25 22:50:51 UTC	1	--- src/libimage/gif.c.orig 2020-01-26 19:25:24 UTC
2	+++ src/libimage/gif.c	2	+++ src/libimage/gif.c
3	@@ -28,6 +28,314 @@	3	@@ -28,6 +28,314 @@
4	distribution.	4	distribution.
Lines 315-321 Link Here
315	int	315	int
316	read_gif(const char filename, int width, int height, unsigned char *rgb)	316	read_gif(const char filename, int width, int height, unsigned char *rgb)
317	{	317	{
318	@@ -42,11 +350,15 @@ read_gif(const char filename, int widt	318	@@ -42,11 +350,15 @@ read_gif(const char filename, int width, int *height
319	int color_index;	319	int color_index;
320	unsigned char *ptr = NULL;	320	unsigned char *ptr = NULL;
321		321
Lines 332-338 Link Here
332	return(0);	332	return(0);
333	}	333	}
334		334
335	@@ -54,7 +366,11 @@ read_gif(const char filename, int widt	335	@@ -54,7 +366,11 @@ read_gif(const char filename, int width, int *height
336	{	336	{
337	if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)	337	if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
338	{	338	{
Lines 345-351 Link Here
345	return(0);	345	return(0);
346	}	346	}
347		347
348	@@ -63,7 +379,11 @@ read_gif(const char filename, int widt	348	@@ -63,7 +379,11 @@ read_gif(const char filename, int width, int *height
349	case IMAGE_DESC_RECORD_TYPE:	349	case IMAGE_DESC_RECORD_TYPE:
350	if (DGifGetImageDesc(infile) == GIF_ERROR)	350	if (DGifGetImageDesc(infile) == GIF_ERROR)
351	{	351	{
Lines 358-364 Link Here
358	return(0);	358	return(0);
359	}	359	}
360		360
361	@@ -107,14 +427,22 @@ read_gif(const char filename, int widt	361	@@ -107,14 +427,22 @@ read_gif(const char filename, int width, int *height
362	GifByteType *ext;	362	GifByteType *ext;
363	if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)	363	if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
364	{	364	{
Lines 383-389 Link Here
383	return(0);	383	return(0);
384	}	384	}
385	}	385	}
386	@@ -154,7 +482,11 @@ read_gif(const char filename, int widt	386	@@ -154,7 +482,11 @@ read_gif(const char filename, int width, int *height
387		387
388	free(buffer);	388	free(buffer);
389		389
Lines 395-401 Link Here
395	return(1);	395	return(1);
396	}	396	}
397		397
398	@@ -178,7 +510,11 @@ write_gif(const char *filename, int widt	398	@@ -178,7 +510,11 @@ write_gif(const char *filename, int width, int height,
399	return(0);	399	return(0);
400	}	400	}
401		401
Lines 407-413 Link Here
407		407
408	for (i = 0; i < width * height; i++)	408	for (i = 0; i < width * height; i++)
409	{	409	{
410	@@ -190,7 +526,7 @@ write_gif(const char *filename, int widt	410	@@ -190,7 +526,7 @@ write_gif(const char *filename, int width, int height,
411	if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,	411	if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
412	buffer, colormap->Colors) == GIF_ERROR)	412	buffer, colormap->Colors) == GIF_ERROR)
413	{	413	{
Lines 416-422 Link Here
416	return(0);	416	return(0);
417	}	417	}
418		418
419	@@ -198,24 +534,36 @@ write_gif(const char *filename, int widt	419	@@ -198,24 +534,36 @@ write_gif(const char *filename, int width, int height,
420	free(green);	420	free(green);
421	free(blue);	421	free(blue);
422		422
Lines 458-464 Link Here
458	return(0);	458	return(0);
459	}	459	}
460		460
461	@@ -224,7 +572,11 @@ write_gif(const char *filename, int widt	461	@@ -224,7 +572,11 @@ write_gif(const char *filename, int width, int height,
462	{	462	{
463	if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)	463	if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
464	{	464	{
Lines 471-477 Link Here
471	return(0);	471	return(0);
472	}	472	}
473	ptr += width;	473	ptr += width;
474	@@ -232,8 +584,12 @@ write_gif(const char *filename, int widt	474	@@ -232,8 +584,12 @@ write_gif(const char *filename, int width, int height,
475		475
476	EGifSpew(outfile);	476	EGifSpew(outfile);
477		477

Lines 31-37 Since it happens in a half-dozen places, introduce a trivial helper function. Link Here

(-)astro/xplanet/files/patch-src_readConfig.cpp (-6 / +15 lines)
31	static void	31	static void
32	readConfig(const char line, PlanetProperties planetProperties[])	32	readConfig(const char line, PlanetProperties planetProperties[])
33	{	33	{
34	@@ -49,7 +52,7 @@ readConfig(const char *line, PlanetPrope	34	@@ -49,7 +52,7 @@ readConfig(const char line, PlanetProperties planetP
35	int r, g, b;	35	int r, g, b;
36	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)	36	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
37	{	37	{
Lines 40-46 Since it happens in a half-dozen places, introduce a trivial helper function. Link Here
40	currentProperties->ArcColor(color);	40	currentProperties->ArcColor(color);
41	}	41	}
42	else	42	else
43	@@ -179,7 +182,7 @@ readConfig(const char *line, PlanetPrope	43	@@ -179,7 +182,7 @@ readConfig(const char line, PlanetProperties planetP
44	int r, g, b;	44	int r, g, b;
45	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)	45	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
46	{	46	{
Lines 49-55 Since it happens in a half-dozen places, introduce a trivial helper function. Link Here
49	currentProperties->Color(color);	49	currentProperties->Color(color);
50	}	50	}
51	else	51	else
52	@@ -244,7 +247,7 @@ readConfig(const char *line, PlanetPrope	52	@@ -244,7 +247,7 @@ readConfig(const char line, PlanetProperties planetP
53	int r, g, b;	53	int r, g, b;
54	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)	54	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
55	{	55	{
Lines 58-64 Since it happens in a half-dozen places, introduce a trivial helper function. Link Here
58	currentProperties->GridColor(color);	58	currentProperties->GridColor(color);
59	}	59	}
60	else	60	else
61	@@ -296,7 +299,7 @@ readConfig(const char *line, PlanetPrope	61	@@ -296,7 +299,7 @@ readConfig(const char line, PlanetProperties planetP
62	int r, g, b;	62	int r, g, b;
63	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)	63	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
64	{	64	{
Lines 67-73 Since it happens in a half-dozen places, introduce a trivial helper function. Link Here
67	currentProperties->MarkerColor(color);	67	currentProperties->MarkerColor(color);
68	}	68	}
69	else	69	else
70	@@ -403,7 +406,7 @@ readConfig(const char *line, PlanetPrope	70	@@ -403,7 +406,7 @@ readConfig(const char line, PlanetProperties planetP
71	int r, g, b;	71	int r, g, b;
72	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)	72	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
73	{	73	{
Lines 76-82 Since it happens in a half-dozen places, introduce a trivial helper function. Link Here
76	currentProperties->OrbitColor(color);	76	currentProperties->OrbitColor(color);
77	}	77	}
78	else	78	else
79	@@ -473,7 +476,7 @@ readConfig(const char *line, PlanetPrope	79	@@ -473,7 +476,7 @@ readConfig(const char line, PlanetProperties planetP
80	int r, g, b;	80	int r, g, b;
81	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)	81	if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
82	{	82	{
Lines 85-87 Since it happens in a half-dozen places, introduce a trivial helper function. Link Here
85	currentProperties->TextColor(color);	85	currentProperties->TextColor(color);
86	}	86	}
87	else	87	else
		88	@@ -550,7 +553,7 @@ readConfigFile(string configFile, PlanetProperties *pl
		89
		90	ifstream inFile(configFile.c_str());
		91	char *line = new char[256];
		92	- while (inFile.getline(line, 256, '\n') != NULL)
		93	+ while (inFile.getline(line, 256, '\n'))
		94	readConfig(line, planetProperties);
		95
		96	// This condition will only be true if [default] is the only

Lines 1-11 Link Here

(-)audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk (-6 / +43 lines)
1	--- dpf/Makefile.base.mk.orig 2019-02-28 18:07:46 UTC	1	--- dpf/Makefile.base.mk.orig 2019-07-07 08:30:45 UTC
2	+++ dpf/Makefile.base.mk	2	+++ dpf/Makefile.base.mk
3	@@ -90,7 +90,7 @@ endif	3	@@ -12,6 +12,8 @@ CXX ?= g++
4	# Set build and link flags	4	# Auto-detect OS if not defined
5		5
6	BASE_FLAGS = -Wall -Wextra -pipe -MD -MP	6	ifneq ($(BSD),true)
7	-BASE_OPTS = -O3 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections	7	+ifneq ($(FREEBSD),true)
8	+BASE_OPTS = -O3 -ffast-math $(SIMD_FLAGS) -fdata-sections -ffunction-sections	8	+ifneq ($(FREEBSDPPC),true)
		9	ifneq ($(HAIKU),true)
		10	ifneq ($(HURD),true)
		11	ifneq ($(LINUX),true)
		12	@@ -22,6 +24,12 @@ TARGET_MACHINE := $(shell $(CC) -dumpmachine)
		13	ifneq (,$(findstring bsd,$(TARGET_MACHINE)))
		14	BSD=true
		15	endif
		16	+ifneq (,$(findstring freebsd,$(TARGET_MACHINE)))
		17	+FREEBSD=true
		18	+ifneq (,$(findstring powerpc,$(TARGET_MACHINE)))
		19	+FREEBSDPPC=true
		20	+endif
		21	+endif
		22	ifneq (,$(findstring haiku,$(TARGET_MACHINE)))
		23	HAIKU=true
		24	endif
		25	@@ -44,6 +52,8 @@ endif
		26	endif
		27	endif
		28	endif
		29	+endif
		30	+endif
		31
		32	# ---------------------------------------------------------------------------------------------------------------------
		33	# Set PKG_CONFIG (can be overridden by environment variable)
		34	@@ -107,7 +117,13 @@ endif
9		35
		36	BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
		37	BASE_OPTS = -O3 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
		38	-
		39	+ifeq ($(FREEBSD),true)
		40	+ifeq ($(FREEBSDPPC),true)
		41	+BASE_OPTS = -O3 -ffast-math -fdata-sections -ffunction-sections
		42	+else
		43	+BASE_OPTS = -O3 -ffast-math -msse -msse2 -fdata-sections -ffunction-sections
		44	+endif
		45	+endif
10	ifeq ($(MACOS),true)	46	ifeq ($(MACOS),true)
11	# MacOS linker flags	47	# MacOS linker flags
		48	LINK_OPTS = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs

Removed Link Here

(-)audio/funktrackergold/files/patch-dsp_mixxer.c (-50 lines)
1	--- dsp_mixxer.c.orig Mon Jun 22 12:39:39 1998
2	+++ dsp_mixxer.c Sat Jul 14 21:55:28 2007
3	@@ -15,15 +15,11 @@
4	***************************************************************************/
5	#include <stdio.h>
6	#include <math.h>
7	-#include <malloc.h>
8	+#include <stdlib.h>
9	#include <unistd.h>
10	#include <fcntl.h>
11	#include <sys/ioctl.h>
12	-#ifdef Linux
13	- #include <sys/soundcard.h>
14	-#elif FreeBSD
15	- #include <machine/soundcard.h>
16	-#endif
17	+#include <sys/soundcard.h>
18	#include "funktracker_defs.h"
19	#include "funktracker.h"
20	#include "funkload.h"
21	@@ -301,12 +297,12 @@
22
23	for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
24	{
25	- if(chmix[chan_no].funkctrl & 0x2)
26	+ if(chmix[chan_no].funkctrl & 0x2) {
27	#pragma pack(1)
28	sam = ((sDB )chmix[chan_no].sample_addr +
29	(unsigned long)chmix[chan_no].sample_ptr);
30	#pragma pack()
31	- else
32	+ } else
33	sam = 0;
34
35	#ifdef DIGITAL_ECHOING
36	@@ -363,12 +359,12 @@
37	shift_t = 8 + shift_table[funk_info.no_active_channels];
38	for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
39	{
40	- if(chmix[chan_no].funkctrl & 0x2)
41	+ if(chmix[chan_no].funkctrl & 0x2) {
42	#pragma pack(1)
43	sam = ((sDW )chmix[chan_no].sample_addr +
44	(unsigned long)chmix[chan_no].sample_ptr);
45	#pragma pack()
46	- else
47	+ } else
48	sam = 0;
49	#ifdef DIGITAL_ECHOING
50	sam_reverb = *(chmix[chan_no].echo_buffer +

Removed Link Here

(-)audio/funktrackergold/files/patch-headers (-53 lines)
1	--- ../funkgold-orig/funkgold.c Sun Jun 21 22:10:54 1998
2	+++ funkgold.c Sun Apr 1 17:53:18 2001
3	@@ -23,7 +23,7 @@
4	***************************************************************************/
5	#include <curses.h>
6	#include <unistd.h>
7	-#include <malloc.h>
8	+#include <stdlib.h>
9	#include <string.h>
10	#include <signal.h>
11	#include <sys/time.h>
12	--- ../funkgold-orig/funkgold_dir.c Wed Dec 2 22:01:23 1998
13	+++ funkgold_dir.c Sun Apr 1 18:05:59 2001
14	@@ -18,7 +18,6 @@
15	#include <unistd.h>
16	#include <dirent.h>
17	#include <sys/stat.h>
18	-#include <malloc.h>
19	#include <string.h>
20	#include <stdlib.h>
21	#include "funktracker_defs.h"
22	--- ../funkgold-orig/funkgold_misc.c Sun Jun 21 15:56:46 1998
23	+++ funkgold_misc.c Sun Apr 1 17:53:30 2001
24	@@ -17,7 +17,6 @@
25	#include <stdlib.h>
26	#include <string.h>
27	#include <sys/time.h>
28	-#include <malloc.h>
29	#include "funktracker_defs.h"
30	#include "dsp_mixxer.h"
31	#include "funktracker.h"
32	--- ../funkgold-orig/funkgold_sm.c Sun Jun 21 15:57:07 1998
33	+++ funkgold_sm.c Sun Apr 1 17:53:44 2001
34	@@ -16,7 +16,7 @@
35	***************************************************************************/
36	#include <curses.h>
37	#include <unistd.h>
38	-#include <malloc.h>
39	+#include <stdlib.h>
40	#include "funktracker_defs.h"
41	#include "dsp_mixxer.h"
42	#include "funktracker.h"
43	--- ../funkgold-orig/funkload.c Sun Jun 21 15:57:21 1998
44	+++ funkload.c Sun Apr 1 17:53:51 2001
45	@@ -15,7 +15,7 @@
46	***************************************************************************/
47	#include <stdio.h>
48	#include <string.h>
49	-#include <malloc.h>
50	+#include <stdlib.h>
51	#include "funktracker_defs.h"
52	#include "dsp_mixxer.h"
53	#include "funktracker.h"

Lines 27-39 PLIST_SUB= VERSION=${PORTVERSION} Link Here

(-)audio/osalp/Makefile (-7 lines)
27		27
28	CONFLICTS= libaudiofile-[0-9]*	28	CONFLICTS= libaudiofile-[0-9]*
29		29
30	post-patch:
31	@${FIND} ${WRKSRC} -name "*.cc" \| ${XARGS} ${REINPLACE_CMD} -E \
32	's\|iostream.h\|iostream\|; \
33	s\|[[:space:]]cout\| std::cout\|g; \
34	s\|[[:space:]]endl\| std::endl\|g; \
35	s\|[[:space:]]cerr\| std::cerr\|g;'
36
37	post-install:	30	post-install:
38	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaflib-${PORTVERSION}.so \	31	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaflib-${PORTVERSION}.so \
39	${STAGEDIR}${PREFIX}/lib/aflib/lib*-${PORTVERSION}.so	32	${STAGEDIR}${PREFIX}/lib/aflib/lib*-${PORTVERSION}.so

Lines 8-10 Link Here

(-)audio/osalp/files/patch-aflib_aflibMemCache.cc (+9 lines)
8		8
9	#include "aflibMemCache.h"	9	#include "aflibMemCache.h"
10	#include "aflibMemNode.h"	10	#include "aflibMemNode.h"
		11	@@ -559,7 +560,7 @@ aflibMemCache::fillDataFromCache(
		12	// IF we need data at the end then get the data
		13	if (num_samples != orig_num_samples)
		14	{
		15	- cerr << "NOT YET IMPLEMENTED!" << endl;
		16	+ std::cerr << "NOT YET IMPLEMENTED!" << endl;
		17	}
		18	#endif
		19

Lines 27-49 DESKTOP_ENTRIES="SpiralLoops" "" "" "SpiralLoops" "" false Link Here

(-)audio/spiralloops/Makefile (-17 lines)
27		27
28	OPTIONS_DEFINE= DOCS	28	OPTIONS_DEFINE= DOCS
29		29
30	post-patch:
31	${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.orig
32	${SED} -E "s:-ldl::g; \
33	s:^CFLAGS:XCFLAGS:g; \
34	s:^CXXFLAGS:XCXXFLAGS:g; \
35	s:-O3::g; \
36	s:CFLAGS =:CFLAGS +=:g; \
37	s:CXXFLAGS=:CXXFLAGS+=:g; \
38	s:-lm:-lpthread -lm:g; \
39	s:/usr/X11R6:${LOCALBASE}:g; \
40	s:gcc:${CC}:; s:g\+\+:${CXX}:" \
41	< ${WRKSRC}/Makefile.in.orig > ${WRKSRC}/Makefile.in
42
43	@${FIND} ${WRKSRC} -type f -name ".C" -o -name ".cpp" -o -name "*.h" \| ${XARGS} \
44	${REINPLACE_CMD} -e '/^#include <FL/s\|.h>$$\|.H>\|; /^#include "FL/s\|.h"$$\|.H"\|; \
45	s\|fl_file_chooser.H\|Fl_File_Chooser.H\|g; s\|iostream.h\|iostream\|; s\|fstream.h\|fstream\|'
46
47	do-install:	30	do-install:
48	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${STAGEDIR}${PREFIX}/bin	31	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${STAGEDIR}${PREFIX}/bin
49		32

Removed Link Here

(-)audio/spiralloops/files/patch-Fl_Knob.H (-12 lines)
1	patch by Stephen Paskaluk to enable compilation with fltk 1.1.2
2
3	--- GUI/Widgets/Fl_Knob.H.orig Thu Apr 19 16:48:10 2001
4	+++ GUI/Widgets/Fl_Knob.H Sat Mar 1 12:36:19 2003
5	@@ -4,6 +4,7 @@
6	#define Fl_Knob_H
7	#include <FL/Fl.H>
8	#include <FL/Fl_Valuator.H>
9	+#include <FL/Fl_Group.H>
10
11	class Fl_Knob : public Fl_Valuator {
12	public:

Removed Link Here

(-)audio/spiralloops/files/patch-Fl_LED_Button.H (-12 lines)
1	patch by Stephen Paskaluk to enable compilation with fltk 1.1.2
2
3	--- GUI/Widgets/Fl_LED_Button.H.orig Thu Apr 19 16:48:11 2001
4	+++ GUI/Widgets/Fl_LED_Button.H Sat Mar 1 12:39:19 2003
5	@@ -4,6 +4,7 @@
6	#define Fl_LED_Button_H
7	#include <FL/Fl.H>
8	#include <FL/Fl_Light_Button.H>
9	+#include <FL/Fl_Group.H>
10
11	class Fl_LED_Button : public Fl_Light_Button {
12	public:

Removed Link Here

(-)audio/spiralloops/files/patch-Fl_LED_Button.cxx (-20 lines)
1	--- GUI/Widgets/Fl_LED_Button.cxx.orig Thu Apr 19 22:48:11 2001
2	+++ GUI/Widgets/Fl_LED_Button.cxx Wed Nov 22 13:16:40 2006
3	@@ -3,7 +3,7 @@
4	#include "Fl_LED_Button.H"
5	#include <FL/fl_draw.H>
6
7	-Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l=0):Fl_Light_Button(x,y,w,h,l) {
8	+Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l):Fl_Light_Button(x,y,w,h,l) {
9	box(FL_NO_BOX);
10	down_box(FL_ROUND_DOWN_BOX);
11	selection_color(FL_RED);
12	@@ -15,7 +15,7 @@
13	void Fl_LED_Button::draw() {
14	uchar r,g,b;
15
16	- if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
17	+ if (box()) draw_box(this==Fl::pushed() ? down_box() : box(), color());
18	Fl_Color col = value() ? selection_color() : color();
19	Fl::get_color((Fl_Color)selection_color(),r,g,b);
20	int d = h()/6;

Removed Link Here

(-)audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h (-12 lines)
1	--- GUI/Widgets/Fl_Trigger.h.orig 2001-04-20 00:48:10.000000000 +0400
2	+++ GUI/Widgets/Fl_Trigger.h 2014-02-13 05:50:41.290374838 +0400
3	@@ -24,6 +24,9 @@
4	#ifndef TRIGGERWIDGET
5	#define TRIGGERWIDGET
6
7	+using std::istream;
8	+using std::ostream;
9	+
10	class Fl_Trigger : public Fl_Widget
11	{
12	public:

Removed Link Here

(-)audio/spiralloops/files/patch-Output.h (-20 lines)
1	--- ./SpiralSound/Output.h.orig Sun Dec 1 15:38:45 2002
2	+++ ./SpiralSound/Output.h Sun Dec 1 15:40:05 2002
3	@@ -20,16 +20,12 @@
4	#include <stdio.h>
5	#include <fcntl.h>
6	#include <unistd.h>
7	-#if defined (__FreeBSD__)
8	- #include <machine/soundcard.h>
9	-#else
10	#if defined (__NetBSD__) \|\| defined (__OpenBSD__)
11	#include <soundcard.h> /* OSS emulation */
12	#undef ioctl
13	-#else /* BSDI, Linux, Solaris */
14	+#else /* FreeBSD, BSDI, Linux, Solaris */
15	#include <sys/soundcard.h>
16	#endif /* __NetBSD__ or __OpenBSD__ */
17	-#endif /* __FreeBSD__ */
18	#include <sys/ioctl.h>
19	#include <limits.h>
20

Lines 29-64 OPTIONS_DEFINE= OPTIMIZED_CFLAGS Link Here

(-)audio/spiralsynthmodular/Makefile (-30 lines)
29		29
30	OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math	30	OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math
31		31
32	post-patch:
33	@${REINPLACE_CMD} -E -e 's@(-O3\|-ffast-math)@@g; \
34	s\|-Wall\|\|; \
35	s\|CFLAGS="-pipe\|CFLAGS="\$$\{CFLAGS\}\|; \
36	s\|CXXFLAGS="-pipe\|CXXFLAGS="\$$\{CXXFLAGS\}\|; \
37	s\|^SpiralSound/Plugins/MidiPlugin/Makefile\|\|; \
38	s\|MidiPlugin\|\|' \
39	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
40	@${REINPLACE_CMD} -e 's\|-I/usr/X11R6/include\|-I${LOCALBASE}/include\|' \
41	${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in
42	@${REINPLACE_CMD} -e 's\|O_SYNC\|O_FSYNC\|' \
43	${WRKSRC}/SpiralSound/Midi.C
44	@${REINPLACE_CMD} -e 's\|True\|true\|; s\|False\|false\|' \
45	${WRKSRC}/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
46	@${REINPLACE_CMD} -e 's\|JackPort::\|\|' \
47	${WRKSRC}/SpiralSound/Plugins/JackPlugin/JackPlugin.h
48	@${REINPLACE_CMD} -e 's\|CVGUI::\|\|' \
49	${WRKSRC}/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h
50	@${REINPLACE_CMD} -e 's\|Sample::\|\|' \
51	${WRKSRC}/SpiralSound/Sample.h
52	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -E -e \
53	's,-l(dl\|rt),,; s\|g\+\+\|$$(CXX)\|; \
54	/^(CC\|CXX)[[:space:]]*=.+$$/d; \
55	s,@FLTK_(C\|CXX)FLAGS@,-I${LOCALBASE}/include,; \
56	s,(bin\|lib)dir),DESTDIR)$$(&,'
57	@${FIND} ${WRKSRC} -type f -name ".C" -o -name ".cpp" -o -name "*.h" \
58	\| ${XARGS} ${REINPLACE_CMD} -e '/^#include <FL/s\|.h>$$\|.H>\|; \
59	/^#include "FL/s\|.h"$$\|.H"\|; \
60	s\|fl_file_chooser.H\|Fl_File_Chooser.H\|g'
61
62	post-install:	32	post-install:
63	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	33	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
64	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/SpiralPlugins/*.so	34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/SpiralPlugins/*.so

Lines 1-5 Link Here

(-)audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C (-1 / +13 lines)
1	--- SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C.orig 2018-08-01 05:59:24 UTC	1	--- SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C.orig 2003-08-08 17:55:51 UTC
2	+++ SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C	2	+++ SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
		3	@@ -17,9 +17,9 @@
		4	*/
		5
		6	#include "PoshSamplerPluginGUI.h"
		7	-#include <FL/fl_draw.h>
		8	#include <FL/fl_draw.H>
		9	-#include <FL/fl_file_chooser.h>
		10	+#include <FL/fl_draw.H>
		11	+#include <FL/Fl_File_Chooser.H>
		12
		13	using namespace std;
		14
3	@@ -502,7 +502,7 @@ inline void PoshSamplerPluginGUI::cb_Load_i(Fl_Button*	15	@@ -502,7 +502,7 @@ inline void PoshSamplerPluginGUI::cb_Load_i(Fl_Button*
4	{	16	{
5	char fn=fl_file_chooser("Load a sample", "{.wav,*.WAV}", NULL);	17	char fn=fl_file_chooser("Load a sample", "{.wav,*.WAV}", NULL);