Large diffs are not rendered by default.

@@ -26,14 +26,15 @@ HOMEPAGE= http://www.eclipse.org/

MAINTAINER= Matthew Dempsky <matthew@openbsd.org>

# XXX(matthew): Blindly copied from Eclipse 3.x port
# Licenses are detailed in about.html and notice.html and include:
#
# Eclipse Public License Version 1.0 (http://www.eclipse.org/legal/epl-v10.html)
# Common Public License 1.0 (http://www.eclipse.org/legal/cpl-v10.html)
# Apache Software License 1.1 (http://www.apache.org/licenses/LICENSE)
# Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
# IBM Public License 1.0 (http://oss.software.ibm.com/developerworks/opensource/license10.html)
# Metro Link Public License 1.00 (http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
# Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html)
# LGPL 2.1
# LGPL 2.1 (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
PERMIT_PACKAGE_CDROM= commercial distribution defend and indemnify clauses
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= commercial distribution defend and indemnify clauses
@@ -48,7 +49,7 @@ MASTER_SITES= ${MASTER_SITE_ECLIPSE:=R-4.2-201206081400/}
MASTER_SITES0= file://${FILESDIR}/

MODULES= java
MODJAVA_VER= 1.7+
MODJAVA_VER= 1.6+

BUILD_DEPENDS= devel/xulrunner/1.9,-devel devel/gmake archivers/zip archivers/unzip
RUN_DEPENDS= ${MODJAVA_RUN_DEPENDS}
@@ -0,0 +1,52 @@
# $OpenBSD: Makefile,v 1.2 2012/07/13 11:27:16 edd Exp $

COMMENT = OCaml Batteries Included - OCaml foundation library
CATEGORIES = devel

V = 1.5.0
DISTNAME = batteries-${V}
PKGNAME = ocaml-batteries-${V}

# You need to update MASTER_SITES too, when changing the version number.
MASTER_SITES = https://forge.ocamlcore.org/frs/download.php/950/

HOMEPAGE = http://batteries.forge.ocamlcore.org/

MAINTAINER = Christopher Zimmermann <madroach@gmerlin.de>

# LGPL >=2.1
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes

MODULES = lang/ocaml

RUN_DEPENDS = devel/ocaml-camomile
BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib
REGRESS_DEPENDS = devel/ounit

USE_GMAKE = Yes

MAKE_ENV = BATTERIES_NATIVE=${MODOCAML_NATIVE:S/Yes/yes/:S/No/no/} \
DOCROOT=${PREFIX}/share/doc/ocaml-batteries \
TERM=${TERM}

FAKE_FLAGS = DESTDIR=${WRKINST}${PREFIX}/lib/ocaml \
DOCROOT=${WRKINST}${PREFIX}/share/doc/ocaml-batteries

ALL_TARGET = all doc
REGRESS_TARGET = test
INSTALL_TARGET = install install-doc


pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml

post-install:
${INSTALL_DATA} \
${WRKSRC}/ocamlinit \
${PREFIX}/share/doc/ocaml-batteries/


.include <bsd.port.mk>
@@ -0,0 +1 @@
* test non-native arch, maybe non-native-dl arch
@@ -0,0 +1,16 @@
* bump version to 1.5.0

* remove patch - META info fixed upstream

* move cmxs to PFRAG.native-dynlink

* update ocamlfind sitelib path

* /usr/local/ocaml/site-lib/batteries/ocaml is a script, no executable

* Fix toplevel help system

The path to the documentation is hardcoded at build time.
Therefore DOCROOT may not be prefixed by WRKINST at build time.

What is better here? PREFIX or LOCALBASE?
@@ -0,0 +1,2 @@
SHA256 (batteries-1.5.0.tar.gz) = mspGWxG9vqtXnCeppkyxzHrotWY2FRELAHCapIm/kIU=
SIZE (batteries-1.5.0.tar.gz) = 657786
@@ -0,0 +1,11 @@
***OCaml Batteries Included***, or just ***Batteries***, is a
community-maintained foundation library for your OCaml projects.
Batteries

* defines a standard set of libraries which may be expected on every
compliant installation of OCaml;

* organizes these libraries into a hierarchy of modules, with a single
source of documentation; and

* provides a consistent API for otherwise independent libraries.
@@ -0,0 +1,3 @@
@comment $OpenBSD$
@bin lib/ocaml/batteries/batteries.cmxs
@bin lib/ocaml/batteries/batteries_uni.cmxs
@@ -0,0 +1,102 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2012/07/13 08:40:28 edd Exp $
%%dynlink%%
lib/ocaml/batteries/batArg.cmx
lib/ocaml/batteries/batArray.cmx
lib/ocaml/batteries/batAvlTree.cmx
lib/ocaml/batteries/batBase64.cmx
lib/ocaml/batteries/batBig_int.cmx
lib/ocaml/batteries/batBigarray.cmx
lib/ocaml/batteries/batBitSet.cmx
lib/ocaml/batteries/batBool.cmx
lib/ocaml/batteries/batBuffer.cmx
lib/ocaml/batteries/batCache.cmx
lib/ocaml/batteries/batCamomile.cmx
lib/ocaml/batteries/batChar.cmx
lib/ocaml/batteries/batCharEncodings.cmx
lib/ocaml/batteries/batCharParser.cmx
lib/ocaml/batteries/batComplex.cmx
lib/ocaml/batteries/batConcurrent.cmx
lib/ocaml/batteries/batDeque.cmx
lib/ocaml/batteries/batDigest.cmx
lib/ocaml/batteries/batDllist.cmx
lib/ocaml/batteries/batDynArray.cmx
lib/ocaml/batteries/batEnum.cmx
lib/ocaml/batteries/batFile.cmx
lib/ocaml/batteries/batFloat.cmx
lib/ocaml/batteries/batFormat.cmx
lib/ocaml/batteries/batGc.cmx
lib/ocaml/batteries/batGenlex.cmx
lib/ocaml/batteries/batGlobal.cmx
lib/ocaml/batteries/batHashcons.cmx
lib/ocaml/batteries/batHashtbl.cmx
lib/ocaml/batteries/batHeap.cmx
lib/ocaml/batteries/batIMap.cmx
lib/ocaml/batteries/batIO.cmx
lib/ocaml/batteries/batISet.cmx
lib/ocaml/batteries/batInnerIO.cmx
lib/ocaml/batteries/batInnerWeaktbl.cmx
lib/ocaml/batteries/batInt.cmx
lib/ocaml/batteries/batInt32.cmx
lib/ocaml/batteries/batInt64.cmx
lib/ocaml/batteries/batInterfaces.cmx
lib/ocaml/batteries/batLazyList.cmx
lib/ocaml/batteries/batLexing.cmx
lib/ocaml/batteries/batList.cmx
lib/ocaml/batteries/batLogger.cmx
lib/ocaml/batteries/batMap.cmx
lib/ocaml/batteries/batMarshal.cmx
lib/ocaml/batteries/batMonad.cmx
lib/ocaml/batteries/batMultiPMap.cmx
lib/ocaml/batteries/batMutex.cmx
lib/ocaml/batteries/batNativeint.cmx
lib/ocaml/batteries/batNum.cmx
lib/ocaml/batteries/batNumber.cmx
lib/ocaml/batteries/batOo.cmx
lib/ocaml/batteries/batOptParse.cmx
lib/ocaml/batteries/batOption.cmx
lib/ocaml/batteries/batPMap.cmx
lib/ocaml/batteries/batPSet.cmx
lib/ocaml/batteries/batPair.cmx
lib/ocaml/batteries/batParserCo.cmx
lib/ocaml/batteries/batPathGen.cmx
lib/ocaml/batteries/batPervasives.cmx
lib/ocaml/batteries/batPrint.cmx
lib/ocaml/batteries/batPrintexc.cmx
lib/ocaml/batteries/batPrintf.cmx
lib/ocaml/batteries/batQueue.cmx
lib/ocaml/batteries/batRMutex.cmx
lib/ocaml/batteries/batRandom.cmx
lib/ocaml/batteries/batRef.cmx
lib/ocaml/batteries/batRefList.cmx
lib/ocaml/batteries/batResult.cmx
lib/ocaml/batteries/batReturn.cmx
lib/ocaml/batteries/batRope.cmx
lib/ocaml/batteries/batScanf.cmx
lib/ocaml/batteries/batSeq.cmx
lib/ocaml/batteries/batSet.cmx
lib/ocaml/batteries/batSplay.cmx
lib/ocaml/batteries/batStack.cmx
lib/ocaml/batteries/batStd.cmx
lib/ocaml/batteries/batStr.cmx
lib/ocaml/batteries/batStream.cmx
lib/ocaml/batteries/batString.cmx
lib/ocaml/batteries/batSubstring.cmx
lib/ocaml/batteries/batSys.cmx
lib/ocaml/batteries/batTuple.cmx
lib/ocaml/batteries/batUChar.cmx
lib/ocaml/batteries/batUCharParser.cmx
lib/ocaml/batteries/batUTF8.cmx
lib/ocaml/batteries/batUnit.cmx
lib/ocaml/batteries/batUnix.cmx
lib/ocaml/batteries/batUref.cmx
lib/ocaml/batteries/batValue_printer.cmx
lib/ocaml/batteries/batVect.cmx
lib/ocaml/batteries/batteries.a
lib/ocaml/batteries/batteries.cmx
lib/ocaml/batteries/batteries.cmxa
lib/ocaml/batteries/batteries_config.cmx
lib/ocaml/batteries/batteries_print.cmx
lib/ocaml/batteries/batteries_uni.a
lib/ocaml/batteries/batteries_uni.cmx
lib/ocaml/batteries/batteries_uni.cmxa
lib/ocaml/batteries/extlibcompat.cmx

Large diffs are not rendered by default.

@@ -0,0 +1,30 @@
# $OpenBSD: Makefile,v 1.7 2010/11/15 19:46:00 espie Exp $

COMMENT= Objective Caml bindings for calendar functions
CATEGORIES= devel

V= 2.03.2
DISTNAME= calendar-${V}
PKGNAME= ocaml-calendar-${V}
# You need to update MASTER_SITES too, when changing the version number.
MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/915/

MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
HOMEPAGE= http://www.lri.fr/~signoles/prog.en.html

PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

MODULES= lang/ocaml
NO_REGRESS= Yes
ALL_TARGET= all
CONFIGURE_STYLE= gnu
USE_GMAKE= yes


pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml

.include <bsd.port.mk>
@@ -0,0 +1 @@
test non-native arch
@@ -0,0 +1,3 @@
* bump version to 2.03.2
* change MASTER_SITE
* use ocamlfind -> add pre-fake target
@@ -0,0 +1,2 @@
SHA256 (calendar-2.03.2.tar.gz) = DjgfqqO7pSLLrHBaf4cubs+hUiBnH0aI0eMRYxaH+xI=
SIZE (calendar-2.03.2.tar.gz) = 270225
@@ -0,0 +1,3 @@
The Calendar library is a library providing a set of operations
over dates and times. This library is written for version 3.06
or greater of Objective Caml.
@@ -0,0 +1,2 @@
@comment $OpenBSD$
@bin lib/ocaml/calendar/calendarLib.cmxs
@@ -0,0 +1,6 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2005/09/22 14:38:41 avsm Exp $
%%dynlink%%
lib/ocaml/calendar/calendarLib.a
lib/ocaml/calendar/calendarLib.cmx
lib/ocaml/calendar/calendarLib.cmxa
lib/ocaml/calendar/calendarLib.o
@@ -0,0 +1,22 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/09/22 14:38:41 avsm Exp $
%%native%%
lib/ocaml/
lib/ocaml/calendar/
lib/ocaml/calendar/META
lib/ocaml/calendar/calendar.mli
lib/ocaml/calendar/calendarLib.cma
lib/ocaml/calendar/calendarLib.cmi
lib/ocaml/calendar/calendarLib.cmo
lib/ocaml/calendar/calendar_builder.mli
lib/ocaml/calendar/calendar_sig.mli
lib/ocaml/calendar/date.mli
lib/ocaml/calendar/date_sig.mli
lib/ocaml/calendar/fcalendar.mli
lib/ocaml/calendar/ftime.mli
lib/ocaml/calendar/period.mli
lib/ocaml/calendar/printer.mli
lib/ocaml/calendar/time.mli
lib/ocaml/calendar/time_Zone.mli
lib/ocaml/calendar/time_sig.mli
lib/ocaml/calendar/utils.mli
lib/ocaml/calendar/version.mli
@@ -0,0 +1,46 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/07/13 08:38:09 edd Exp $

COMMENT = unicode library for objective caml

CATEGORIES = devel

V = 0.8.3
REVISION = 0
DISTNAME = camomile-${V}
PKGNAME = ocaml-camomile-${V}
EXTRACT_SUFX = .tar.bz2

MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=camomile/}

HOMEPAGE = http://camomile.sourceforge.net/

MAINTAINER = Christopher Zimmermann <madroach@gmerlin.de>

# LGPL >= 2
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes

MODULES = lang/ocaml

BUILD_DEPENDS = sysutils/findlib

CONFIGURE_STYLE = gnu dest

NO_REGRESS = Yes
USE_GMAKE = Yes

ALL_TARGET = all dochtml

pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml

post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/camomile/html/
${INSTALL_DATA} ${WRKSRC}/Changes ${PREFIX}/share/doc/camomile/
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/camomile/
${INSTALL_DATA} ${WRKSRC}/dochtml/* \
${PREFIX}/share/doc/camomile/html/

.include <bsd.port.mk>
@@ -0,0 +1,2 @@
SHA256 (camomile-0.8.3.tar.bz2) = lMjWXUF8kDAfazsh5LAOFRxDSj4tQGw9WzNjhZA08ns=
SIZE (camomile-0.8.3.tar.bz2) = 2646968
@@ -0,0 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/07/13 08:38:10 edd Exp $

Upstream bug:
http://sourceforge.net/tracker/?func=detail&aid=3318291&group_id=40603&atid=428416

--- Makefile.in.orig Mon Jul 9 19:29:06 2012
+++ Makefile.in Mon Jul 9 19:29:09 2012
@@ -70,7 +70,7 @@ OFLAGS = $(OOPTIONS) $(INCLUDES)
# Generic targets
#################

-all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data
+all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data

# Build the library
###################
@@ -0,0 +1,5 @@
Camomile is a Unicode library for OCaml language. Camomile provides
Unicode character type, UTF-8, UTF-16, UTF-32 strings, conversion
to/from about 200 encodings, collation and locale-sensitive case
mappings, and more. The library is currently designed for Unicode
Standard 3.2.
@@ -0,0 +1,7 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2012/07/13 08:38:10 edd Exp $
lib/ocaml/camomile/camomile.a
lib/ocaml/camomile/camomile.cmxa
lib/ocaml/camomile/camomileLibrary.cmx
lib/ocaml/camomile/camomileLibrary.cmxa
lib/ocaml/camomile/camomileLibraryDefault.cmx
lib/ocaml/camomile/camomileLibraryDyn.cmx

Large diffs are not rendered by default.

@@ -0,0 +1,59 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/07/16 15:51:33 edd Exp $

COMMENT = GMP bindings for OCaml

V = 0.13
REVISION = 0
DISTNAME = mlgmp-${V}
PKGNAME = ocaml-mlgmp-${V}

CATEGORIES = devel math
HOMEPAGE = http://caml.inria.fr/cgi-bin/hump.en.cgi?contrib=278
MAINTAINER = Edd Barrett <edd@openbsd.org>

# GPLv2
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes

MASTER_SITES = http://theunixzoo.co.uk/files/

MODULES = lang/ocaml
BUILD_DEPENDS = devel/gmp devel/mpfr
RUN_DEPENDS = ${BUILD_DEPENDS}

USE_GMAKE = Yes

# overide their site specific include/lib paths
MAKE_FLAGS += GMP_LIBDIR=${LOCALBASE}/lib
MAKE_FLAGS += GMP_INCLUDES=-I${LOCALBASE}/include
MAKE_FLAGS += CFLAGS_MISC="${CFLAGS}"

# build does not support just bytecode, but we can
# deal with this my calling certain make targets
LIBS_NATIVE = gmp.a gmp.cmxa
LIBS_OTHER = libmlgmp.a gmp.cma gmp.cmi

.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mocaml_native}
MAKE_FLAGS += LIBS="${LIBS_OTHER} ${LIBS_NATIVE}"
MAKE_FLAGS += TESTS="test_suite test_suite.opt"
MAKE_FLAGS += TESTS_RUN="tests-nonative tests-native"
.else
MAKE_FLAGS += LIBS="${LIBS_OTHER}"
MAKE_FLAGS += TESTS="test_suite"
MAKE_FLAGS += TESTS_RUN="tests-nonative"
.endif

REGRESS_TARGET = tests

# make dependencies are screwed up in the release tarball
pre-build:
cd ${WRKBUILD} && ${MAKE_PROGRAM} clean

post-install:
${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c \
${FILESDIR}/META ${PREFIX}/lib/ocaml/gmp/META

.include <bsd.port.mk>
File renamed without changes.
@@ -0,0 +1,4 @@
* bump REVISION
* update ocamlfind sitelib
* use new ocaml_native PROPERTY
* add ocamlfind META info
@@ -0,0 +1,2 @@
SHA256 (mlgmp-0.13.tar.gz) = Wp+nk5Wxay9dTXketVwvbQlHi5H+S4EgZkG6/BQ64As=
SIZE (mlgmp-0.13.tar.gz) = 973490
@@ -0,0 +1,7 @@
name="gmp"
version="0.13"
description="bindings to GNU MP library"
archive(byte)="gmp.cma"
archive(native)="gmp.cmxa"
requires=""
directory="+gmp"
@@ -0,0 +1,66 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/07/16 15:51:33 edd Exp $

- Allow overide of includes and libs.
- Fix DESTDIR clash.
- Honour CFLAGS.
- Allow bytecode-only compilation.

--- Makefile.orig Fri Feb 24 08:17:29 2012
+++ Makefile Sat Jul 14 15:46:26 2012
@@ -2,20 +2,20 @@
RANLIB= ranlib

OCAML_LIBDIR:= $(shell ocamlc -where)
-GMP_INCLUDES= -I/opt/gmp-4.1.2/include -I/users/absint2/local/include -I$(HOME)/packages/gmp/include
+GMP_INCLUDES?= -I/opt/gmp-4.1.2/include -I/users/absint2/local/include -I$(HOME)/packages/gmp/include

-GMP_LIBDIR=/opt/gmp-4.1.2/lib
-DESTDIR= $(OCAML_LIBDIR)/gmp
+GMP_LIBDIR?=/opt/gmp-4.1.2/lib
+INSTDIR= ${DESTDIR}/$(OCAML_LIBDIR)/gmp

#RLIBFLAGS= -cclib "-Wl,-rpath $(GMP_LIBDIR)" # Linux, FreeBSD
#RLIBFLAGS= -cclib "-Wl,-R $(GMP_LIBDIR)" # Solaris
# RLIBFLAGS= # MacOS X

LIBFLAGS= -cclib -L. -cclib -L$(GMP_LIBDIR) $(RLIBFLAGS) \
- -cclib -lmpfr -cclib -lgmp -cclib -L$(DESTDIR)
+ -cclib -lmpfr -cclib -lgmp -cclib -L${OCAML_LIBDIR}

#CC= icc
-CFLAGS_MISC= -Wall -Wno-unused -Werror -g -O3
+CFLAGS_MISC?= -Wall -Wno-unused -Werror -g -O3
#CFLAGS_MISC=
CFLAGS_INCLUDE= -I $(OCAML_LIBDIR) $(GMP_INCLUDES)
CFLAGS= $(CFLAGS_MISC) $(CFLAGS_INCLUDE)
@@ -27,20 +27,24 @@ OCAMLFLAGS=
CMODULES= mlgmp_z.c mlgmp_q.c mlgmp_f.c mlgmp_fr.c mlgmp_random.c mlgmp_misc.c
CMODULES_O= $(CMODULES:%.c=%.o)

-LIBS= libmlgmp.a gmp.a gmp.cma gmp.cmxa gmp.cmi
+LIBS?= libmlgmp.a gmp.a gmp.cma gmp.cmxa gmp.cmi

PROGRAMS= test_creal test_creal.opt essai essai.opt toplevel\
test_suite test_suite.opt
-TESTS= test_suite test_suite.opt
+TESTS?= test_suite test_suite.opt

-all: $(LIBS) tests
+all: $(LIBS)

install: all
- -mkdir $(DESTDIR)
- cp $(LIBS) gmp.mli $(DESTDIR)
+ -mkdir -p $(INSTDIR)
+ cp $(LIBS) gmp.mli $(INSTDIR)

-tests: $(LIBS) $(TESTS)
+tests: $(LIBS) $(TESTS) $(TESTS_RUN)
+
+tests-nonative:
./test_suite
+
+tests-native:
./test_suite.opt

%.i: %.c
@@ -0,0 +1,2 @@
An extended precision computation library (integers, rationals, floats)
in OCaml.
@@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2012/07/16 15:51:33 edd Exp $
lib/ocaml/gmp/gmp.a
lib/ocaml/gmp/gmp.cmxa
@@ -0,0 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/16 15:51:33 edd Exp $
%%native%%
lib/ocaml/gmp/
lib/ocaml/gmp/META
lib/ocaml/gmp/gmp.cma
lib/ocaml/gmp/gmp.cmi
lib/ocaml/gmp/gmp.mli
lib/ocaml/gmp/libmlgmp.a
@@ -0,0 +1,54 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $

COMMENT = the Ocamlnet internet protocol foundation library
CATEGORIES = devel www mail

V = 3.6
DISTNAME = ocamlnet-${V}
PKGNAME = ocaml-net-${V}

MASTER_SITES = http://download.camlcity.org/download/
HOMEPAGE = http://projects.camlcity.org/projects/ocamlnet.html

MAINTAINER = Christopher Zimmermann <madroach@zakweb.de>

# Mostly zlib/png, http server module is GPL
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes

MODULES = lang/ocaml

BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib
WANTLIB = c curses m pthread

CONFIGURE_STYLE = simple
CONFIGURE_ARGS = -with-nethttpd

NO_REGRESS = Yes
USE_GMAKE = Yes

ALL_TARGET = all ${MODOCAML_NATIVE:S/Yes/opt/:S/No//}

.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mocaml_native}
ALL_TARGET += opt
.endif

pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/stublibs

EXAMPLEDIR = ${PREFIX}/share/examples/ocaml-net
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocamlnet/html
${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/ocamlnet/
${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/ocamlnet/
${INSTALL_DATA} \
${WRKSRC}/doc/html-main/* \
${PREFIX}/share/doc/ocamlnet/html/
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
cp -r ${WRKSRC}/examples/* ${EXAMPLEDIR}
chown -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLEDIR}

.include <bsd.port.mk>
@@ -0,0 +1,2 @@
SHA256 (ocamlnet-3.6.tar.gz) = MGwgruZRK+NWTA85hytw+SnAbh6JPPz1KKxHrjXPemk=
SIZE (ocamlnet-3.6.tar.gz) = 3322518
@@ -0,0 +1,20 @@
Ocamlnet is an enhanced system platform library for Ocaml. As the name
suggests, large parts of it have to do with network programming, but it
is actually not restricted to this.

It contains the following modules:
* Netsys: portable interface to posix system calls, portable poll
* Netstring: string processing, regular expressions
* Netzip: data compression
* Equeue: event queues for concurrent execution flows
* Netplex: framework for servers with multiple worker threads
* Netshm
* Netcamlbox: Inter process communication with messages
* Netmulticore: Experimental framework for parallel computing
* Rpc: SunRPC remote procedure calls
* Netgssapi, Netmech-scram: GSS and SCRAM
* Netcgi: web application framework
* Netclient: Clients for HTTP, FTP, Telnet
* Pop
* Smtp
* Nethttpd: http server
@@ -0,0 +1,133 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2012/07/16 09:27:32 edd Exp $
lib/ocaml/equeue/equeue.a
lib/ocaml/equeue/equeue.cmxa
lib/ocaml/equeue/equeue.p.a
lib/ocaml/equeue/equeue.p.cmxa
lib/ocaml/netcamlbox/netcamlbox.a
lib/ocaml/netcamlbox/netcamlbox.cmxa
lib/ocaml/netcamlbox/netcamlbox.p.a
lib/ocaml/netcamlbox/netcamlbox.p.cmxa
lib/ocaml/netcgi2-plex/netcgi2-plex.a
lib/ocaml/netcgi2-plex/netcgi2-plex.cmxa
lib/ocaml/netcgi2-plex/netcgi2-plex.p.a
lib/ocaml/netcgi2-plex/netcgi2-plex.p.cmxa
lib/ocaml/netcgi2/netcgi.a
lib/ocaml/netcgi2/netcgi.cmxa
lib/ocaml/netcgi2/netcgi.p.a
lib/ocaml/netcgi2/netcgi.p.cmxa
lib/ocaml/netclient/netclient.a
lib/ocaml/netclient/netclient.cmxa
lib/ocaml/netclient/netclient.p.a
lib/ocaml/netclient/netclient.p.cmxa
lib/ocaml/netgssapi/netgssapi.a
lib/ocaml/netgssapi/netgssapi.cmxa
lib/ocaml/netgssapi/netgssapi.p.a
lib/ocaml/netgssapi/netgssapi.p.cmxa
lib/ocaml/nethttpd/nethttpd.a
lib/ocaml/nethttpd/nethttpd.cmxa
lib/ocaml/nethttpd/nethttpd.p.a
lib/ocaml/nethttpd/nethttpd.p.cmxa
lib/ocaml/netmulticore/netmulticore.a
lib/ocaml/netmulticore/netmulticore.cmxa
lib/ocaml/netmulticore/netmulticore.p.a
lib/ocaml/netmulticore/netmulticore.p.cmxa
lib/ocaml/netplex/netplex.a
lib/ocaml/netplex/netplex.cmxa
lib/ocaml/netplex/netplex.p.a
lib/ocaml/netplex/netplex.p.cmxa
lib/ocaml/netplex/netplex_mt.cmx
lib/ocaml/netplex/netplex_mt.o
lib/ocaml/netplex/netplex_mt.p.cmx
lib/ocaml/netplex/netplex_mt.p.o
lib/ocaml/netshm/netshm.a
lib/ocaml/netshm/netshm.cmxa
lib/ocaml/netshm/netshm.p.a
lib/ocaml/netshm/netshm.p.cmxa
lib/ocaml/netstring/netbuffer.cmx
lib/ocaml/netstring/netbuffer.o
lib/ocaml/netstring/netbuffer.p.cmx
lib/ocaml/netstring/netbuffer.p.o
lib/ocaml/netstring/netconversion.cmx
lib/ocaml/netstring/netconversion.o
lib/ocaml/netstring/netconversion.p.cmx
lib/ocaml/netstring/netconversion.p.o
lib/ocaml/netstring/netmappings_iso.cmx
lib/ocaml/netstring/netmappings_iso.o
lib/ocaml/netstring/netmappings_iso.p.cmx
lib/ocaml/netstring/netmappings_iso.p.o
lib/ocaml/netstring/netmappings_jp.cmx
lib/ocaml/netstring/netmappings_jp.o
lib/ocaml/netstring/netmappings_jp.p.cmx
lib/ocaml/netstring/netmappings_jp.p.o
lib/ocaml/netstring/netmappings_kr.cmx
lib/ocaml/netstring/netmappings_kr.o
lib/ocaml/netstring/netmappings_kr.p.cmx
lib/ocaml/netstring/netmappings_kr.p.o
lib/ocaml/netstring/netmappings_min.cmx
lib/ocaml/netstring/netmappings_min.o
lib/ocaml/netstring/netmappings_min.p.cmx
lib/ocaml/netstring/netmappings_min.p.o
lib/ocaml/netstring/netmappings_other.cmx
lib/ocaml/netstring/netmappings_other.o
lib/ocaml/netstring/netmappings_other.p.cmx
lib/ocaml/netstring/netmappings_other.p.o
lib/ocaml/netstring/netnumber.cmx
lib/ocaml/netstring/netnumber.o
lib/ocaml/netstring/netnumber.p.cmx
lib/ocaml/netstring/netnumber.p.o
lib/ocaml/netstring/netstring.a
lib/ocaml/netstring/netstring.cmxa
lib/ocaml/netstring/netstring.p.a
lib/ocaml/netstring/netstring.p.cmxa
lib/ocaml/netstring/rtypes.cmx
lib/ocaml/netstring/rtypes.o
lib/ocaml/netstring/rtypes.p.cmx
lib/ocaml/netstring/rtypes.p.o
lib/ocaml/netstring/xdr.cmx
lib/ocaml/netstring/xdr.o
lib/ocaml/netstring/xdr.p.cmx
lib/ocaml/netstring/xdr.p.o
lib/ocaml/netsys/libnetsys.p.a
lib/ocaml/netsys/netsys.a
lib/ocaml/netsys/netsys.cmxa
lib/ocaml/netsys/netsys.p.a
lib/ocaml/netsys/netsys.p.cmxa
lib/ocaml/netsys/netsys_c_gprof.o
lib/ocaml/netsys/netsys_gprof_init.p.cmx
lib/ocaml/netsys/netsys_gprof_init.p.o
lib/ocaml/netsys/netsys_oothr.a
lib/ocaml/netsys/netsys_oothr.cmxa
lib/ocaml/netsys/netsys_oothr.p.a
lib/ocaml/netsys/netsys_oothr.p.cmxa
lib/ocaml/netsys/netsys_oothr_mt.a
lib/ocaml/netsys/netsys_oothr_mt.cmxa
lib/ocaml/netsys/netsys_oothr_mt.p.a
lib/ocaml/netsys/netsys_oothr_mt.p.cmxa
lib/ocaml/netsys/netsys_oothr_mt_init.cmx
lib/ocaml/netsys/netsys_oothr_mt_init.o
lib/ocaml/netsys/netsys_oothr_mt_init.p.cmx
lib/ocaml/netsys/netsys_oothr_mt_init.p.o
lib/ocaml/pop/pop.a
lib/ocaml/pop/pop.cmxa
lib/ocaml/pop/pop.p.a
lib/ocaml/pop/pop.p.cmxa
lib/ocaml/rpc-auth-local/librpc_auth_local.p.a
lib/ocaml/rpc-auth-local/rpc_auth_local.a
lib/ocaml/rpc-auth-local/rpc_auth_local.cmxa
lib/ocaml/rpc-auth-local/rpc_auth_local.p.a
lib/ocaml/rpc-auth-local/rpc_auth_local.p.cmxa
lib/ocaml/rpc-generator/rpc_generator.a
lib/ocaml/rpc-generator/rpc_generator.cmxa
lib/ocaml/rpc-generator/rpc_generator.p.a
lib/ocaml/rpc-generator/rpc_generator.p.cmxa
lib/ocaml/rpc/rpc.cmxa
lib/ocaml/rpc/rpc.p.a
lib/ocaml/rpc/rpc.p.cmxa
lib/ocaml/shell/shell.a
lib/ocaml/shell/shell.cmxa
lib/ocaml/shell/shell.p.a
lib/ocaml/shell/shell.p.cmxa
lib/ocaml/smtp/smtp.a
lib/ocaml/smtp/smtp.cmxa
lib/ocaml/smtp/smtp.p.a
lib/ocaml/smtp/smtp.p.cmxa
@@ -0,0 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2012/07/16 09:27:32 edd Exp $
@comment lib/ocaml/stublibs/
lib/ocaml/stublibs/dllnetaccel_c.so
@comment lib/ocaml/stublibs/dllnetaccel_c.so.owner
lib/ocaml/stublibs/dllnetsys.so
@comment lib/ocaml/stublibs/dllnetsys.so.owner
lib/ocaml/stublibs/dllrpc_auth_local.so
@comment lib/ocaml/stublibs/dllrpc_auth_local.so.owner

Large diffs are not rendered by default.

@@ -0,0 +1,35 @@
# $OpenBSD: Makefile,v 1.3 2012/07/18 08:04:11 sthen Exp $

COMMENT = OCaml perl-compatible regexp library
CATEGORIES = devel textproc

V = 7.0.2
DISTNAME = pcre-ocaml-$V
PKGNAME = ocaml-pcre-$V

HOMEPAGE = http://ocaml.info/home/ocaml_sources.html

# GPLv2+
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes

MODULES = lang/ocaml

MASTER_SITES = https://bitbucket.org/mmottl/pcre-ocaml/downloads/

RUN_DEPENDS = sysutils/findlib
BUILD_DEPENDS = ${RUN_DEPENDS}
LIB_DEPENDS = devel/pcre
WANTLIB = pcre

NO_REGRESS = Yes

CONFIGURE_STYLE = simple
CONFIGURE_ARGS += --destdir ${WRKINST} --override pkg_name ocaml-pcre

pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/stublibs

.include <bsd.port.mk>
@@ -0,0 +1,4 @@
fix devel/ocaml-pcre to build on sparc64

* switch to new build system - OASIS
* as always: change to "new style" assignments (FOO = BAR instead of FOO= BAR)
@@ -0,0 +1,2 @@
SHA256 (pcre-ocaml-7.0.2.tar.gz) = BSov3Y2ll3JKyMpHT91AdytGGIjj/473XMceQ6ZXZuo=
SIZE (pcre-ocaml-7.0.2.tar.gz) = 81910
@@ -0,0 +1,13 @@
This OCaml-library interfaces the PCRE (Perl-compatible regular
expression) library which is written in C. it can be used for matching
regular expressions which are written in the PERL style.

It is reentrant - and thus thread safe. This is not the case with the
"Str" module of OCaml, which builds on the GNU "regex"-library. Using
reentrant libraries also means more convenience for programmers. They do
not have to reason about states in which the library might be in.

The high-level functions for replacement and substitution, all
implemented in OCaml, are much faster than the ones of the "Str"-module.
In fact, when compiled to native code, they even seem to be
significantly faster than those of PERL.
@@ -0,0 +1,2 @@
@comment $OpenBSD$
@bin lib/ocaml/pcre/pcre.cmxs
@@ -0,0 +1,5 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2011/09/15 15:50:23 sthen Exp $
%%dynlink%%
lib/ocaml/pcre/pcre.a
lib/ocaml/pcre/pcre.cmx
lib/ocaml/pcre/pcre.cmxa
@@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2012/07/18 08:04:11 sthen Exp $
lib/ocaml/stublibs/dllpcre_stubs.so
@@ -0,0 +1,26 @@
@comment $OpenBSD: PLIST,v 1.2 2012/07/18 08:04:11 sthen Exp $
%%SHARED%%
%%native%%
lib/ocaml/pcre/
lib/ocaml/pcre/META
lib/ocaml/pcre/libpcre_stubs.a
lib/ocaml/pcre/pcre.cma
lib/ocaml/pcre/pcre.cmi
lib/ocaml/pcre/pcre.mli
lib/ocaml/stublibs/
@comment lib/ocaml/stublibs/dllpcre_stubs.so.owner
share/doc/ocaml-pcre/
share/doc/ocaml-pcre/api/
share/doc/ocaml-pcre/api/Pcre.html
share/doc/ocaml-pcre/api/index.html
share/doc/ocaml-pcre/api/index_attributes.html
share/doc/ocaml-pcre/api/index_class_types.html
share/doc/ocaml-pcre/api/index_classes.html
share/doc/ocaml-pcre/api/index_exceptions.html
share/doc/ocaml-pcre/api/index_methods.html
share/doc/ocaml-pcre/api/index_module_types.html
share/doc/ocaml-pcre/api/index_modules.html
share/doc/ocaml-pcre/api/index_types.html
share/doc/ocaml-pcre/api/index_values.html
share/doc/ocaml-pcre/api/style.css
share/doc/ocaml-pcre/api/type_Pcre.html
@@ -0,0 +1,34 @@
# $OpenBSD: Makefile,v 1.2 2012/07/13 09:27:25 edd Exp $

COMMENT = unit test framework for OCaml
CATEGORIES = devel

DISTNAME = ounit-1.1.2

# The last url component (the number) changes every release, too.
MASTER_SITES = http://forge.ocamlcore.org/frs/download.php/886/

HOMEPAGE = http://ounit.forge.ocamlcore.org/
MAINTAINER = Christopher Zimmermann <madroach@gmerlin.de>

# LGPL >=2.1
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes

MODULES = lang/ocaml

BUILD_DEPENDS += sysutils/findlib

CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --destdir ${WRKINST}

MAKE_ENV = TERM=${TERM}

REGRESS_TARGET = test

pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml

.include <bsd.port.mk>
@@ -0,0 +1,2 @@
* bump version to 1.1.2
* change ocamlfind sitelib
@@ -0,0 +1,2 @@
SHA256 (ounit-1.1.2.tar.gz) = 5rwbDNu1tVUthb7mU+I6r+ILuX/XzSKchn0B/5mYiOM=
SIZE (ounit-1.1.2.tar.gz) = 58055
@@ -0,0 +1,13 @@
OUnit is a unit test framework for OCaml. It allows one to easily create
unit-tests for OCaml code. It is based on HUnit, a unit testing
framework for Haskell. It is similar to JUnit, and other XUnit testing
frameworks.

A test-oriented methodology for software development is most effective
whent tests are easy to create, change, and execute. The JUnit tool
pioneerded for test-first development in Java. OUnit is an adaptation of
JUnit to OCaml.

With OUnit, as with JUnit, you can easily create tests, name them, group
them into suites, and execute them, with the framework checking the
results automatically.
@@ -0,0 +1,2 @@
@comment $OpenBSD$
@bin lib/ocaml/oUnit/oUnit.cmxs
@@ -0,0 +1,6 @@
@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2012/07/13 08:36:03 edd Exp $
%%dynlink%%
lib/ocaml/oUnit/oUnit.a
lib/ocaml/oUnit/oUnit.cmx
lib/ocaml/oUnit/oUnit.cmxa
lib/ocaml/oUnit/oUnitDiff.cmx
@@ -0,0 +1,34 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/13 08:36:03 edd Exp $
%%native%%
lib/ocaml/
lib/ocaml/oUnit/
lib/ocaml/oUnit/META
lib/ocaml/oUnit/oUnit.cma
lib/ocaml/oUnit/oUnit.cmi
lib/ocaml/oUnit/oUnit.mli
lib/ocaml/oUnit/oUnitDiff.cmi
lib/ocaml/oUnit/oUnitDiff.mli
share/doc/ounit/
share/doc/ounit/OUnit.html
share/doc/ounit/OUnitDiff.DIFF_ELEMENT.html
share/doc/ounit/OUnitDiff.ListSimpleMake.html
share/doc/ounit/OUnitDiff.S.html
share/doc/ounit/OUnitDiff.SetMake.html
share/doc/ounit/OUnitDiff.html
share/doc/ounit/index.html
share/doc/ounit/index_attributes.html
share/doc/ounit/index_class_types.html
share/doc/ounit/index_classes.html
share/doc/ounit/index_exceptions.html
share/doc/ounit/index_methods.html
share/doc/ounit/index_module_types.html
share/doc/ounit/index_modules.html
share/doc/ounit/index_types.html
share/doc/ounit/index_values.html
share/doc/ounit/style.css
share/doc/ounit/type_OUnit.html
share/doc/ounit/type_OUnitDiff.DIFF_ELEMENT.html
share/doc/ounit/type_OUnitDiff.ListSimpleMake.html
share/doc/ounit/type_OUnitDiff.S.html
share/doc/ounit/type_OUnitDiff.SetMake.html
share/doc/ounit/type_OUnitDiff.html
@@ -0,0 +1,97 @@
# $OpenBSD: Makefile,v 1.87 2012/07/08 14:30:40 sthen Exp $

ONLY_FOR_ARCHS = amd64 arm hppa i386 mips64 mips64el powerpc sparc sparc64
BROKEN-hppa = compiler bug with gcc 4.2

COMMENT = multi system emulator

V = 1.1.1
DISTNAME = qemu-${V}-1
PKGNAME = qemu-${V}
CATEGORIES = emulators
MASTER_SITES = http://wiki.qemu.org/download/
EXTRACT_SUFX = .tar.bz2

WRKDIST = ${WRKDIR}/qemu-${V}

HOMEPAGE = http://www.qemu.org/

MAINTAINER = Brad Smith <brad@comstyle.com>

# GPLv2, LGPLv2 and BSD
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes

WANTLIB = GL SDL X11 c curl glib-2.0 gthread-2.0 jpeg m ncurses \
png pthread util z

MODULES = devel/gettext \
lang/python
BUILD_DEPENDS = textproc/texi2html
LIB_DEPENDS = devel/glib2 \
devel/sdl \
graphics/jpeg \
graphics/png \
net/curl

MODPY_RUNDEP = No

MAKE_ENV = V=1
FAKE_FLAGS = qemu_confdir=${PREFIX}/share/examples/qemu

EXTRA_CFLAGS = -I${LOCALBASE}/include -I${X11BASE}/include
EXTRA_LDFLAGS = -L${LOCALBASE}/lib -L${X11BASE}/lib

# until the system headers are fixed properly.
EXTRA_CFLAGS += -Wno-redundant-decls

EXTRA_CFLAGS += -DTIME_MAX=INT_MAX

VMEM_WARNING = Yes

USE_GMAKE = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR} \
--mandir=${PREFIX}/man \
--python=${MODPY_BIN} \
--smbd=${LOCALBASE}/libexec/smbd \
--cc="${CC}" \
--host-cc="${CC}" \
--extra-cflags="${EXTRA_CFLAGS}" \
--extra-ldflags="${EXTRA_LDFLAGS}" \
--audio-drv-list=sdl \
--disable-bsd-user \
--disable-libiscsi \
--disable-smartcard-nss \
--disable-spice \
--disable-uuid \
--disable-usb-redir \
--disable-vnc-sasl \
--disable-vnc-tls

.if ${MACHINE_ARCH:Msparc}
CONFIGURE_ARGS += --sparc_cpu=v7
.endif

FLAVORS = debug
FLAVOR ?=

.if ${FLAVOR:Mdebug}
CFLAGS += -O0
CONFIGURE_ARGS += --enable-debug
.else
CONFIGURE_ARGS += --disable-debug-info
.endif

NO_REGRESS = Yes

post-install:
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup \
${PREFIX}/share/examples/qemu
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown \
${PREFIX}/share/examples/qemu

.include <bsd.port.mk>
@@ -0,0 +1 @@
bump version to 1.1.1-1 and update PLIST
@@ -0,0 +1,2 @@
SHA256 (qemu-1.1.1-1.tar.bz2) = b7r/H6darhoGlHz3yxAcNSc3EsVhuH746uySqjlzSsg=
SIZE (qemu-1.1.1-1.tar.bz2) = 9635574
@@ -0,0 +1,14 @@
#! /bin/sh

_ETHER=trunk0
_BRIDGE=bridge0

# Let the environment over-ride this
[ "$BRIDGE" ] || BRIDGE=${_BRIDGE}
[ "$ETHER" ] || ETHER=${_ETHER}

if test `id -u` -ne 0; then
SUDO=sudo
fi

$SUDO ifconfig $BRIDGE del $1 > /dev/null 2>&1
@@ -0,0 +1,43 @@
#! /bin/sh

_ETHER=`route -n get default 2>/dev/null |awk '/interface:/ {print $2}'`
_ETHER=${_ETHER:=trunk0}
_BRIDGE=bridge0

# Let the environment over-ride this
[ "$BRIDGE" ] || BRIDGE=${_BRIDGE}
[ "$ETHER" ] || ETHER=${_ETHER}

if test `id -u` -ne 0; then
SUDO=sudo
fi

echo -n " {$1 ($BRIDGE <-> $ETHER)"

# Set the tun device into layer2 mode
$SUDO ifconfig $1 link0 up

# Set up our bridge
$SUDO ifconfig $1 group tun > /dev/null 2>&1
$SUDO ifconfig $BRIDGE create > /dev/null 2>&1 && {
# Only add rules if the bridge creation succeeds; otherwise
# duplicate rules get loaded each time qemu starts
# The following two block carp packets from wasting cpu cycles inside the
# qemu sessions, remove if testing carp inside qemu
$SUDO ifconfig $BRIDGE rule block in on $ETHER dst 33:33:0:0:0:12
$SUDO ifconfig $BRIDGE rule block in on $ETHER dst 01:00:5e:00:00:12
}
# Since we can specify ETHER and BRIDGE above, its possible that
# this tun interface or this physical interface was setup as part of
# a different bridge earlier, and that is never cleaned up, so we have
# to cleanup here first before we set it up; a physical interface cannot
# be member to more than one bridge, thankfully, or I never would have
# caught this
ifconfig bridge | sed -n '/^bridge[0-9]*/{s/:.*$//;p;}' | while read brif
do
$SUDO ifconfig $brif del $ETHER > /dev/null 2>&1
$SUDO ifconfig $brif del $1 > /dev/null 2>&1
done
$SUDO ifconfig $BRIDGE add $ETHER up
$SUDO ifconfig $BRIDGE add $1 up || true
echo "}"
@@ -0,0 +1,22 @@
$OpenBSD: patch-cache-utils_c,v 1.4 2011/05/25 07:43:48 sthen Exp $
--- cache-utils.c.orig Mon May 23 20:11:43 2011
+++ cache-utils.c Mon May 23 20:16:02 2011
@@ -55,9 +55,16 @@ static void ppc_init_cacheline_sizes(void)
qemu_cache_conf.icache_bsize = cacheline;
}
}
-#endif

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__OpenBSD__)
+
+static void ppc_init_cacheline_sizes(void)
+{
+ qemu_cache_conf.dcache_bsize = 32;
+ qemu_cache_conf.icache_bsize = 32;
+}
+
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.23 2012/06/15 11:53:28 ajacoutot Exp $
--- configure.orig Wed May 30 20:54:30 2012
+++ configure Thu May 31 22:41:49 2012
@@ -2850,10 +2850,6 @@ fi
# End of CC checks
# After here, no more $cc or $ld runs

-if test "$debug" = "no" ; then
- CFLAGS="-O2 $CFLAGS"
-fi
-
# Consult white-list to determine whether to enable werror
# by default. Only enable by default for git builds
z_version=`cut -f3 -d. $source_path/VERSION`
@@ -0,0 +1,4 @@
QEMU is an open source machine emulator. It can run OSes and programs
made for one machine (e.g. an ARM board) on a different machine
(e.g. your own PC). By using dynamic translation, it achieves very
good performance.
@@ -0,0 +1 @@
As of QEMU 1.0 the i386 target has been renamed from qemu to qemu-system-i386.
@@ -0,0 +1,120 @@
@comment $OpenBSD: PLIST,v 1.21 2012/06/15 11:53:28 ajacoutot Exp $
@conflict kqemu-*
@conflict qemu-*
@pkgpath emulators/kqemu
@pkgpath emulators/qemu,kqemu
@pkgpath emulators/qemu-old[,no_x11]
@bin bin/qemu-ga
@bin bin/qemu-img
@bin bin/qemu-io
@bin bin/qemu-nbd
@bin bin/qemu-system-alpha
@bin bin/qemu-system-arm
@bin bin/qemu-system-cris
@bin bin/qemu-system-i386
@bin bin/qemu-system-lm32
@bin bin/qemu-system-m68k
@bin bin/qemu-system-microblaze
@bin bin/qemu-system-microblazeel
@bin bin/qemu-system-mips
@bin bin/qemu-system-mips64
@bin bin/qemu-system-mips64el
@bin bin/qemu-system-mipsel
@bin bin/qemu-system-ppc
@bin bin/qemu-system-ppc64
@bin bin/qemu-system-ppcemb
@bin bin/qemu-system-s390x
@bin bin/qemu-system-sh4
@bin bin/qemu-system-sh4eb
@bin bin/qemu-system-sparc
@bin bin/qemu-system-sparc64
@bin bin/qemu-system-x86_64
@bin bin/qemu-system-xtensa
@bin bin/qemu-system-xtensaeb
@man man/man1/qemu-img.1
@man man/man1/qemu.1
@man man/man8/qemu-nbd.8
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/qemu/
share/doc/qemu/qemu-doc.html
share/doc/qemu/qemu-tech.html
share/doc/qemu/qmp-commands.txt
share/examples/qemu/
share/examples/qemu/qemu-ifdown
@mode 755
@sample ${SYSCONFDIR}/qemu-ifdown
@mode
share/examples/qemu/qemu-ifup
@mode 755
@sample ${SYSCONFDIR}/qemu-ifup
@mode
share/examples/qemu/target-x86_64.conf
@sample ${SYSCONFDIR}/qemu/
@sample ${SYSCONFDIR}/qemu/target-x86_64.conf
share/qemu/
share/qemu/bamboo.dtb
share/qemu/bios.bin
share/qemu/cpus-x86_64.conf
share/qemu/keymaps/
share/qemu/keymaps/ar
share/qemu/keymaps/common
share/qemu/keymaps/da
share/qemu/keymaps/de
share/qemu/keymaps/de-ch
share/qemu/keymaps/en-gb
share/qemu/keymaps/en-us
share/qemu/keymaps/es
share/qemu/keymaps/et
share/qemu/keymaps/fi
share/qemu/keymaps/fo
share/qemu/keymaps/fr
share/qemu/keymaps/fr-be
share/qemu/keymaps/fr-ca
share/qemu/keymaps/fr-ch
share/qemu/keymaps/hr
share/qemu/keymaps/hu
share/qemu/keymaps/is
share/qemu/keymaps/it
share/qemu/keymaps/ja
share/qemu/keymaps/lt
share/qemu/keymaps/lv
share/qemu/keymaps/mk
share/qemu/keymaps/modifiers
share/qemu/keymaps/nl
share/qemu/keymaps/nl-be
share/qemu/keymaps/no
share/qemu/keymaps/pl
share/qemu/keymaps/pt
share/qemu/keymaps/pt-br
share/qemu/keymaps/ru
share/qemu/keymaps/sl
share/qemu/keymaps/sv
share/qemu/keymaps/th
share/qemu/keymaps/tr
share/qemu/kvmvapic.bin
share/qemu/linuxboot.bin
share/qemu/mpc8544ds.dtb
share/qemu/multiboot.bin
share/qemu/openbios-ppc
share/qemu/openbios-sparc32
share/qemu/openbios-sparc64
share/qemu/palcode-clipper
share/qemu/petalogix-ml605.dtb
share/qemu/petalogix-s3adsp1800.dtb
share/qemu/ppc_rom.bin
share/qemu/pxe-e1000.rom
share/qemu/pxe-eepro100.rom
share/qemu/pxe-ne2k_pci.rom
share/qemu/pxe-pcnet.rom
share/qemu/pxe-rtl8139.rom
share/qemu/pxe-virtio.rom
share/qemu/qemu-icon.bmp
share/qemu/s390-zipl.rom
share/qemu/sgabios.bin
share/qemu/slof.bin
share/qemu/spapr-rtas.bin
share/qemu/vgabios-cirrus.bin
share/qemu/vgabios-qxl.bin
share/qemu/vgabios-stdvga.bin
share/qemu/vgabios-vmware.bin
share/qemu/vgabios.bin
@@ -0,0 +1,269 @@
$OpenBSD: README,v 1.9 2012/07/08 14:30:40 sthen Exp $

+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------

==> Quick Start

1. Get a bootable CDROM image:

$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso

or to use a 64-bit client OS or SPARC, respectively:

$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso

$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso

2. Create a virtual disk image:

$ qemu-img create -f qcow2 virtual.img 10G

3. Install the OS:

$ qemu-system-i386 -m 32 -monitor stdio -no-fd-bootchk \
-hda virtual.img -cdrom cd52.iso -boot d

or:

$ qemu-system-x86_64 -m 32 -monitor stdio -no-fd-bootchk \
-hda virtual.img -cdrom cd52.iso -boot d

$ qemu-system-sparc -m 32 -monitor stdio \
-hda virtual.img -cdrom cd52.iso -boot d

NOTE: start this inside an xterm or equivalent.
NOTE: be sure to choose serial console during install.
NOTE: -no-fd-bootchk permits booting faster when no floppy is
in use, but is not supported for qemu-system-sparc.
NOTE: qemu-system-sparc currently fails with some
/etc/malloc.conf settings

4. Compress the virtual disk:

$ qemu-img convert -c -O qcow2 virtual.img v.tmp && \
mv v.tmp virtual.img

NOTE: do not do this while QEMU is running / using this virtual
disk.

5. Boot normally from the virtual disk:

$ qemu-system-i386 -m 32 -nographic -no-fd-bootchk -hda virtual.img

or:

$ qemu-system-x86_64 -m 32 -nographic -no-fd-bootchk -hda virtual.img

$ qemu-system-sparc -m 32 -nographic -hda virtual.img

==> Networking

1. Default Settings

By default, QEMU sets up the equivalent of the following networking:

-net nic,vlan=0,model=e1000,macaddr=52:54:00:12:34:56
-net user,vlan=0

Also, inside this virtual usermode network, it uses the 10.0.2.0/24
and serves DHCP from inside this virtual network. Static address
can be used if one cannot or does not want to do DHCP in the
guest OS:

Guest OS IP : 10.0.2.15
Default Gateway : 10.0.2.2
Nameserver : 10.0.2.3

It is sufficient for most operations, QEMU itself performs NAT
and then makes userland network calls for TCP/UDP operations.
ICMP and other things are not possible in this mode.

NOTE: If you use one '-net' cmdline argument, QEMU assumes you
know what you want and clears defaults for the rest of the
-net defaults.

NOTE: The guest mode networking does not currently support IPv6,
and QEMU will complain that it cannot find a DNS server
if /etc/resolv.conf contains only IPv6 DNS servers.

2. tap mode

Sometimes it is desirable to configure QEMU to access a network
via layer2 directly. One way of doing this without having to run
QEMU as root is to let root open /dev/tunN and pass the file
descriptor to QEMU. The tun(4) interface should preferrably be
configured before starting QEMU:

$ sudo ifconfig tun0 192.168.0.254 link0

The interface can also be configured as part of a bridge(4), in
which case the ip address can be omitted:

$ sudo ifconfig tun0 link0
$ sudo ifconfig bridge0 add tun0 add em0 up

The tunnel and bridge interfaces can also be configured at system
startup by editing /etc/hostname.tunN and /etc/hostname.bridgeN,
respectively (see hostname.if(5)).

After configuring the virtual network we can use sudo to let
root open the tunnel device and then use sudo again to drop
privileges and start QEMU:

$ sudo sh -c "sudo -u $USER qemu-system-i386 -nographic -net nic \
-net tap,fd=3 -no-fd-bootchk -hda virtual.img 3<>/dev/tun0"

NOTE: sudo calls closefrom(2). In order to have more than one
fd passed tap interface, a line to sudoers akin to:

Defaults closefrom_override

then calling sudo via 'sudo -C 5 -u $USER qemu-system-i386 ..'
is required. See sudoers(5) and sudo(8) for details.

An alternative to the procedure described above is to have QEMU
set up the network via ${SYSCONFDIR}/qemu-ifup. This is not
recommended however, since you would have to run QEMU as root,
and there is no way to drop from root privileges at this point.

${SYSCONFDIR}/qemu-ifup contains some default settings that
permit one to do the following:

# qemu-system-i386 -net nic -net tap -no-fd-bootchk -hda virtual.img

It presumes you wish the tun(4) interface to talk to the interface
holding the default IPv4 route (falling back to trunk0 if no
route is found), and that you want 'bridge0' to be used to bridge
the two.

Setting the environment variables ETHER and BRIDGE will override
these settings, respectively.

When starting QEMU, the script attempts to output useful
information, but there are also error messages that occur as
well. On my laptop, I want to route / nat natively using PF and
also have layer2 access to the QEMU networks. I thus have this
as /etc/hostname.trunk101:

inet6 fe80::1c 64 lladdr 00:03:25:0d:7a:2c
inet 10.7.255.1 255.255.255.0
inet6 alias 2001:240:58a:45::1c

I have dhcpd configured to run on trunk101, and also run rtadvd.
For QEMU, the startup looks like this:

# export ETHER=trunk101
# export BRIDGE=bridge101
# qemu-system-i386 -net nic,vlan=0,model=e1000,macaddr=52:54:00:12:35:00 \
-net tap,vlan=0 -vnc :0 -localtime -usb -usbdevice tablet \
-m 256 -no-fd-bootchk -hda virtual.img -monitor stdio
{tun0 (bridge101 <-> trunk101)ifconfig: bridge101: No such process
ifconfig: bridge101: No such process
}
(qemu)

The errors are normal and should be ignored. One can verify the
networking is properly configured by verifying the bridge
interface:

$ ifconfig bridge101
bridge101: flags=41<UP,RUNNING>
groups: bridge
priority 32768 hellotime 2 fwddelay 15 maxage 20 holdcnt 6 proto rstp
designated: id 00:00:00:00:00:00 priority 0
tun0 flags=3<LEARNING,DISCOVER>
port 16 ifpriority 0 ifcost 0
trunk101 flags=3<LEARNING,DISCOVER>
port 6 ifpriority 0 ifcost 0
Addresses (max cache: 100, timeout: 240):

NOTE: When running multiple QEMU sessions simultaneously on the
same bridge, care must be taken because the network MAC
address defaults to 52:54:00:12:34:56 for every QEMU
instance. To change this, observe the macaddr= syntax in
the above example and choose a unique lladdr per QEMU nic.

==> Mice

NOTE: Certain OS's work much better with the USB tablet device
than the normal PS/2 mouse handling. See the above example
for usage.

==> Serial Console

Installing OpenBSD via serial console is sometimes desirable.
X may not be available, and so on. There are two ways to
accomplish this, both in effect the same solution:

a. qemu-system-i386 -vnc :0 -serial stdio .. virtual.img \
-cdrom install52.iso -boot d

- this option permits you to use VNC from some system to
connect to the QEMU instance and 'set tty com0' at the
'boot>' prompt.
- you may then disconnect VNC and use the terminal from
which you started QEMU to do the install.

b. qemu-system-i386 -nographic .. virtual.img -fda floppy52.fs -boot a

- this maps both the serial port and the (qemu) monitor
prompt to the terminal QEMU was started on.
- to flip between them, Ctrl-a c; see the QEMU man page for
other commands that work in -nographic mode.
- preparation of the floppy image to force serial console
mode is straightforward:

vnconfig vnd0 floppy52.fs
mount /dev/vnd0c /mnt
mkdir /mnt/etc
echo set tty com0 > /mnt/etc/boot.conf
umount /mnt
vnconfig -u vnd0

.. be sure to choose 'yes' for setting com0 to be the serial
console.

NOTE: OpenBSD poweroff does work with QEMU, which actually causes
QEMU itself to exit. This is a good thing, as it is
currently not possible to set what block device is booted
from at runtime from QEMU. So if you start an installation
booting from a CD-ROM, you will always boot off a CD-ROM
every time you reboot that QEMU session until you exit and
start QEMU again booting off the virtual hard drive.

==> daemonized QEMU

Sometimes you want QEMU to start as part of a system script.

Adding to some of the above, the -daemonize option comes in
handy, as well as the telnet: designator for -serial and monitor.
This is a complete example that may be cut-and-pasted into
rc.local:

hddir=/var/vm
USER=qemu
if [ -x ${TRUEPREFIX}/bin/qemu ]; then
echo -n 'Qemu: vmi386'
(
ifconfig tun0 link0
ifconfig bridge101 add trunk101 add tun0 up

sh -c "sudo -u $USER \
${TRUEPREFIX}/bin/qemu-system-i386 \
-daemonize \
-nographic \
-net nic,vlan=0,model=e1000,macaddr=52:54:00:4e:62:8f \
-net tap,vlan=0,fd=3 \
-m 128 \
-hda $hddir/virtual.img \
-serial telnet:127.0.0.1:1080,server,nowait \
-monitor telnet:127.0.0.1:1081,server,nowait \
-no-fd-bootchk 3<>/dev/tun0"
)
echo "."
fi

NOTE: this presumes the user `qemu' exists, create it or set
USER= to an existing user to use this example.
@@ -0,0 +1,3 @@
To play Doom3 on OpenBSD, you need the original game, patched to version 1.3.1.
Copy the game data (pak000-8.pk4) to ~/.doom3/base and place your CD key in a
file called ~/.doom3/base/doomkey. Do NOT copy any of the gameXXX.pak4 files.
@@ -1,5 +1,7 @@
# $OpenBSD$

SHARED_ONLY = Yes

COMMENT = Worms-like strategy game

V = 0.9.17
@@ -19,7 +21,7 @@ PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes

WANTLIB += QtGui QtNetwork SDL SDL_image SDL_mixer SDL_net SDL_ttf
WANTLIB += c lua m pthread stdc++ z
WANTLIB += c m pthread stdc++ z ${MODLUA_WANTLIB}

MASTER_SITES = http://download.gna.org/hedgewars/
EXTRACT_SUFX = .tar.bz2
@@ -0,0 +1,44 @@
# $OpenBSD: Makefile.template,v 1.61 2012/03/29 13:41:58 sthen Exp $

COMMENT = Editor for OpenStreetMap

DISTNAME = merkaartor-0.17.2

#SHARED_LIBS = ???

MAINTAINER = Edd Barrett <edd@openbsd.org>

CATEGORIES = geo

HOMEPAGE = http://merkaartor.be/wiki/

# GPLv2
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes

WANTLIB += ${MODQT4_WANTLIB}
WANTLIB += ICE QtGui QtNetwork QtSvg QtWebKit QtXml SM X11 Xext
WANTLIB += Xi Xinerama Xrender c fontconfig freetype m pthread
WANTLIB += stdc++ z

MASTER_SITES = http://merkaartor.be/attachments/download/253/
EXTRACT_SUFX = .tar.bz2

MODULES = x11/qt4

# gdal etc. XXX
#LIB_DEPENDS = ???

#SEPARATE_BUILD = Yes (build in a directory other than WRKSRC)
USE_GMAKE = Yes

NO_REGRESS = Yes

do-configure:
cd ${WRKSRC} && qmake4

MAKE_ENV += INSTALL_ROOT=${DESTDIR}

.include <bsd.port.mk>
@@ -0,0 +1,2 @@
SHA256 (merkaartor-0.17.2.tar.bz2) = Ql9PrO+/IKPdGgnuYf+KiRJILRowyVfFCGnY/1m6cCo=
SIZE (merkaartor-0.17.2.tar.bz2) = 7138991
@@ -0,0 +1,3 @@
Merkaartor is an OpenStreetMap editor for Unix, Windows and Mac OS X
(prerelease, Intel only), distributed under the GNU General Public
License.
@@ -0,0 +1,7 @@
@comment $OpenBSD$
lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
lib/merkaartor/plugins/styles/libskulpture.so
@@ -0,0 +1,20 @@
@comment $OpenBSD$
%%SHARED%%
@bin bin/merkaartor
lib/merkaartor/
lib/merkaartor/plugins/
lib/merkaartor/plugins/background/
lib/merkaartor/plugins/styles/
share/applications/
share/applications/merkaartor.desktop
share/icons/
share/icons/hicolor/
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/merkaartor.png
share/merkaartor/
share/merkaartor/BookmarksList.xml
share/merkaartor/Projections.xml
share/merkaartor/TmsServersList.xml
share/merkaartor/WmsServersList.xml
share/merkaartor/world_background.osb
@@ -0,0 +1,63 @@
# $OpenBSD: Makefile,v 1.16 2011/11/01 20:30:49 jasper Exp $

COMMENT= image manipulation functions for Objective Caml
CATEGORIES= graphics

V= 4.0.1
DISTNAME= camlimages-$V
DISTFILES= v$V.tar.gz
MASTER_SITES= https://bitbucket.org/camlspotter/camlimages/get/
WRKDIST= ${WRKDIR}/camlspotter-camlimages-c803efa9d5d3

MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
HOMEPAGE= http://cristal.inria.fr/camlimages/

PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

MODULES= lang/ocaml

WANTLIB+= c X11 Xpm freetype gif jpeg m png tiff z

LIB_DEPENDS= graphics/jpeg \
graphics/libungif \
graphics/png \
graphics/tiff
BUILD_DEPENDS= devel/omake \
sysutils/findlib \
print/ghostscript/gnu

# The camlimages build system seems to need some include paths in CPATH and
# others in CFLAGS. I don't know why, but this way at least it works.
MAKE_ENV+= CPATH="${LOCALBASE}/include/libpng"
MAKE_FLAGS+= CFLAGS="${CFLAGS} \
-I${X11BASE}/include \
-I${X11BASE}/include/X11 \
-I${LOCALBASE}/include" \
LDFLAGS=" \
-L${X11BASE}/lib \
-L${LOCALBASE}/lib"

# regress exists, but needs manual run and then user interaction
NO_REGRESS= Yes

OMAKE= omake --force-dotomake --dotomake ${WRKSRC}/omake_cache

do-build:
cd ${WRKSRC} && env -i ${MAKE_ENV} ${OMAKE} ${MAKE_FLAGS}

pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/stublibs
ln -s ../stublibs ${PREFIX}/lib/ocaml/site-lib/

do-install:
cd ${WRKSRC} && env -i ${MAKE_ENV} \
${OMAKE} ${ALL_FAKE_FLAGS} ${FAKE_TARGET}

post-install:
@cp -R ${WRKSRC}/examples/ ${PREFIX}/share/examples/camlimages

.include <bsd.port.mk>
@@ -0,0 +1 @@
testing, especially on bytecode-only and no-dll arches
@@ -0,0 +1,7 @@
bump version to 4.0.1

* new MASTER_SITES and DISTFILES naming scheme
* switch to omake
* remove gettext dependency
* remove lablgtk dependency - only needed for examples
* remove ghostscript runtime dependency - only needed for postscript.
@@ -0,0 +1,5 @@
MD5 (v4.0.1.tar.gz) = 1rlJS1anK2X9MC0YWO//fA==
RMD160 (v4.0.1.tar.gz) = 3Toa60O8dFl4GVipPbI84y0MpuY=
SHA1 (v4.0.1.tar.gz) = P/RBQjhpcAA9PP8URq01GzZ1mo4=
SHA256 (v4.0.1.tar.gz) = tAI3wVBUhwSXmaevKW6zmWs/oI6rlEFVRvRtYTVXR8Q=
SIZE (v4.0.1.tar.gz) = 2190274
@@ -0,0 +1,34 @@
$OpenBSD$
--- OMakefile.orig Wed Jun 22 20:04:32 2011
+++ OMakefile Sun Jun 24 20:37:06 2012
@@ -34,6 +34,7 @@ LDFLAGS[]+=
PATH_RGB_TXT[]=
/etc/X11
/usr/share/X11
+ /usr/X11R6/share/X11

BYTE_ENABLED=1
NATIVE_ENABLED=1
@@ -122,11 +123,11 @@ print_configured() =
export

HAVE_Z = $(Check_header_library z, zlib.h, zlibVersion)
- HAVE_PNG = $(Check_header_library png, png.h, png_create_read_struct)
+ HAVE_PNG = $(Check_header_library m z png, png.h, png_create_read_struct)
SUPPORT_PNG = $(and $(HAVE_Z) $(HAVE_PNG))
LDFLAGS_png=
if $(SUPPORT_PNG)
- LDFLAGS_png=-lpng -lz
+ LDFLAGS_png=-lpng -lz -lm
SUPPORTED_FORMATS+=png
export

@@ -162,7 +163,7 @@ print_configured() =
SUPPORTED_FORMATS+=ps
export

- SUPPORT_LABLGTK2 = $(Check_ocamlfind_package lablgtk2)
+ SUPPORT_LABLGTK2 = false
if $(SUPPORT_LABLGTK2)
SUPPORTED_NON_FORMATS+=lablgtk2
OCAMLPACKS+=lablgtk2
@@ -0,0 +1,64 @@
$OpenBSD: patch-src_pngread_c,v 1.1 2011/07/08 20:38:01 naddy Exp $

Fix build with png-1.5.

--- src/pngread.c.orig Wed Jun 22 20:04:32 2011
+++ src/pngread.c Tue Jun 26 13:44:45 2012
@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name )
}

/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
@@ -101,6 +101,10 @@ value read_png_file_as_rgb24( name )
if ( bit_depth == 16 ) png_set_strip_16(png_ptr);
if ( color_type & PNG_COLOR_MASK_ALPHA ) png_set_strip_alpha(png_ptr);

+ // necessary before any call to png_read_update_info().
+ // Won't harm processing of non-interlaced images.
+ png_set_interlace_handling(png_ptr);
+
png_read_update_info(png_ptr, info_ptr);

png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
@@ -134,7 +138,7 @@ value read_png_file_as_rgb24( name )
png_set_rows(png_ptr, info_ptr, row_pointers);

/* Later, we can return something */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
@@ -243,7 +247,7 @@ value read_png_file( name )
}

/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
@@ -274,6 +278,10 @@ value read_png_file( name )
/* We have no support for 48bit depth colors yet */
if ( bit_depth == 16 ) png_set_strip_16(png_ptr);

+ // necessary before any call to png_read_update_info().
+ // Won't harm processing of non-interlaced images.
+ png_set_interlace_handling(png_ptr);
+
png_read_update_info(png_ptr, info_ptr);

png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
@@ -302,7 +310,7 @@ value read_png_file( name )
png_set_rows(png_ptr, info_ptr, row_pointers);

/* Later, we can return something */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
@@ -0,0 +1,24 @@
$OpenBSD: patch-src_pngwrite_c,v 1.1 2011/07/08 20:38:01 naddy Exp $

Fix build with png-1.5.

--- src/pngwrite.c.orig Wed Jul 6 12:23:50 2011
+++ src/pngwrite.c Wed Jul 6 12:24:20 2011
@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer, width, height,
}

/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&png_ptr, &info_ptr);
fclose(fp);
@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer, cmap, width,
}

/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&png_ptr, &info_ptr);
fclose(fp);
@@ -0,0 +1,17 @@
$OpenBSD: patch-src_tiffread_c,v 1.1 2012/04/14 15:13:30 naddy Exp $
--- src/tiffread.c.orig Wed Jun 22 20:04:32 2011
+++ src/tiffread.c Fri Jun 22 13:14:54 2012
@@ -28,8 +28,13 @@
#define uint16 uint16tiff
#define int32 int32tiff
#define uint32 uint32tiff
+#define int64 int64tiff
+#define uint64 uint64tiff

#include <tiffio.h>
+
+#undef int64
+#undef uint64

extern value *imglib_error;

@@ -0,0 +1,21 @@
$OpenBSD: patch-src_tiffwrite_c,v 1.1 2012/04/14 15:13:30 naddy Exp $
--- src/tiffwrite.c.orig Sat Apr 14 16:47:53 2012
+++ src/tiffwrite.c Sat Apr 14 16:50:28 2012
@@ -25,6 +25,8 @@
#define uint16 uint16tiff
#define int32 int32tiff
#define uint32 uint32tiff
+#define int64 int64tiff
+#define uint64 uint64tiff

#include <tiffio.h>

@@ -32,6 +34,8 @@
#undef uint16
#undef int32
#undef uint32
+#undef int64
+#undef uint64

extern value *imglib_error;

@@ -0,0 +1,5 @@
Camlimages provides basic functions for image processing and
loading/saving various image file formats, an interface to display
images, and a Freetype interface to render Truetype fonts.

For postscript support ghostscript needs to be installed.
@@ -0,0 +1,50 @@
@comment $OpenBSD: PFRAG.native,v 1.5 2011/01/13 10:22:54 dcoppa Exp $
lib/ocaml/site-lib/camlimages/camlimages_all.a
lib/ocaml/site-lib/camlimages/camlimages_all.cmxa
lib/ocaml/site-lib/camlimages/camlimages_core.a
lib/ocaml/site-lib/camlimages/camlimages_core.cmxa
lib/ocaml/site-lib/camlimages/camlimages_freetype.a
lib/ocaml/site-lib/camlimages/camlimages_freetype.cmxa
lib/ocaml/site-lib/camlimages/camlimages_gif.a
lib/ocaml/site-lib/camlimages/camlimages_gif.cmxa
lib/ocaml/site-lib/camlimages/camlimages_graphics.a
lib/ocaml/site-lib/camlimages/camlimages_graphics.cmxa
lib/ocaml/site-lib/camlimages/camlimages_jpeg.a
lib/ocaml/site-lib/camlimages/camlimages_jpeg.cmxa
lib/ocaml/site-lib/camlimages/camlimages_png.a
lib/ocaml/site-lib/camlimages/camlimages_png.cmxa
lib/ocaml/site-lib/camlimages/camlimages_ps.a
lib/ocaml/site-lib/camlimages/camlimages_ps.cmxa
lib/ocaml/site-lib/camlimages/camlimages_supported.a
lib/ocaml/site-lib/camlimages/camlimages_supported.cmxa
lib/ocaml/site-lib/camlimages/camlimages_tiff.a
lib/ocaml/site-lib/camlimages/camlimages_tiff.cmxa
lib/ocaml/site-lib/camlimages/camlimages_xpm.a
lib/ocaml/site-lib/camlimages/camlimages_xpm.cmxa
share/examples/camlimages/converter/converter.cmx
share/examples/camlimages/converter/converter.o
@bin share/examples/camlimages/converter/converter.opt
share/examples/camlimages/crop/crop.cmx
share/examples/camlimages/crop/crop.o
@bin share/examples/camlimages/crop/crop.opt
share/examples/camlimages/edgedetect/edge.cmx
share/examples/camlimages/edgedetect/edge.o
@bin share/examples/camlimages/edgedetect/edge.opt
share/examples/camlimages/imgstat/imgstat.cmx
share/examples/camlimages/imgstat/imgstat.o
@bin share/examples/camlimages/imgstat/imgstat.opt
share/examples/camlimages/monochrome/monochrome.cmx
share/examples/camlimages/monochrome/monochrome.o
@bin share/examples/camlimages/monochrome/monochrome.opt
share/examples/camlimages/normalize/normalize.cmx
share/examples/camlimages/normalize/normalize.o
@bin share/examples/camlimages/normalize/normalize.opt
share/examples/camlimages/resize/resize.cmx
share/examples/camlimages/resize/resize.o
@bin share/examples/camlimages/resize/resize.opt
share/examples/camlimages/tiffps/tiffps.cmx
share/examples/camlimages/tiffps/tiffps.o
@bin share/examples/camlimages/tiffps/tiffps.opt
share/examples/camlimages/ttfimg/ttfimg.cmx
share/examples/camlimages/ttfimg/ttfimg.o
@bin share/examples/camlimages/ttfimg/ttfimg.opt
@@ -0,0 +1,9 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2011/01/13 10:22:54 dcoppa Exp $
lib/ocaml/stublibs/dllcamlimages_all.so
lib/ocaml/stublibs/dllcamlimages_freetype.so
lib/ocaml/stublibs/dllcamlimages_gif.so
lib/ocaml/stublibs/dllcamlimages_jpeg.so
lib/ocaml/stublibs/dllcamlimages_png.so
lib/ocaml/stublibs/dllcamlimages_supported.so
lib/ocaml/stublibs/dllcamlimages_tiff.so
lib/ocaml/stublibs/dllcamlimages_xpm.so
@@ -0,0 +1,297 @@
@comment $OpenBSD: PLIST,v 1.5 2011/01/13 10:22:54 dcoppa Exp $
%%SHARED%%
%%native%%
@comment lib/ocaml/
@comment lib/ocaml/site-lib/
lib/ocaml/site-lib/camlimages/
lib/ocaml/site-lib/camlimages/META
lib/ocaml/site-lib/camlimages/bitmap.cmi
lib/ocaml/site-lib/camlimages/bitmap.mli
lib/ocaml/site-lib/camlimages/blend.cmi
lib/ocaml/site-lib/camlimages/blend.mli
lib/ocaml/site-lib/camlimages/bmp.cmi
lib/ocaml/site-lib/camlimages/bmp.mli
lib/ocaml/site-lib/camlimages/camlimages.cmi
lib/ocaml/site-lib/camlimages/camlimages_all.cma
lib/ocaml/site-lib/camlimages/camlimages_core.cma
lib/ocaml/site-lib/camlimages/camlimages_freetype.cma
lib/ocaml/site-lib/camlimages/camlimages_gif.cma
lib/ocaml/site-lib/camlimages/camlimages_graphics.cma
lib/ocaml/site-lib/camlimages/camlimages_jpeg.cma
lib/ocaml/site-lib/camlimages/camlimages_png.cma
lib/ocaml/site-lib/camlimages/camlimages_ps.cma
lib/ocaml/site-lib/camlimages/camlimages_supported.cma
lib/ocaml/site-lib/camlimages/camlimages_tiff.cma
lib/ocaml/site-lib/camlimages/camlimages_xpm.cma
lib/ocaml/site-lib/camlimages/cmyk32.cmi
lib/ocaml/site-lib/camlimages/cmyk32.mli
lib/ocaml/site-lib/camlimages/color.cmi
lib/ocaml/site-lib/camlimages/color.mli
lib/ocaml/site-lib/camlimages/colorhist.cmi
lib/ocaml/site-lib/camlimages/colorhist.mli
lib/ocaml/site-lib/camlimages/freetype.cmi
lib/ocaml/site-lib/camlimages/freetype.mli
lib/ocaml/site-lib/camlimages/ftlow.cmi
lib/ocaml/site-lib/camlimages/ftlow.mli
lib/ocaml/site-lib/camlimages/fttext.cmi
lib/ocaml/site-lib/camlimages/fttext.mli
lib/ocaml/site-lib/camlimages/genimage.cmi
lib/ocaml/site-lib/camlimages/genimage.mli
lib/ocaml/site-lib/camlimages/geometry.cmi
lib/ocaml/site-lib/camlimages/geometry.mli
lib/ocaml/site-lib/camlimages/gif.cmi
lib/ocaml/site-lib/camlimages/gif.mli
lib/ocaml/site-lib/camlimages/graphic_image.cmi
lib/ocaml/site-lib/camlimages/graphic_image.mli
lib/ocaml/site-lib/camlimages/image_intf.cmi
lib/ocaml/site-lib/camlimages/image_intf.mli
lib/ocaml/site-lib/camlimages/imagegdk.mli
lib/ocaml/site-lib/camlimages/images.cmi
lib/ocaml/site-lib/camlimages/images.mli
lib/ocaml/site-lib/camlimages/index16.cmi
lib/ocaml/site-lib/camlimages/index16.mli
lib/ocaml/site-lib/camlimages/index8.cmi
lib/ocaml/site-lib/camlimages/index8.mli
lib/ocaml/site-lib/camlimages/info.cmi
lib/ocaml/site-lib/camlimages/info.mli
lib/ocaml/site-lib/camlimages/jis_table.cmi
lib/ocaml/site-lib/camlimages/jis_unicode.cmi
lib/ocaml/site-lib/camlimages/jis_unicode.mli
lib/ocaml/site-lib/camlimages/jpeg.cmi
lib/ocaml/site-lib/camlimages/jpeg.mli
lib/ocaml/site-lib/camlimages/libcamlimages_all.a
lib/ocaml/site-lib/camlimages/libcamlimages_freetype.a
lib/ocaml/site-lib/camlimages/libcamlimages_gif.a
lib/ocaml/site-lib/camlimages/libcamlimages_jpeg.a
lib/ocaml/site-lib/camlimages/libcamlimages_png.a
lib/ocaml/site-lib/camlimages/libcamlimages_supported.a
lib/ocaml/site-lib/camlimages/libcamlimages_tiff.a
lib/ocaml/site-lib/camlimages/libcamlimages_xpm.a
lib/ocaml/site-lib/camlimages/mstring.cmi
lib/ocaml/site-lib/camlimages/mstring.mli
lib/ocaml/site-lib/camlimages/oBmp.cmi
lib/ocaml/site-lib/camlimages/oColor.cmi
lib/ocaml/site-lib/camlimages/oColor.mli
lib/ocaml/site-lib/camlimages/oFreetype.cmi
lib/ocaml/site-lib/camlimages/oGif.cmi
lib/ocaml/site-lib/camlimages/oGraphic.cmi
lib/ocaml/site-lib/camlimages/oImages.cmi
lib/ocaml/site-lib/camlimages/oImages.mli
lib/ocaml/site-lib/camlimages/oJpeg.cmi
lib/ocaml/site-lib/camlimages/oJpeg.mli
lib/ocaml/site-lib/camlimages/oPng.cmi
lib/ocaml/site-lib/camlimages/oPng.mli
lib/ocaml/site-lib/camlimages/oPpm.cmi
lib/ocaml/site-lib/camlimages/oPs.cmi
lib/ocaml/site-lib/camlimages/oTiff.cmi
lib/ocaml/site-lib/camlimages/oXimage.mli
lib/ocaml/site-lib/camlimages/oXpm.cmi
lib/ocaml/site-lib/camlimages/oXvthumb.cmi
lib/ocaml/site-lib/camlimages/oXvthumb.mli
lib/ocaml/site-lib/camlimages/png.cmi
lib/ocaml/site-lib/camlimages/png.mli
lib/ocaml/site-lib/camlimages/ppm.cmi
lib/ocaml/site-lib/camlimages/ppm.mli
lib/ocaml/site-lib/camlimages/ps.cmi
lib/ocaml/site-lib/camlimages/ps.mli
lib/ocaml/site-lib/camlimages/reduce.cmi
lib/ocaml/site-lib/camlimages/reduce.mli
lib/ocaml/site-lib/camlimages/region.cmi
lib/ocaml/site-lib/camlimages/region.mli
lib/ocaml/site-lib/camlimages/rgb24.cmi
lib/ocaml/site-lib/camlimages/rgb24.mli
lib/ocaml/site-lib/camlimages/rgba32.cmi
lib/ocaml/site-lib/camlimages/rgba32.mli
lib/ocaml/site-lib/camlimages/tiff.cmi
lib/ocaml/site-lib/camlimages/tiff.mli
lib/ocaml/site-lib/camlimages/tmpfile.cmi
lib/ocaml/site-lib/camlimages/tmpfile.mli
lib/ocaml/site-lib/camlimages/units.cmi
lib/ocaml/site-lib/camlimages/ximage.mli
lib/ocaml/site-lib/camlimages/xpm.cmi
lib/ocaml/site-lib/camlimages/xpm.mli
lib/ocaml/site-lib/camlimages/xvthumb.cmi
lib/ocaml/site-lib/camlimages/xvthumb.mli
lib/ocaml/site-lib/stublibs
lib/ocaml/stublibs/
@comment lib/ocaml/stublibs/dllcamlimages_all.so.owner
@comment lib/ocaml/stublibs/dllcamlimages_freetype.so.owner
@comment lib/ocaml/stublibs/dllcamlimages_gif.so.owner
@comment lib/ocaml/stublibs/dllcamlimages_jpeg.so.owner
@comment lib/ocaml/stublibs/dllcamlimages_png.so.owner
@comment lib/ocaml/stublibs/dllcamlimages_supported.so.owner
@comment lib/ocaml/stublibs/dllcamlimages_tiff.so.owner
@comment lib/ocaml/stublibs/dllcamlimages_xpm.so.owner
share/examples/camlimages/
@comment share/examples/camlimages/.cvsignore
share/examples/camlimages/OMakefile
share/examples/camlimages/README.txt
share/examples/camlimages/converter/
share/examples/camlimages/converter-external/
share/examples/camlimages/converter-external/OMakefile
share/examples/camlimages/converter-external/OMakeroot
share/examples/camlimages/converter-external/converter.ml
@comment share/examples/camlimages/converter/.cvsignore
share/examples/camlimages/converter/OMakefile
share/examples/camlimages/converter/converter
share/examples/camlimages/converter/converter.cmi
share/examples/camlimages/converter/converter.cmo
share/examples/camlimages/converter/converter.ml
share/examples/camlimages/converter/converter.run
share/examples/camlimages/crop/
@comment share/examples/camlimages/crop/.cvsignore
share/examples/camlimages/crop/OMakefile
share/examples/camlimages/crop/README
share/examples/camlimages/crop/crop
share/examples/camlimages/crop/crop.cmi
share/examples/camlimages/crop/crop.cmo
share/examples/camlimages/crop/crop.ml
share/examples/camlimages/crop/crop.run
share/examples/camlimages/edgedetect/
@comment share/examples/camlimages/edgedetect/.cvsignore
share/examples/camlimages/edgedetect/OMakefile
share/examples/camlimages/edgedetect/README
share/examples/camlimages/edgedetect/edge
share/examples/camlimages/edgedetect/edge.cmi
share/examples/camlimages/edgedetect/edge.cmo
share/examples/camlimages/edgedetect/edge.ml
share/examples/camlimages/edgedetect/edge.run
share/examples/camlimages/gifanim/
@comment share/examples/camlimages/gifanim/.cvsignore
@comment share/examples/camlimages/gifanim/.depend
share/examples/camlimages/gifanim/OMakefile
share/examples/camlimages/gifanim/README
share/examples/camlimages/gifanim/gifanim.ml
share/examples/camlimages/gifanim/guienv.ml
share/examples/camlimages/gifanim/usleep.ml
share/examples/camlimages/imgstat/
@comment share/examples/camlimages/imgstat/.cvsignore
share/examples/camlimages/imgstat/OMakefile
share/examples/camlimages/imgstat/README
share/examples/camlimages/imgstat/imgstat
share/examples/camlimages/imgstat/imgstat.cmi
share/examples/camlimages/imgstat/imgstat.cmo
share/examples/camlimages/imgstat/imgstat.ml
share/examples/camlimages/imgstat/imgstat.run
share/examples/camlimages/liv/
share/examples/camlimages/liv-furuse/
@comment share/examples/camlimages/liv-furuse/.cvsignore
@comment share/examples/camlimages/liv-furuse/.depend
share/examples/camlimages/liv-furuse/BulletHole.xpm
share/examples/camlimages/liv-furuse/File.xpm
share/examples/camlimages/liv-furuse/FileUnknown.xpm
share/examples/camlimages/liv-furuse/FilesLink.xpm
share/examples/camlimages/liv-furuse/Folder.xpm
share/examples/camlimages/liv-furuse/FolderLink.xpm
share/examples/camlimages/liv-furuse/Monalisa.xpm
share/examples/camlimages/liv-furuse/OMakefile
share/examples/camlimages/liv-furuse/README
share/examples/camlimages/liv-furuse/cache.ml
share/examples/camlimages/liv-furuse/cache.mli
share/examples/camlimages/liv-furuse/deficon.ml
share/examples/camlimages/liv-furuse/display.ml
share/examples/camlimages/liv-furuse/edge.ml
share/examples/camlimages/liv-furuse/enhance.ml
share/examples/camlimages/liv-furuse/faceanm.gif
share/examples/camlimages/liv-furuse/gui.ml
share/examples/camlimages/liv-furuse/icon.ml
share/examples/camlimages/liv-furuse/iconcap
share/examples/camlimages/liv-furuse/iconcap.ml
share/examples/camlimages/liv-furuse/jWidget.ml
share/examples/camlimages/liv-furuse/jpf.ml
share/examples/camlimages/liv-furuse/liv
share/examples/camlimages/liv-furuse/liv-jpf.ml
share/examples/camlimages/liv-furuse/liv-org.ml
share/examples/camlimages/liv-furuse/liv.ml
share/examples/camlimages/liv-furuse/livdemo.jpg
share/examples/camlimages/liv-furuse/livmisc.ml
share/examples/camlimages/liv-furuse/livsh.ml
share/examples/camlimages/liv-furuse/livshtype.ml
share/examples/camlimages/liv-furuse/livshtype.mli
share/examples/camlimages/liv-furuse/mylazy.ml
share/examples/camlimages/liv-furuse/mylazy.mli
share/examples/camlimages/liv-furuse/pathfind.ml
share/examples/camlimages/liv-furuse/scandir.ml
share/examples/camlimages/liv-furuse/seq.ml
share/examples/camlimages/liv-furuse/sound.xpm
share/examples/camlimages/liv-furuse/tout.ml
share/examples/camlimages/liv-furuse/viewer.ml
@comment share/examples/camlimages/liv/.cvsignore
share/examples/camlimages/liv/BulletHole.xpm
share/examples/camlimages/liv/File.xpm
share/examples/camlimages/liv/FileUnknown.xpm
share/examples/camlimages/liv/FilesLink.xpm
share/examples/camlimages/liv/Folder.xpm
share/examples/camlimages/liv/FolderLink.xpm
share/examples/camlimages/liv/Monalisa.xpm
share/examples/camlimages/liv/OMakefile
share/examples/camlimages/liv/README
share/examples/camlimages/liv/cache.ml
share/examples/camlimages/liv/cache.mli
share/examples/camlimages/liv/deficon.ml
share/examples/camlimages/liv/display.ml
share/examples/camlimages/liv/edge.ml
share/examples/camlimages/liv/enhance.ml
share/examples/camlimages/liv/faceanm.gif
share/examples/camlimages/liv/gui.ml
share/examples/camlimages/liv/icon.ml
share/examples/camlimages/liv/iconcap
share/examples/camlimages/liv/iconcap.ml
share/examples/camlimages/liv/jWidget.ml
share/examples/camlimages/liv/jpf.ml
share/examples/camlimages/liv/liv.ml
share/examples/camlimages/liv/livdemo.jpg
share/examples/camlimages/liv/livmisc.ml
share/examples/camlimages/liv/livsh.ml
share/examples/camlimages/liv/livshtype.ml
share/examples/camlimages/liv/livshtype.mli
share/examples/camlimages/liv/mylazy.ml
share/examples/camlimages/liv/mylazy.mli
share/examples/camlimages/liv/pathfind.ml
share/examples/camlimages/liv/scandir.ml
share/examples/camlimages/liv/seq.ml
share/examples/camlimages/liv/sound.xpm
share/examples/camlimages/liv/tout.ml
share/examples/camlimages/liv/viewer.ml
share/examples/camlimages/monochrome/
@comment share/examples/camlimages/monochrome/.cvsignore
share/examples/camlimages/monochrome/OMakefile
share/examples/camlimages/monochrome/monochrome
share/examples/camlimages/monochrome/monochrome.cmi
share/examples/camlimages/monochrome/monochrome.cmo
share/examples/camlimages/monochrome/monochrome.ml
share/examples/camlimages/monochrome/monochrome.run
share/examples/camlimages/normalize/
@comment share/examples/camlimages/normalize/.cvsignore
share/examples/camlimages/normalize/OMakefile
share/examples/camlimages/normalize/normalize
share/examples/camlimages/normalize/normalize.cmi
share/examples/camlimages/normalize/normalize.cmo
share/examples/camlimages/normalize/normalize.ml
share/examples/camlimages/normalize/normalize.run
share/examples/camlimages/resize/
@comment share/examples/camlimages/resize/.cvsignore
share/examples/camlimages/resize/OMakefile
share/examples/camlimages/resize/README
share/examples/camlimages/resize/resize
share/examples/camlimages/resize/resize.cmi
share/examples/camlimages/resize/resize.cmo
share/examples/camlimages/resize/resize.ml
share/examples/camlimages/resize/resize.run
share/examples/camlimages/tiffps/
@comment share/examples/camlimages/tiffps/.cvsignore
share/examples/camlimages/tiffps/OMakefile
share/examples/camlimages/tiffps/README
share/examples/camlimages/tiffps/tiffps
share/examples/camlimages/tiffps/tiffps.cmi
share/examples/camlimages/tiffps/tiffps.cmo
share/examples/camlimages/tiffps/tiffps.ml
share/examples/camlimages/tiffps/tiffps.run
share/examples/camlimages/ttfimg/
@comment share/examples/camlimages/ttfimg/.cvsignore
share/examples/camlimages/ttfimg/OMakefile
share/examples/camlimages/ttfimg/ttfimg
share/examples/camlimages/ttfimg/ttfimg.cmi
share/examples/camlimages/ttfimg/ttfimg.cmo
share/examples/camlimages/ttfimg/ttfimg.ml
share/examples/camlimages/ttfimg/ttfimg.run
@@ -0,0 +1,43 @@
# $OpenBSD: Makefile,v 1.40 2012/03/29 13:38:31 sthen Exp $

COMMENT = IJG libjpeg compatible, accellerated JPEG (de)compression

V = 1.2.0
DISTNAME = libjpeg-turbo-$V
SHARED_LIBS += jpeg 64.0 # 11.0
SHARED_LIBS += turbojpeg 0.0
CATEGORIES = graphics
HOMEPAGE = http://www.libjpeg-turbo.org/

PKGNAME = jpeg-${V}-turbo

# BSD-style
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes

MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
DISTFILES = libjpeg-turbo-${V}.tar.gz

WANTLIB = c m

BUILD_DEPENDS = devel/nasm>=2.00

SEPARATE_BUILD = Yes
USE_LIBTOOL = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = ${CONFIGURE_SHARED}
# Symbol versioning triggers weird linking problems in dependent ports.
CONFIGURE_ARGS += --disable-ld-version-script --with-jpeg8

post-install:
mv ${PREFIX}/lib/libturbojpeg.so \
${PREFIX}/lib/libturbojpeg.so.${LIBturbojpeg_VERSION}
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpeg
${INSTALL_DATA} ${WRKSRC}/libjpeg.txt ${WRKSRC}/wizard.txt \
${PREFIX}/share/doc/jpeg
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/jpeg
${INSTALL_DATA} ${WRKSRC}/example.c ${PREFIX}/share/examples/jpeg

.include <bsd.port.mk>
@@ -0,0 +1,6 @@
testing on all arches

should this go into cvs and how?
* replace libjpeg
* as alternative
* not at all
@@ -0,0 +1,5 @@
MD5 (libjpeg-turbo-1.2.0.tar.gz) = Uyn6gJU5OMtPCXr65VBZ4g==
RMD160 (libjpeg-turbo-1.2.0.tar.gz) = 1gp94HwxZK6xgAuiGoZ4LhlfAPg=
SHA1 (libjpeg-turbo-1.2.0.tar.gz) = SrAK/JqNVM0uemeqy5xJ4BqLzKw=
SHA256 (libjpeg-turbo-1.2.0.tar.gz) = Yp2yqbEpWhsOX6jd3aNsXaYakFNr74KV4LIJy81Q+Y4=
SIZE (libjpeg-turbo-1.2.0.tar.gz) = 1752925
@@ -0,0 +1,12 @@
$OpenBSD$
--- Makefile.in.orig Wed Jun 27 10:59:56 2012
+++ Makefile.in Wed Jun 27 11:00:14 2012
@@ -462,7 +462,7 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1
DOCS = install.txt coderules.txt filelist.txt jconfig.txt change.log \
rdrle.c wrrle.c BUILDING.txt ChangeLog.txt

-docdir = $(datadir)/doc
+docdir = $(datadir)/doc/jpeg
dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \
wizard.txt

@@ -0,0 +1,20 @@
$OpenBSD: patch-jerror_c,v 1.2 2009/10/14 13:03:44 naddy Exp $

This one is slightly problematic. If an application allocates less
room for its error buffer than the recommended JMSG_LENGTH_MAX, the
error message buffer will still overflow.

--- jerror.c.orig Sat Oct 10 12:43:21 2009
+++ jerror.c Sat Oct 10 12:43:52 2009
@@ -190,9 +190,9 @@ format_message (j_common_ptr cinfo, char * buffer)

/* Format the message into the passed buffer */
if (isstring)
- sprintf(buffer, msgtext, err->msg_parm.s);
+ snprintf(buffer, JMSG_LENGTH_MAX, msgtext, err->msg_parm.s);
else
- sprintf(buffer, msgtext,
+ snprintf(buffer, JMSG_LENGTH_MAX, msgtext,
err->msg_parm.i[0], err->msg_parm.i[1],
err->msg_parm.i[2], err->msg_parm.i[3],
err->msg_parm.i[4], err->msg_parm.i[5],
@@ -0,0 +1,23 @@
$OpenBSD: patch-wrjpgcom_c,v 1.1 2009/10/14 13:03:44 naddy Exp $
--- wrjpgcom.c.orig Sat Oct 10 12:35:12 2009
+++ wrjpgcom.c Sat Oct 10 12:36:11 2009
@@ -453,7 +453,7 @@ main (int argc, char **argv)
comment_arg = (char *) malloc((size_t) MAX_COM_LENGTH);
if (comment_arg == NULL)
ERREXIT("Insufficient memory");
- strcpy(comment_arg, argv[argn]+1);
+ strlcpy(comment_arg, argv[argn]+1, MAX_COM_LENGTH);
for (;;) {
comment_length = (unsigned int) strlen(comment_arg);
if (comment_length > 0 && comment_arg[comment_length-1] == '"') {
@@ -462,8 +462,8 @@ main (int argc, char **argv)
}
if (++argn >= argc)
ERREXIT("Missing ending quote mark");
- strcat(comment_arg, " ");
- strcat(comment_arg, argv[argn]);
+ strlcat(comment_arg, " ", MAX_COM_LENGTH);
+ strlcat(comment_arg, argv[argn], MAX_COM_LENGTH);
}
}
comment_length = (unsigned int) strlen(comment_arg);
@@ -0,0 +1,20 @@
This package contains software to implement JPEG image encoding,
decoding, and transcoding. JPEG (pronounced "jay-peg") is a
standardized compression method for full-color and gray-scale images.

This software implements JPEG baseline, extended-sequential, and
progressive compression processes.

A set of library routines for reading and writing JPEG image files is
provided, plus two sample applications "cjpeg" and "djpeg", which use
the library to perform conversion between JPEG and some other popular
image file formats. Also included is "jpegtran", a utility for lossless
transcoding between different JPEG processes, and "rdjpgcom" and
"wrjpgcom", two simple applications for inserting and extracting textual
comments in JFIF files.

libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions
(MMX, SSE2, NEON) to accelerate baseline JPEG compression and
decompression on x86, x86-64, and ARM systems. On such systems,
libjpeg-turbo is generally 2-4x as fast as the unmodified version of
libjpeg, all else being equal.
@@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/27 16:06:52 steven Exp $
@lib lib/libjpeg.so.${LIBjpeg_VERSION}
@lib lib/libturbojpeg.so.${LIBturbojpeg_VERSION}
@@ -0,0 +1,33 @@
@comment $OpenBSD: PLIST,v 1.11 2009/10/14 13:03:44 naddy Exp $
@conflict jpeg-*
@bin bin/cjpeg
@bin bin/djpeg
@bin bin/jpegtran
@bin bin/rdjpgcom
@bin bin/tjbench
@bin bin/wrjpgcom
include/jconfig.h
include/jerror.h
include/jmorecfg.h
include/jpeglib.h
include/turbojpeg.h
lib/libjpeg.a
lib/libjpeg.la
lib/libturbojpeg.a
lib/libturbojpeg.la
%%SHARED%%
@man man/man1/cjpeg.1
@man man/man1/djpeg.1
@man man/man1/jpegtran.1
@man man/man1/rdjpgcom.1
@man man/man1/wrjpgcom.1
share/doc/example.c
share/doc/jpeg/
share/doc/jpeg/README
share/doc/jpeg/README-turbo.txt
share/doc/jpeg/libjpeg.txt
share/doc/jpeg/structure.txt
share/doc/jpeg/usage.txt
share/doc/jpeg/wizard.txt
share/examples/jpeg/
share/examples/jpeg/example.c
@@ -1,7 +1,7 @@
# $OpenBSD$
COMMENT = application that aims to provide a workflow for HDR imaging

DISTNAME = luminance-hdr-2.2.1
DISTNAME = luminance-hdr-2.3.0

CATEGORIES = graphics

@@ -19,7 +19,8 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
EXTRACT_SUFX = .tar.bz2

WANTLIB += Half Iex IlmImf QtGui QtSql QtWebKit QtXml c exiv2
WANTLIB += fftw3f gsl gslcblas m pthread raw_r stdc++ tiff
WANTLIB += fftw3f fftw3f_threads gsl gslcblas jpeg lcms2 m png
WANTLIB += pthread raw_r stdc++ tiff

MODULES = devel/cmake x11/qt4
LIB_DEPENDS = devel/gsl \
@@ -29,9 +30,11 @@ LIB_DEPENDS = devel/gsl \
graphics/tiff \
math/fftw3,float
RUN_DEPENDS = devel/desktop-file-utils \
x11/qt4,-sqlite
x11/qt4

CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release
CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_EXE_LINKER_FLAGS=-pthread \
-DLIBPNG_INCLUDE_DIR=${LOCALBASE}/include/libpng

NO_REGRESS = Yes

@@ -0,0 +1,86 @@
-needs fftw with threads support

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 29 Mar 2012 13:38:40 -0000 1.22
+++ Makefile 16 Jul 2012 06:07:14 -0000
@@ -10,10 +10,12 @@
# XXX set it to its default value so that bsd.port.mk won't whine
FULLPKGPATH-main= math/fftw3,-main${FLAVOR_EXT:S/-/,/g}
FULLPKGNAME-common= fftw3-common-${V}
-REVISION-main= 0
+REVISION-main= 1
REVISION-common=0
SHARED_LIBS= fftw3 5.0 \
- fftw3f 5.0
+ fftw3f 5.0 \
+ fftw3_threads 0.0 \
+ fftw3f_threads 0.0
CATEGORIES= math

HOMEPAGE= http://www.fftw.org/
@@ -40,7 +42,8 @@
USE_GROFF = Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
- --enable-portable-binary
+ --enable-portable-binary \
+ --enable-threads

.if ${FLAVOR} == "float"
CONFIGURE_ARGS+=--enable-float
Index: pkg/PFRAG.double-main
===================================================================
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-main,v
retrieving revision 1.2
diff -u -r1.2 PFRAG.double-main
--- pkg/PFRAG.double-main 8 Oct 2008 22:27:22 -0000 1.2
+++ pkg/PFRAG.double-main 16 Jul 2012 06:07:14 -0000
@@ -4,5 +4,7 @@
@bin bin/fftw-wisdom
lib/libfftw3.a
lib/libfftw3.la
+lib/libfftw3_threads.a
+lib/libfftw3_threads.la
lib/pkgconfig/fftw3.pc
@man man/man1/fftw-wisdom.1
Index: pkg/PFRAG.double-shared-main
===================================================================
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-shared-main,v
retrieving revision 1.1
diff -u -r1.1 PFRAG.double-shared-main
--- pkg/PFRAG.double-shared-main 21 Nov 2006 20:42:30 -0000 1.1
+++ pkg/PFRAG.double-shared-main 16 Jul 2012 06:07:14 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.double-shared-main,v 1.1 2006/11/21 20:42:30 steven Exp $
@lib lib/libfftw3.so.${LIBfftw3_VERSION}
+@lib lib/libfftw3_threads.so.${LIBfftw3_threads_VERSION}
Index: pkg/PFRAG.float-main
===================================================================
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-main,v
retrieving revision 1.2
diff -u -r1.2 PFRAG.float-main
--- pkg/PFRAG.float-main 8 Oct 2008 22:27:22 -0000 1.2
+++ pkg/PFRAG.float-main 16 Jul 2012 06:07:14 -0000
@@ -3,5 +3,7 @@
@bin bin/fftwf-wisdom
lib/libfftw3f.a
lib/libfftw3f.la
+lib/libfftw3f_threads.a
+lib/libfftw3f_threads.la
lib/pkgconfig/fftw3f.pc
@man man/man1/fftwf-wisdom.1
Index: pkg/PFRAG.float-shared-main
===================================================================
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-shared-main,v
retrieving revision 1.1
diff -u -r1.1 PFRAG.float-shared-main
--- pkg/PFRAG.float-shared-main 21 Nov 2006 20:42:30 -0000 1.1
+++ pkg/PFRAG.float-shared-main 16 Jul 2012 06:07:14 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.float-shared-main,v 1.1 2006/11/21 20:42:30 steven Exp $
@lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
+@lib lib/libfftw3f_threads.so.${LIBfftw3f_threads_VERSION}
@@ -1,5 +1,2 @@
MD5 (luminance-hdr-2.2.1.tar.bz2) = nGTYm9ps6mhdEVjdPLyCOw==
RMD160 (luminance-hdr-2.2.1.tar.bz2) = /jxH0T7zzFxlIgm/Vfi2eXbQrCQ=
SHA1 (luminance-hdr-2.2.1.tar.bz2) = 2mzHjVl8CioQrXI9wKVhJjyVbs8=
SHA256 (luminance-hdr-2.2.1.tar.bz2) = 5vhDnrA0VWdurr/ntBv8w9OsYdH7KW8SsoeDKS51qQM=
SIZE (luminance-hdr-2.2.1.tar.bz2) = 3942721
SHA256 (luminance-hdr-2.3.0.tar.bz2) = 2toHlbWIQ5Ery1fOYdzWFby5+UN7YQo3/4E60siZxnY=
SIZE (luminance-hdr-2.3.0.tar.bz2) = 5398576

This file was deleted.

@@ -0,0 +1,39 @@
$OpenBSD$
--- src/Fileformat/jpegwriter.cpp.orig Mon Jul 16 14:02:26 2012
+++ src/Fileformat/jpegwriter.cpp Mon Jul 16 14:03:23 2012
@@ -36,7 +36,7 @@
#include <lcms2.h>
#include <jpeglib.h>

-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <QTemporaryFile>
#endif

@@ -218,7 +218,7 @@ bool JpegWriter::writeQImageToJpeg()

ResouceHandlerFile outfile;

-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
QTemporaryFile output_temp_file;
#else
std::vector<char> outbuf;
@@ -238,7 +238,7 @@ bool JpegWriter::writeQImageToJpeg()
}
else // we are writing to memory buffer
{
-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
if ( !output_temp_file.open() ) return false; // could not open the temporary file!

QByteArray output_temp_filename = QFile::encodeName( output_temp_file.fileName() );
@@ -288,7 +288,7 @@ bool JpegWriter::writeQImageToJpeg()

if ( m_fname.isEmpty() )
{
-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
fflush(outfile.data());
fseek(outfile.data(), 0, SEEK_END);
m_filesize = ftell(outfile.data());
@@ -0,0 +1,39 @@
$OpenBSD$
--- src/Fileformat/pngwriter.cpp.orig Mon Jul 16 14:03:51 2012
+++ src/Fileformat/pngwriter.cpp Mon Jul 16 14:04:26 2012
@@ -29,7 +29,7 @@
#include <lcms2.h>
#include <stdio.h>

-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <QTemporaryFile>
#endif

@@ -68,7 +68,7 @@ bool PngWriter::writeQImageToPng()

FILE *outfile;

-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
QTemporaryFile output_temp_file;
#else
std::vector<char> outbuf;
@@ -88,7 +88,7 @@ bool PngWriter::writeQImageToPng()
}
else // we are writing to memory buffer
{
-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
if ( !output_temp_file.open() ) return false; // could not open the temporary file!

QByteArray output_temp_filename = QFile::encodeName( output_temp_file.fileName() );
@@ -180,7 +180,7 @@ bool PngWriter::writeQImageToPng()

if ( m_fname.isEmpty() )
{
-#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
fflush(outfile);
fseek(outfile, 0, SEEK_END);
m_filesize = ftell(outfile);
@@ -21,6 +21,7 @@ share/luminance-hdr/help/en/
share/luminance-hdr/help/en/README
share/luminance-hdr/help/en/additional.html
share/luminance-hdr/help/en/basics.html
share/luminance-hdr/help/en/color_management.html
share/luminance-hdr/help/en/contributing.html
share/luminance-hdr/help/en/contributing_donating.html
share/luminance-hdr/help/en/contributing_programming.html
@@ -40,11 +41,17 @@ share/luminance-hdr/help/en/hints.html
share/luminance-hdr/help/en/images/
share/luminance-hdr/help/en/images/batch-hdr.png
share/luminance-hdr/help/en/images/batch-tmo.png
share/luminance-hdr/help/en/images/color_management.png
share/luminance-hdr/help/en/images/copy-exif.png
share/luminance-hdr/help/en/images/cropping_frame.png
share/luminance-hdr/help/en/images/mainwin.png
share/luminance-hdr/help/en/images/not-translated-menu-item.png
share/luminance-hdr/help/en/images/preferences.png
share/luminance-hdr/help/en/images/prefs-cms.png
share/luminance-hdr/help/en/images/prefs-ext.png
share/luminance-hdr/help/en/images/prefs-hdr.png
share/luminance-hdr/help/en/images/prefs-raw.png
share/luminance-hdr/help/en/images/prefs-tm.png
share/luminance-hdr/help/en/images/projectiveTransformationDialog.png
share/luminance-hdr/help/en/images/resize.png
share/luminance-hdr/help/en/images/translated-menu-item.png
@@ -53,6 +60,7 @@ share/luminance-hdr/help/en/manual.html
share/luminance-hdr/help/en/menu.xml
share/luminance-hdr/help/en/news.html
share/luminance-hdr/help/en/prefs.html
share/luminance-hdr/help/en/prefs_cms.html
share/luminance-hdr/help/en/prefs_hdr.html
share/luminance-hdr/help/en/prefs_rawconversion.html
share/luminance-hdr/help/en/prefs_tonemapping.html
@@ -78,10 +86,25 @@ share/luminance-hdr/i18n/lang_de.qm
share/luminance-hdr/i18n/lang_es.qm
share/luminance-hdr/i18n/lang_fi.qm
share/luminance-hdr/i18n/lang_fr.qm
share/luminance-hdr/i18n/lang_hi.qm
share/luminance-hdr/i18n/lang_hu.qm
share/luminance-hdr/i18n/lang_id.qm
share/luminance-hdr/i18n/lang_it.qm
share/luminance-hdr/i18n/lang_pl.qm
share/luminance-hdr/i18n/lang_ro.qm
share/luminance-hdr/i18n/lang_ru.qm
share/luminance-hdr/i18n/lang_sk.qm
share/luminance-hdr/i18n/lang_tr.qm
share/luminance-hdr/i18n/lang_zh.qm
share/luminance-hdr/i18n/qt_cs.qm
share/luminance-hdr/i18n/qt_de.qm
share/luminance-hdr/i18n/qt_es.qm
share/luminance-hdr/i18n/qt_fi.qm
share/luminance-hdr/i18n/qt_fr.qm
share/luminance-hdr/i18n/qt_hu.qm
share/luminance-hdr/i18n/qt_it.qm
share/luminance-hdr/i18n/qt_pl.qm
share/luminance-hdr/i18n/qt_ro.qm
share/luminance-hdr/i18n/qt_ru.qm
share/luminance-hdr/i18n/qt_tr.qm
share/luminance-hdr/i18n/qt_zh.qm
@@ -8,7 +8,7 @@ COMMENT-main= library of programming functions for real time cv
COMMENT-docs= documentation for OpenCV

V= 2.4.1
REVISION= 2
REVISION= 3
DISTNAME= OpenCV-$V
PKGNAME-main= opencv-$V
PKGNAME-docs= opencv-docs-$V
@@ -1,4 +1,5 @@
@comment $OpenBSD$
lib/pkgconfig/
share/opencv/doc/
share/opencv/doc/CMakeLists.txt
share/opencv/doc/acircles_pattern.png
@@ -157,8 +157,7 @@ include/opencv2/videostab/videostab.hpp
@lib lib/libopencv_video.so.${LIBopencv_video_VERSION}
@lib lib/libopencv_videostab.so.${LIBopencv_videostab_VERSION}
lib/pkgconfig/opencv.pc
lib/python${MODPY_VERSION}/site-packages/cv.py
lib/python${MODPY_VERSION}/site-packages/cv2.so
share/OpenCV/
share/opencv/
share/opencv/OpenCVConfig-version.cmake
share/opencv/OpenCVConfig.cmake
@@ -2,7 +2,7 @@

COMMENT = RAW image processing application

DISTNAME = rawtherapee-4.0.7
DISTNAME = rawtherapee-4.0.9

CATEGORIES = graphics

@@ -19,13 +19,14 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 atkmm-1.6 bz2 c cairo cairomm-1.0
WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkmm-2.4 iconv
WANTLIB += intl iptcdata jpeg lcms2 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pangomm-1.4 pixman-1 png pthread pthread-stubs
WANTLIB += sigc-2.0 stdc++ tiff xcb xcb-render xcb-shm z

MASTER_SITES = http://www.linklevel.net/distfiles/
MASTER_SITES = http://rawtherapee.googlecode.com/files/
EXTRACT_SUFX = .tar.xz

MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils
@@ -1,5 +1,2 @@
MD5 (rawtherapee-4.0.7.tar.gz) = sgEOk6IUScKevWDY6CBNvQ==
RMD160 (rawtherapee-4.0.7.tar.gz) = 5PvYWbvigcoFGgoY2aRup+Tyavs=
SHA1 (rawtherapee-4.0.7.tar.gz) = 0O81agOlug8+xOcvVZoGOkjwdyA=
SHA256 (rawtherapee-4.0.7.tar.gz) = JmUbMx3We9Ll4clEJptCEQpukg3vpzkvA0RxTLPGTD4=
SIZE (rawtherapee-4.0.7.tar.gz) = 41274888
SHA256 (rawtherapee-4.0.9.tar.xz) = StSbXTqumheLHPpe/KZTmC8KUnY93Tf4lQDo/t+xh9I=
SIZE (rawtherapee-4.0.9.tar.xz) = 40201920

This file was deleted.

@@ -1,7 +1,7 @@
$OpenBSD$
--- CMakeLists.txt.orig Sun Sep 11 23:40:16 2011
+++ CMakeLists.txt Sun Sep 11 23:40:45 2011
@@ -271,12 +271,6 @@ else (AUTOMATED_BUILD_SYSTEM)
--- CMakeLists.txt.orig Sun Jun 3 19:56:20 2012
+++ CMakeLists.txt Mon Jul 16 01:25:51 2012
@@ -281,12 +281,6 @@ else (AUTOMATED_BUILD_SYSTEM)

add_dependencies(AboutFile Debug Release MinSizeRel RelWithDebInfo)

This file was deleted.

@@ -1,12 +1,12 @@
$OpenBSD$
--- rtgui/CMakeLists.txt.orig Fri Oct 28 17:41:24 2011
+++ rtgui/CMakeLists.txt Fri Oct 28 17:38:25 2011
@@ -54,7 +54,7 @@ add_executable (rth ${EXTRA_SRC} ${BASESOURCEFILES})
--- rtgui/CMakeLists.txt.orig Mon Jul 16 01:26:34 2012
+++ rtgui/CMakeLists.txt Mon Jul 16 01:27:13 2012
@@ -52,7 +52,7 @@ add_executable (rth ${EXTRA_SRC} ${BASESOURCEFILES})
set_target_properties (rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee)
#target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
# ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES})
-target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
+target_link_libraries (rth rtengine -pthread ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES} ${EXTRA_LIB_RTGUI})
${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${EXPAT_LIBRARIES} ${IPTCDATA_LIBRARIES} ${EXTRA_LIB_RTGUI})
install (TARGETS rth DESTINATION ${BINDIR})

@@ -0,0 +1,11 @@
$OpenBSD$
--- rtgui/darkframe.h.orig Mon Jul 16 01:28:49 2012
+++ rtgui/darkframe.h Mon Jul 16 01:29:06 2012
@@ -19,7 +19,6 @@
#ifndef _DARKFRAME_H_
#define _DARKFRAME_H_

-#include <auto_ptr.h>
#include <gtkmm.h>
#include "toolpanel.h"
#include "../rtengine/rawimage.h"
@@ -0,0 +1,11 @@
$OpenBSD$
--- rtgui/flatfield.h.orig Mon Jul 16 01:27:57 2012
+++ rtgui/flatfield.h Mon Jul 16 01:28:15 2012
@@ -19,7 +19,6 @@
#ifndef _FLATFIELD_H_
#define _FLATFIELD_H_

-#include <auto_ptr.h>
#include <gtkmm.h>
#include "adjuster.h"
#include "toolpanel.h"
@@ -0,0 +1,12 @@
$OpenBSD$
--- rtgui/icmpanel.h.orig Mon Jul 16 01:29:50 2012
+++ rtgui/icmpanel.h Mon Jul 16 01:30:05 2012
@@ -19,8 +19,6 @@
#ifndef _ICMPANEL_
#define _ICMPANEL_

-#include <auto_ptr.h>
-
#include <gtkmm.h>
#include "adjuster.h"
#include "guiutils.h"