Commits

Jim Razmus II committed ab0eb42

cvs up

Comments (0)

Files changed (144)

databases/leveldb/CVS/Entries

 D/patches////
 D/pkg////
-/distinfo/1.1.1.1/Mon Jan  2 23:35:58 2012//
-/Makefile/1.6/Mon Aug 20 11:05:46 2012//
+/Makefile/1.7/Tue Aug 21 11:05:58 2012//
+/distinfo/1.2/Tue Aug 21 11:05:58 2012//

databases/leveldb/Makefile

-# $OpenBSD: Makefile,v 1.6 2012/08/19 21:08:34 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2012/08/21 00:28:34 jmatthew Exp $
 
 #'atomic_pointer.h: error Please implement AtomicPointer for this platform' on other archs
 ONLY_FOR_ARCHS=	i386 amd64 arm
 
 COMMENT=	fast and lightweight key/value database library
 
-# svn rev 48, use a small version to allow seemless updating when the
-# project releases a tarball.
-DISTNAME=	leveldb-0.0.48
-SHARED_LIBS=	leveldb 0.0
+DISTNAME=	leveldb-1.5.0
+SHARED_LIBS=	leveldb 1.0
 CATEGORIES=	databases
-REVISION=	2
 
 HOMEPAGE=	http://leveldb.googlecode.com/
 
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://distfiles.nl/
+MASTER_SITES=	http://leveldb.googlecode.com/files/
 
 WANTLIB += m stdc++
 
 USE_GMAKE=	Yes
 MAKE_ENV+=	CC=c++ OPT="${CXXFLAGS}" \
-		SONAME_MAJOR=${LIBleveldb_VERSION:R} \
-		SONAME_MINOR=${LIBleveldb_VERSION:E}
+		SHARED_MAJOR=${LIBleveldb_VERSION:R} \
+		SHARED_MINOR=${LIBleveldb_VERSION:E}
 
 REGRESS_TARGET= check
 

databases/leveldb/distinfo

-MD5 (leveldb-0.0.48.tar.gz) = EpwqrYc2JOX3ml3Td4gmnQ==
-RMD160 (leveldb-0.0.48.tar.gz) = u1efJYCf33kWh7Bc4HnqHjhKCaA=
-SHA1 (leveldb-0.0.48.tar.gz) = CzmBnOP/olwh4pZec8wAjq4363U=
-SHA256 (leveldb-0.0.48.tar.gz) = a9D1oDdS0PjXWoEh22r23vRDkaPdzHQjE6xnwMhYQLg=
-SIZE (leveldb-0.0.48.tar.gz) = 174794
+MD5 (leveldb-1.5.0.tar.gz) = Z5fhmgqfm7HBujVr+JIn8A==
+RMD160 (leveldb-1.5.0.tar.gz) = Gi4LhiLZpd6Nf5Sbw4DYd7eFrcE=
+SHA1 (leveldb-1.5.0.tar.gz) = tbRf90Bl8kLDf0ZbE9r7kllyykM=
+SHA256 (leveldb-1.5.0.tar.gz) = y3NImvhNnZfT59I0ovXjoMif+ttlfn3Z6QRyJ3eOV7o=
+SIZE (leveldb-1.5.0.tar.gz) = 199231

databases/leveldb/patches/CVS/Entries

-/patch-Makefile/1.1.1.1/Mon Jan  2 23:35:58 2012//
-/patch-port_port_posix_h/1.1.1.1/Mon Jan  2 23:35:58 2012//
-/patch-build_detect_platform/1.2/Mon Aug 20 11:05:46 2012//
+/patch-Makefile/1.2/Tue Aug 21 11:05:58 2012//
+/patch-build_detect_platform/1.3/Tue Aug 21 11:05:58 2012//
+/patch-port_port_posix_h/1.2/Tue Aug 21 11:05:58 2012//
+/patch-util_coding_cc/1.1/Tue Aug 21 00:28:34 2012//
 D

databases/leveldb/patches/patch-Makefile

-$OpenBSD: patch-Makefile,v 1.1.1.1 2011/08/19 06:44:00 jasper Exp $
+$OpenBSD: patch-Makefile,v 1.2 2012/08/21 00:28:34 jmatthew Exp $
 
-- Allow ${CC} and ${OPT} to be overriden, to help packagers.
-  http://code.google.com/p/leveldb/issues/detail?id=32
+Allow SHARED_MAJOR and SHARED_MINOR to be overridden.
+This doesn't affect kMajorVersion and kMinorVersion in db.h,
+but nothing uses them anyway.
 
-- Provide a shared library
-  http://code.google.com/p/leveldb/issues/detail?id=27
-
---- Makefile.orig	Fri Aug  5 22:40:49 2011
-+++ Makefile	Thu Aug 18 17:18:19 2011
-@@ -2,13 +2,15 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file. See the AUTHORS file for names of contributors.
- 
--CC = g++
-+CC ?= g++
- 
-+SONAME_MAJOR?=0
-+SONAME_MINOR?=0
- #-----------------------------------------------
- # Uncomment exactly one of the lines labelled (A), (B), and (C) below
- # to switch between compilation modes.
- 
--OPT = -O2 -DNDEBUG       # (A) Production use (optimized mode)
-+OPT ?= -O2 -DNDEBUG       # (A) Production use (optimized mode)
- # OPT = -g2              # (B) Debug mode, w/ full line-level debugging symbols
- # OPT = -O2 -g2 -DNDEBUG # (C) Profiling mode: opt, but w/debugging symbols
- #-----------------------------------------------
-@@ -36,7 +38,7 @@ else
- GOOGLE_PERFTOOLS_LDFLAGS=
- endif
- 
--CFLAGS = -c -I. -I./include $(PORT_CFLAGS) $(PLATFORM_CFLAGS) $(OPT) $(SNAPPY_CFLAGS)
-+CFLAGS += -c -I. -I./include $(PORT_CFLAGS) $(PLATFORM_CFLAGS) $(OPT) $(SNAPPY_CFLAGS) -fPIC
- 
- LDFLAGS=$(PLATFORM_LDFLAGS) $(SNAPPY_LDFLAGS) $(GOOGLE_PERFTOOLS_LDFLAGS)
- 
-@@ -102,20 +104,28 @@ PROGRAMS = db_bench $(TESTS)
- BENCHMARKS = db_bench_sqlite3 db_bench_tree_db
- 
- LIBRARY = libleveldb.a
-+SHARED_LIBRARY = libleveldb.so
- 
--all: $(LIBRARY)
-+all: $(LIBRARY) $(SHARED_LIBRARY)
- 
- check: $(PROGRAMS) $(TESTS)
- 	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
- 
- clean:
- 	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o
-+	-rm -f $(SHARED_LIBRARY).* $(SHARED_LIBRARY)
- 	-rm -rf ios-x86/* ios-arm/*
- 	-rm build_config.mk
- 
- $(LIBRARY): $(LIBOBJECTS)
- 	rm -f $@
- 	$(AR) -rs $@ $(LIBOBJECTS)
-+
-+$(SHARED_LIBRARY): $(LIBOBJECTS)
-+	rm -f $@
-+	$(CC) -shared -Wl,-soname -Wl,$@.$(SONAME_MAJOR) $(LIBOBJECTS) $(LDFLAGS) -o $@.$(SONAME_MAJOR).$(SONAME_MINOR)
-+	ln -s $@.$(SONAME_MAJOR).$(SONAME_MINOR) $@.$(SONAME_MAJOR)
-+	ln -s $@.$(SONAME_MAJOR).$(SONAME_MINOR) $@
- 
- db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL)
- 	$(CC) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@
+--- Makefile.orig	Fri Aug 17 22:08:25 2012
++++ Makefile	Fri Aug 17 22:08:04 2012
+@@ -69,8 +69,8 @@ SHARED3 = $(SHARED1)
+ SHARED = $(SHARED1)
+ else
+ # Update db.h if you change these.
+-SHARED_MAJOR = 1
+-SHARED_MINOR = 5
++SHARED_MAJOR ?= 1
++SHARED_MINOR ?= 5
+ SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
+ SHARED2 = $(SHARED1).$(SHARED_MAJOR)
+ SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)

databases/leveldb/patches/patch-build_detect_platform

-$OpenBSD: patch-build_detect_platform,v 1.2 2012/08/19 21:08:34 jasper Exp $
+$OpenBSD: patch-build_detect_platform,v 1.3 2012/08/21 00:28:34 jmatthew Exp $
 
-Add OpenBSD support: http://code.google.com/p/leveldb/issues/detail?id=31
+Use -lpthread instead of -pthread.
 
---- build_detect_platform.orig	Wed Jul 27 03:46:25 2011
-+++ build_detect_platform	Sun Aug 19 23:05:45 2012
-@@ -35,6 +35,11 @@ case `uname -s` in
-         echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_FREEBSD"  >> build_config.mk
-         echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk
+Skip checks for <cstdatomic>, snappy and tcmalloc.  We don't
+have any of these, and with our current binutils, c++ -o /dev/null
+deletes /dev/null, which is kind of bad.
+
+--- build_detect_platform.orig	Thu May 31 02:56:59 2012
++++ build_detect_platform	Mon Aug 20 10:25:20 2012
+@@ -91,7 +91,7 @@ case "$TARGET_OS" in
+     OpenBSD)
+         PLATFORM=OS_OPENBSD
+         COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_OPENBSD"
+-        PLATFORM_LDFLAGS="-pthread"
++        PLATFORM_LDFLAGS="-lpthread"
+         PORT_FILE=port/port_posix.cc
          ;;
-+    OpenBSD)
-+        PLATFORM=OS_OPENBSD
-+        echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_OPENBSD"  >> build_config.mk
-+        echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk
-+        ;;
-     *)
-         echo "Unknown platform!"
-         exit 1
+     DragonFly)
+@@ -132,36 +132,8 @@ if [ "$CROSS_COMPILE" = "true" ]; then
+     # Cross-compiling; do not try any compilation tests.
+     true
+ else
+-    # If -std=c++0x works, use <cstdatomic>.  Otherwise use port_posix.h.
+-    $CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null  <<EOF
+-      #include <cstdatomic>
+-      int main() {}
+-EOF
+-    if [ "$?" = 0 ]; then
+-        COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX -DLEVELDB_CSTDATOMIC_PRESENT"
+-        PLATFORM_CXXFLAGS="-std=c++0x"
+-    else
+-        COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
+-    fi
+-
+-    # Test whether Snappy library is installed
+-    # http://code.google.com/p/snappy/
+-    $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
+-      #include <snappy.h>
+-      int main() {}
+-EOF
+-    if [ "$?" = 0 ]; then
+-        COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
+-        PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lsnappy"
+-    fi
+-
+-    # Test whether tcmalloc is available
+-    $CXX $CFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF
+-      int main() {}
+-EOF
+-    if [ "$?" = 0 ]; then
+-        PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -ltcmalloc"
+-    fi
++    # skip checks for <cstdatomic>, snappy and tcmalloc
++    COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
+ fi
+ 
+ PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"

databases/leveldb/patches/patch-port_port_posix_h

-$OpenBSD: patch-port_port_posix_h,v 1.1.1.1 2011/08/19 06:44:00 jasper Exp $
+$OpenBSD: patch-port_port_posix_h,v 1.2 2012/08/21 00:28:34 jmatthew Exp $
 
-Add OpenBSD support: http://code.google.com/p/leveldb/issues/detail?id=31
+#define PLATFORM_IS_LITTLE_ENDIAN appropriately.
+See http://code.google.com/p/leveldb/issues/detail?id=98
 
---- port/port_posix.h.orig	Wed Jul 27 03:46:25 2011
-+++ port/port_posix.h	Thu Aug 18 17:06:57 2011
-@@ -7,7 +7,11 @@
- #ifndef STORAGE_LEVELDB_PORT_PORT_POSIX_H_
- #define STORAGE_LEVELDB_PORT_PORT_POSIX_H_
- 
--#if defined(OS_MACOSX) || defined(OS_FREEBSD)
-+#if defined(OS_OPENBSD)
-+  #include <sys/types.h>
-+#endif
-+
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
-   #include <machine/endian.h>
- #elif defined(OS_SOLARIS)
-   #include <sys/isa_defs.h>
-@@ -33,13 +37,14 @@
- #define IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN)
+--- port/port_posix.h.orig	Thu May 31 02:56:59 2012
++++ port/port_posix.h	Thu Aug 16 12:00:33 2012
+@@ -25,6 +25,7 @@
+       defined(OS_DRAGONFLYBSD) || defined(OS_ANDROID)
+   #include <sys/types.h>
+   #include <sys/endian.h>
++  #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
+ #else
+   #include <endian.h>
  #endif
- 
--#if defined(OS_MACOSX) || defined(OS_SOLARIS) || defined(OS_FREEBSD)
-+#if defined(OS_MACOSX) || defined(OS_SOLARIS) || defined(OS_FREEBSD) || \
-+	defined(OS_OPENBSD)
- #define fread_unlocked fread
- #define fwrite_unlocked fwrite
- #define fflush_unlocked fflush
- #endif
- 
--#if defined(OS_MACOSX) || defined(OS_FREEBSD)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
- #define fdatasync fsync
- #endif
- 

databases/leveldb/patches/patch-util_coding_cc

+$OpenBSD: patch-util_coding_cc,v 1.1 2012/08/21 00:28:34 jmatthew Exp $
+
+Use the endianness #define from port_posix.h
+See http://code.google.com/p/leveldb/issues/detail?id=110
+
+--- util/coding.cc.orig	Thu Aug 16 12:00:57 2012
++++ util/coding.cc	Thu Aug 16 12:01:16 2012
+@@ -7,7 +7,7 @@
+ namespace leveldb {
+ 
+ void EncodeFixed32(char* buf, uint32_t value) {
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
++#if PLATFORM_IS_LITTLE_ENDIAN
+   memcpy(buf, &value, sizeof(value));
+ #else
+   buf[0] = value & 0xff;
+@@ -18,7 +18,7 @@ void EncodeFixed32(char* buf, uint32_t value) {
+ }
+ 
+ void EncodeFixed64(char* buf, uint64_t value) {
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
++#if PLATFORM_IS_LITTLE_ENDIAN
+   memcpy(buf, &value, sizeof(value));
+ #else
+   buf[0] = value & 0xff;

databases/leveldb/pkg/CVS/Entries

 /DESCR/1.1.1.1/Mon Jan  2 23:35:58 2012//
 /PFRAG.shared/1.1.1.1/Mon Jan  2 23:35:58 2012//
-/PLIST/1.2/Mon Mar 19 11:01:52 2012//
+/PLIST/1.3/Tue Aug 21 11:05:58 2012//
 D

databases/leveldb/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.2 2012/03/18 12:56:56 jmatthew Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/08/21 00:28:34 jmatthew Exp $
 %%SHARED%%
 include/leveldb/
 include/leveldb/c.h
 include/leveldb/comparator.h
 include/leveldb/db.h
 include/leveldb/env.h
+include/leveldb/filter_policy.h
 include/leveldb/iterator.h
 include/leveldb/options.h
 include/leveldb/slice.h

devel/ocaml-lambda-term/CVS/Entries

-/Makefile/1.1.1.1/Sat Aug 18 22:56:33 2012//
 /distinfo/1.1.1.1/Sat Aug 18 22:56:33 2012//
 D/pkg////
+/Makefile/1.2/Tue Aug 21 11:07:54 2012//

devel/ocaml-lambda-term/Makefile

-# $OpenBSD: Makefile,v 1.1.1.1 2012/08/18 22:56:33 avsm Exp $
+# $OpenBSD: Makefile,v 1.2 2012/08/21 00:26:46 avsm Exp $
 
 COMMENT =	library for manipulating the terminal
 CATEGORIES =	devel
 DISTNAME =	lambda-term-1.2
 PKGNAME =	ocaml-${DISTNAME}
 MASTER_SITES =	http://forge.ocamlcore.org/frs/download.php/945/
+REVISION=	1
 
 HOMEPAGE =	http://forge.ocamlcore.org/projects/lambda-term
 

devel/ocaml-lambda-term/pkg/CVS/Entries

 /PFRAG.dynlink-native/1.1.1.1/Sat Aug 18 22:56:33 2012//
 /PFRAG.native/1.1.1.1/Sat Aug 18 22:56:33 2012//
 /PFRAG.shared/1.1.1.1/Sat Aug 18 22:56:33 2012//
-/PLIST/1.1.1.1/Sat Aug 18 22:56:33 2012//
+/PLIST/1.2/Tue Aug 21 11:07:55 2012//
 D

devel/ocaml-lambda-term/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/18 22:56:33 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/08/21 00:26:46 avsm Exp $
 %%SHARED%%
 %%native%%
 @bin bin/lambda-term-actions
 lib/ocaml/lambda-term/lambda-term.cma
 lib/ocaml/lambda-term/liblambda-term_stubs.a
 @comment lib/ocaml/stublibs/dlllambda-term_stubs.so.owner
+@man man/man1/lambda-term-actions.1.gz
+@man man/man5/lambda-term-inputrc.5.gz
 share/doc/ocaml-lambda-term/
 share/doc/ocaml-lambda-term/CHANGES
 share/doc/ocaml-lambda-term/LICENSE
 share/doc/ocaml-lambda-term/api/type_LTerm_widget.vline.html
 share/doc/ocaml-lambda-term/api/type_LTerm_windows.html
 share/doc/ocaml-lambda-term/lambda-term-inputrc
-share/man/
-share/man/man1/
-@man share/man/man1/lambda-term-actions.1.gz
-share/man/man5/
-@man share/man/man5/lambda-term-inputrc.5.gz

devel/spidermonkey/CVS/Entries

 /distinfo/1.1.1.1/Sat Apr  7 13:48:18 2012//
 D/patches////
 D/pkg////
-/Makefile/1.3/Sun Jul  8 11:03:36 2012//
+/Makefile/1.4/Tue Aug 21 11:09:37 2012//

devel/spidermonkey/Makefile

-# $OpenBSD: Makefile,v 1.3 2012/07/07 22:46:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2012/08/20 12:51:55 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
 DISTNAME =		js185-1.0.0
 PKGNAME =		spidermonkey-${MOZILLA_VERSION}
 PKGSPEC =		spidermonkey->=1.8,<1.9
-REVISION =		1
+REVISION =		2
 
 SO_VERSION =	0.0
 SHARED_LIBS =	mozjs185 ${SO_VERSION}
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+WANTLIB += c m pthread readline nspr4 ncurses plc4 plds4 stdc++
+
 .if ${MACHINE_ARCH} == "i386"
 PKG_ARGS+=	-Djit=1 -Damd64=0
 .elif ${MACHINE_ARCH} == "amd64"
 REGRESS_DEPENDS = ${MODPY_RUN_DEPENDS}
 BUILD_DEPENDS =	archivers/zip
 LIB_DEPENDS =	devel/nspr
-WANTLIB =	c m pthread readline nspr4 ncurses plc4 plds4 stdc++
+
+MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/ctypes/libffi
 
 SUBST_VARS +=	MOZILLA_VERSION
 
 WRKDIST =	${WRKDIR}/js-${MOZILLA_VERSION}/js/src
 USE_GMAKE =	yes
 CONFIGURE_STYLE =	autoconf no-autoheader
-CONFIGURE_ARGS =	--with-pthread \
+CONFIGURE_ARGS =	--with-pthreads \
 			--with-system-nspr \
 			--enable-readline \
 			--enable-ctypes \

editors/xwpe/patches/CVS/Entries

 /patch-Makefile_in/1.1/Mon Jan  2 23:39:31 2012//
 /patch-configure/1.2/Mon Jan  2 23:39:31 2012//
 /patch-we_fl_unix_c/1.2/Mon Jan  2 23:39:31 2012//
-/patch-edit_h/1.1/Sat Aug 11 22:51:13 2012//
 D

editors/xwpe/patches/patch-edit_h

-$OpenBSD: patch-edit_h,v 1.1 2012/08/11 22:51:13 pascal Exp $
---- edit.h.orig	Sat Aug 11 16:37:09 2012
-+++ edit.h	Sat Aug 11 16:37:26 2012
-@@ -65,6 +65,10 @@ struct mouse {
- #define DTMD_ISTEXT(x)     (x > 'Z')
- #define DTMD_ISMARKABLE(x) (x > DTMD_HELP) /* Means end marks can be shown*/
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
-+
- struct dirfile {
-  int anz;      /* number elements in the list */
-  char **name;  /* the list elements */

emulators/dosbox/CVS/Entries

 D/pkg////
 /Makefile/1.21/Mon Jan  2 23:39:34 2012//
 /distinfo/1.9/Mon Jan  2 23:39:34 2012//
-D/patches////

emulators/dosbox/patches/CVS/Entries

-/patch-src_hardware_pic_cpp/1.1/Sat Aug 11 22:51:13 2012//
-D

emulators/dosbox/patches/CVS/Repository

-ports/emulators/dosbox/patches

emulators/dosbox/patches/CVS/Root

-/home/jtr2/openbsd/mirror

emulators/dosbox/patches/patch-src_hardware_pic_cpp

-$OpenBSD: patch-src_hardware_pic_cpp,v 1.1 2012/08/11 22:51:13 pascal Exp $
---- src/hardware/pic.cpp.orig	Mon May 10 19:43:54 2010
-+++ src/hardware/pic.cpp	Fri Aug 10 18:55:18 2012
-@@ -540,6 +540,9 @@ void TIMER_AddTick(void) {
- 	}
- }
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
- 
- class PIC:public Module_base{
- private:

emulators/spim/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.21/Mon Jan  2 23:39:39 2012//
-/distinfo/1.10/Mon Jan  2 23:39:39 2012//
+/Makefile/1.22/Tue Aug 21 11:10:15 2012//
+/distinfo/1.11/Tue Aug 21 11:10:15 2012//

emulators/spim/Makefile

-# $OpenBSD: Makefile,v 1.21 2010/11/15 23:22:08 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/20 15:08:44 ajacoutot Exp $
 
 COMMENT=	MIPS R2000/R3000 simulator
 
-DISTNAME=	spim-7.3
-REVISION=	2
+DISTNAME=	spim-8.0
 CATEGORIES=	emulators
 
 HOMEPAGE=	http://www.cs.wisc.edu/~larus/spim.html
 PERMIT_DISTFILES_CDROM= may not sell
 PERMIT_DISTFILES_FTP=   may not bundle with commercial product
 
-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m \
-		pthread-stubs xcb
+WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c m
 
 MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/
 
 
 XMKMF=		xmkmf
 
-FAKE_FLAGS=	PREFIX="${PREFIX}"
+MAKE_FLAGS=	PREFIX="${PREFIX}"
 
-USE_GROFF =	Yes
+NO_REGRESS=	Yes
 
 do-build:
-	(cd ${WRKSRC}/spim; ./Configure && ${MAKE})
-	(cd ${WRKSRC}/xspim; ${XMKMF} && ${MAKE})
+	(cd ${WRKSRC}/spim; ./Configure && ${MAKE_PROGRAM} ${MAKE_FLAGS})
+	(cd ${WRKSRC}/xspim; ${XMKMF} && ${MAKE_PROGRAM} ${MAKE_FLAGS})
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/spim

emulators/spim/distinfo

-MD5 (spim-7.3.tar.gz) = UgAhcJgtFX/YnURbSBvSIw==
-RMD160 (spim-7.3.tar.gz) = +HEWggdV/3YIeIm70POeqsvOIBo=
-SHA1 (spim-7.3.tar.gz) = Ywt168k2UJPhs9DJjKBST3cthkc=
-SHA256 (spim-7.3.tar.gz) = 194GE1xRkQgFWpCr53ztTjbexPfyfOGi/KAFn4bN810=
-SIZE (spim-7.3.tar.gz) = 347226
+SHA256 (spim-8.0.tar.gz) = byBXdsufoRJylQcAiEOyiQEhkO0xMcvUJsYQpYOH7ks=
+SIZE (spim-8.0.tar.gz) = 355204

emulators/spim/patches/CVS/Entries

-/patch-CPU_run_c/1.2/Mon Jan  2 23:39:39 2012//
-/patch-spim_Configure/1.1/Mon Jan  2 23:39:39 2012//
-/patch-spim_Makefile/1.2/Mon Jan  2 23:39:39 2012//
-/patch-xspim_Imakefile/1.2/Mon Jan  2 23:39:39 2012//
-/patch-Documentation_spim_man/1.1/Tue Jan  3 01:13:08 2012//
+/patch-CPU_run_c/1.3/Tue Aug 21 11:10:15 2012//
+/patch-spim_Configure/1.2/Tue Aug 21 11:10:15 2012//
+/patch-spim_Makefile/1.3/Tue Aug 21 11:10:15 2012//
+/patch-xspim_Imakefile/1.3/Tue Aug 21 11:10:16 2012//
 D

emulators/spim/patches/patch-CPU_run_c

-$OpenBSD: patch-CPU_run_c,v 1.2 2010/09/03 16:17:19 sthen Exp $
+$OpenBSD: patch-CPU_run_c,v 1.3 2012/08/20 15:08:45 ajacoutot Exp $
 
 Fix build on OpenBSD's mips architectures.
 
---- CPU/run.c.orig	Wed Aug 25 18:33:09 2010
-+++ CPU/run.c	Wed Aug 25 18:33:38 2010
-@@ -25,7 +25,7 @@
+--- CPU/run.c.orig	Sat Jan  9 06:22:52 2010
++++ CPU/run.c	Mon Aug 20 16:55:19 2012
+@@ -31,7 +31,7 @@
  */
  
  

emulators/spim/patches/patch-Documentation_spim_man

-$OpenBSD: patch-Documentation_spim_man,v 1.1 2005/10/13 09:06:54 kevlo Exp $
---- Documentation/spim.man.orig	Thu Oct 13 15:34:18 2005
-+++ Documentation/spim.man	Thu Oct 13 15:34:21 2005
-@@ -1,5 +1,4 @@
- .\" $Header: /nfs/openbsd/mirror//ports/emulators/spim/patches/patch-Documentation_spim_man,v 1.1 2005/10/13 09:06:54 kevlo Exp $
--
- .TH spim 1
- .SH NAME
- spim \- A MIPS32 Simulator

emulators/spim/patches/patch-spim_Configure

-$OpenBSD: patch-spim_Configure,v 1.1 2005/10/13 09:06:54 kevlo Exp $
---- spim/Configure.orig	Thu Oct 13 15:18:37 2005
-+++ spim/Configure	Thu Oct 13 15:18:54 2005
+$OpenBSD: patch-spim_Configure,v 1.2 2012/08/20 15:08:45 ajacoutot Exp $
+--- spim/Configure.orig	Wed Nov 23 18:20:17 2011
++++ spim/Configure	Wed Nov 23 18:20:32 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
-+#!/usr/bin/env sh
++#!/bin/sh
  #
  # Shell script to configure SPIM.
  #

emulators/spim/patches/patch-spim_Makefile

-$OpenBSD: patch-spim_Makefile,v 1.2 2006/11/09 07:01:47 kevlo Exp $
---- spim/Makefile.orig	Tue Aug 29 02:23:19 2006
-+++ spim/Makefile	Thu Nov  9 12:08:01 2006
-@@ -45,6 +45,8 @@
- CPU_DIR = ../CPU
- VPATH = src:$(CPU_DIR)
+$OpenBSD: patch-spim_Makefile,v 1.3 2012/08/20 15:08:45 ajacoutot Exp $
+--- spim/Makefile.orig	Sat Jan  9 06:22:57 2010
++++ spim/Makefile	Mon Aug 20 16:55:19 2012
+@@ -66,13 +66,13 @@ DOC_DIR = ../Documentation
  
-+PREFIX = /usr/local
-+
- # Path of directory that contains SPIM tests:
- TEST_DIR = ../Tests
  
-@@ -57,10 +59,10 @@ DOC_DIR = ../Documentation
- BIN_DIR = /usr/local/bin
+ # Full path for the directory that will hold the executable files:
+-BIN_DIR = /usr/local/bin
++BIN_DIR = ${PREFIX}/bin
  
  # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib
-+EXCEPTION_DIR = $(PREFIX)/share/spim
+-EXCEPTION_DIR = /usr/local/lib/spim
++EXCEPTION_DIR = ${PREFIX}/share/spim
  
  # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/man/mann
-+MAN_DIR = $(PREFIX)/man/man1
+-MAN_DIR = /usr/local/man/en
++MAN_DIR = ${PREFIX}/man/man1
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -97,7 +99,7 @@ CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g 
+@@ -109,7 +109,7 @@ CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
  YFLAGS = -d --file-prefix=y
  YCFLAGS =
  LDFLAGS = -lm
  
  # lex.yy.c is usually compiled with -O to speed it up.
  
-@@ -174,8 +176,6 @@ clean:
- 	rm -f spim spim.exe *.o TAGS test.out lex.yy.c y.tab.c y.tab.h y.output
- 
- install: spim
--	install -c -s  spim $(BIN_DIR)
--	install -c -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)
- 
- install-man:
- 	install -c -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)

emulators/spim/patches/patch-xspim_Imakefile

-$OpenBSD: patch-xspim_Imakefile,v 1.2 2006/11/09 07:01:47 kevlo Exp $
---- xspim/Imakefile.orig	Tue Aug 29 02:23:19 2006
-+++ xspim/Imakefile	Thu Nov  9 12:11:27 2006
-@@ -36,10 +36,11 @@
- BIN_DIR = /usr/local/bin
+$OpenBSD: patch-xspim_Imakefile,v 1.3 2012/08/20 15:08:45 ajacoutot Exp $
+--- xspim/Imakefile.orig	Sat Jan  9 06:22:58 2010
++++ xspim/Imakefile	Mon Aug 20 16:55:30 2012
+@@ -43,13 +43,13 @@
+ #
+ 
+ # Full path for the directory that will hold the executable files:
+-BIN_DIR = /usr/local/bin
++BIN_DIR = ${PREFIX}/bin
  
  # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib
-+PREFIX = /usr/local
-+EXCEPTION_DIR = $(PREFIX)/share/spim
+-EXCEPTION_DIR = /usr/local/lib/spim
++EXCEPTION_DIR = ${PREFIX}/share/spim
  
  # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/man/mann
-+MAN_DIR = $(PREFIX)/man/man1
+-MAN_DIR = /usr/local/man/en
++MAN_DIR = ${PREFIX}/man/man1
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this

emulators/spim/pkg/CVS/Entries

 /DESCR/1.2/Mon Jan  2 23:39:39 2012//
-/PLIST/1.4/Mon Jan  2 23:39:39 2012//
+/PLIST/1.5/Tue Aug 21 11:10:16 2012//
 D

emulators/spim/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.4 2005/10/13 09:06:55 kevlo Exp $
-bin/spim
-bin/xspim
+@comment $OpenBSD: PLIST,v 1.5 2012/08/20 15:08:45 ajacoutot Exp $
+@bin bin/spim
+@bin bin/xspim
 @man man/man1/spim.1
 @man man/man1/xspim.1
 share/spim/

games/eduke32/patches/CVS/Entries

 /patch-Makefile_common/1.1.1.1/Tue Jul 17 21:29:50 2012//
 /patch-build_Makefile_shared/1.1.1.1/Tue Jul 17 21:29:50 2012//
 /patch-build_src_glbuild_c/1.1.1.1/Tue Jul 17 21:29:50 2012//
+/patch-build_include_compat_h/1.1/Tue Aug 21 00:50:27 2012//
 D

games/eduke32/patches/patch-build_include_compat_h

+$OpenBSD: patch-build_include_compat_h,v 1.1 2012/08/21 00:50:27 rfreeman Exp $
+
+this is committed upstream as of 2012-08-18, fixes build on hppa, ppc
+
+--- build/include/compat.h.orig	Thu Aug  9 04:05:30 2012
++++ build/include/compat.h	Thu Aug  9 04:11:36 2012
+@@ -140,7 +140,20 @@ static inline float nearbyintf(float x) 
+ # endif
+ # define B_ENDIAN_C_INLINE 1
+ 
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__OpenBSD__)
++# include <machine/endian.h>
++# if _BYTE_ORDER == _LITTLE_ENDIAN
++#  define B_LITTLE_ENDIAN 1
++#  define B_BIG_ENDIAN    0
++# elif _BYTE_ORDER == _BIG_ENDIAN
++#  define B_LITTLE_ENDIAN 0
++#  define B_BIG_ENDIAN    1
++# endif
++# define B_SWAP64(x) __swap64(x)
++# define B_SWAP32(x) __swap32(x)
++# define B_SWAP16(x) __swap16(x)
++
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ # include <sys/endian.h>
+ # if _BYTE_ORDER == _LITTLE_ENDIAN
+ #  define B_LITTLE_ENDIAN 1

games/widelands/patches/CVS/Entries

 /patch-build_scons-tools_scons_configure_py/1.1.1.1/Mon Jan  2 23:40:23 2012//
 /patch-src_network_system_h/1.1.1.1/Mon Jan  2 23:40:23 2012//
 /patch-src_ui_ui_basic_ui_progresswindow_cc/1.1.1.1/Mon Jan  2 23:40:23 2012//
-/patch-src_map_h/1.1/Sat Aug 11 22:51:13 2012//
 D

games/widelands/patches/patch-src_map_h

-$OpenBSD: patch-src_map_h,v 1.1 2012/08/11 22:51:13 pascal Exp $
---- src/map.h.orig	Fri Aug 10 21:31:27 2012
-+++ src/map.h	Fri Aug 10 21:31:46 2012
-@@ -29,6 +29,10 @@
- #include <string>
- #include <vector>
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
-+
- class BaseImmovable;
- class FileRead;
- class Player;

geo/gpstk/CVS/Entries

 D/pkg////
 /Makefile/1.11/Mon Jan  2 23:40:35 2012//
 /distinfo/1.1.1.1/Mon Jan  2 23:40:35 2012//
-D/patches////

geo/gpstk/patches/CVS/Entries

-/patch-apps_positioning_posInterp_cpp/1.1/Sat Aug 11 22:51:13 2012//
-D

geo/gpstk/patches/CVS/Repository

-ports/geo/gpstk/patches

geo/gpstk/patches/CVS/Root

-/home/jtr2/openbsd/mirror

geo/gpstk/patches/patch-apps_positioning_posInterp_cpp

-$OpenBSD: patch-apps_positioning_posInterp_cpp,v 1.1 2012/08/11 22:51:13 pascal Exp $
---- apps/positioning/posInterp.cpp.orig	Fri Aug 10 20:06:27 2012
-+++ apps/positioning/posInterp.cpp	Fri Aug 10 20:06:49 2012
-@@ -49,6 +49,10 @@
- #include <fstream>
- #include <sstream>
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
-+
- using namespace std;
- using namespace gpstk;
- using namespace StringUtils;

graphics/gdk-pixbuf2/CVS/Entries

 D/pkg////
-/Makefile/1.18/Tue Aug  7 11:11:46 2012//
-/distinfo/1.11/Tue Aug  7 11:11:46 2012//
+/Makefile/1.19/Tue Aug 21 11:11:35 2012//
+/distinfo/1.12/Tue Aug 21 11:11:35 2012//

graphics/gdk-pixbuf2/Makefile

-# $OpenBSD: Makefile,v 1.18 2012/08/06 17:56:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2012/08/21 06:46:25 ajacoutot Exp $
 
 COMMENT=	graphic library for gtk+2
 
 GNOME_PROJECT=	gdk-pixbuf
-GNOME_VERSION=	2.26.2
+GNOME_VERSION=	2.26.3
 
 CATEGORIES=	graphics
 

graphics/gdk-pixbuf2/distinfo

-SHA256 (gdk-pixbuf-2.26.2.tar.xz) = NVVSEFDjDi+gkL/mUJEMFGSbarCss1pafq+Q/mlPFAM=
-SIZE (gdk-pixbuf-2.26.2.tar.xz) = 1174968
+SHA256 (gdk-pixbuf-2.26.3.tar.xz) = oiNzpyYhxvc+jCFkEK60bjuwW0d+YAtqxIGkfs1MCcw=
+SIZE (gdk-pixbuf-2.26.3.tar.xz) = 1175376

graphics/gthumb/CVS/Entries

 D/pkg////
-/distinfo/1.18/Tue May 15 11:03:52 2012//
-D/patches////
-/Makefile/1.61/Tue Jul 10 11:04:58 2012//
+/Makefile/1.62/Tue Aug 21 11:11:43 2012//
+/distinfo/1.19/Tue Aug 21 11:11:43 2012//

graphics/gthumb/Makefile

-# $OpenBSD: Makefile,v 1.61 2012/07/10 08:00:28 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.62 2012/08/21 06:50:43 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	image viewer and browser for GNOME
 
 GNOME_PROJECT=	gthumb
-GNOME_VERSION=	3.0.1
-REVISION=	2
+GNOME_VERSION=	3.0.2
 
 CATEGORIES=	graphics
 

graphics/gthumb/distinfo

-MD5 (gthumb-3.0.1.tar.xz) = JItE8vuplwHpGF2aiQxFNw==
-RMD160 (gthumb-3.0.1.tar.xz) = awaEb7b+eYgSoc204c1xjweGM98=
-SHA1 (gthumb-3.0.1.tar.xz) = 1clnNAW9iHQgWHaF/8JSUzvmAoQ=
-SHA256 (gthumb-3.0.1.tar.xz) = H7KTnkiWoBLH0DIKMePGE5IUIY6fbsOcY3D+vtqUclw=
-SIZE (gthumb-3.0.1.tar.xz) = 5783956
+SHA256 (gthumb-3.0.2.tar.xz) = 7syyMQOwDoKUG6eAI/p4QiiqtkS8///GzO933Eeq1Vc=
+SIZE (gthumb-3.0.2.tar.xz) = 5803480

graphics/gthumb/patches/CVS/Entries

-/patch-gthumb_gth-time-selector_c/1.3/Mon May 21 09:42:57 2012//
-D

graphics/gthumb/patches/CVS/Repository

-ports/graphics/gthumb/patches

graphics/gthumb/patches/CVS/Root

-/nfs/openbsd/mirror

graphics/gthumb/patches/patch-gthumb_gth-time-selector_c

-$OpenBSD: patch-gthumb_gth-time-selector_c,v 1.3 2012/05/21 09:42:57 ajacoutot Exp $
-
-From 62005629d834faa5ddc3799c6c43247182b3a814 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Mon, 21 May 2012 06:12:48 +0000
-Subject: build: OpenBSD needs _XOPEN_SOURCE_EXTENDED for strptime(3)
-
---- gthumb/gth-time-selector.c.orig	Sun May 20 15:48:44 2012
-+++ gthumb/gth-time-selector.c	Sun May 20 15:49:00 2012
-@@ -21,6 +21,7 @@
- 
- #include <config.h>
- #define _XOPEN_SOURCE /* glibc2 needs this */
-+#define _XOPEN_SOURCE_EXTENDED 1
- #include <time.h>
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>

graphics/gthumb/pkg/CVS/Entries

 /DESCR/1.4/Mon Jan  2 23:40:54 2012//
-/PLIST/1.22/Fri Jun 15 11:05:47 2012//
+/PLIST/1.23/Tue Aug 21 11:11:43 2012//
 D

graphics/gthumb/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.22 2012/06/15 08:32:16 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.23 2012/08/21 06:50:43 jasper Exp $
 @bin bin/gthumb
 include/gthumb-3.0/
 include/gthumb-3.0/gthumb/
 share/gthumb/contactsheetthemes/minimalist.cst
 share/gthumb/contactsheetthemes/rainbow.cst
 share/gthumb/icons/
+share/gthumb/icons/filmholes.png
 share/gthumb/icons/hicolor/
 share/gthumb/icons/hicolor/16x16/
 share/gthumb/icons/hicolor/16x16/actions/
 share/gthumb/ui/facebook-ask-authorization.ui
 share/gthumb/ui/facebook-complete-authorization.ui
 share/gthumb/ui/facebook-export-completed.ui
-share/gthumb/ui/filmholes.png
 share/gthumb/ui/filter-editor.ui
 share/gthumb/ui/find-duplicates-choose-folders.ui
 share/gthumb/ui/find-duplicates-dialog.ui

graphics/s10sh/patches/CVS/Entries

 /patch-Makefile_in/1.1/Mon Jan  2 23:41:16 2012//
 /patch-README/1.3/Mon Jan  2 23:41:16 2012//
-/patch-bytesex_h/1.1/Mon Jan  2 23:41:16 2012//
 /patch-configure/1.1.1.1/Mon Jan  2 23:41:16 2012//
 /patch-main_c/1.1.1.1/Mon Jan  2 23:41:16 2012//
 /patch-usb_c/1.5/Mon Jan  2 23:41:16 2012//
 /patch-usb_h/1.4/Mon Jan  2 23:41:16 2012//
+/patch-bytesex_h/1.2/Tue Aug 21 11:12:06 2012//
 D

graphics/s10sh/patches/patch-bytesex_h

-$OpenBSD: patch-bytesex_h,v 1.1 2004/03/03 09:01:29 pvalchev Exp $
---- bytesex.h.orig	2001-03-13 06:46:18.000000000 -0700
-+++ bytesex.h	2004-03-03 01:56:33.000000000 -0700
-@@ -4,6 +4,7 @@
+$OpenBSD: patch-bytesex_h,v 1.2 2012/08/21 08:25:03 landry Exp $
+--- bytesex.h.orig	Tue Mar 13 06:46:18 2001
++++ bytesex.h	Tue Aug 21 02:24:11 2012
+@@ -4,10 +4,12 @@
  #define S10SH_BYTESEX_H
  
  #if 	defined(__i386__) \
  	|| defined(__alpha__) \
  	|| (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
  #define BYTE_ORDER_LITTLE_ENDIAN
+ #elif 	defined(__mc68000__) \
++	|| defined (__hppa__) \
+ 	|| defined (__sparc__) \
+ 	|| defined (__sparc) \
+ 	|| defined (__PPC__) \

lang/gcc/3.3/CVS/Entries

 D/pkg////
 /distinfo/1.12/Mon Jan  2 23:41:39 2012//
 /gcc3.port.mk/1.9/Tue Apr 24 11:04:15 2012//
-/Makefile/1.59/Fri Jun 22 11:04:29 2012//
+/Makefile/1.60/Tue Aug 21 11:12:47 2012//

lang/gcc/3.3/Makefile

-# $OpenBSD: Makefile,v 1.59 2012/06/21 13:56:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.60 2012/08/20 12:35:41 pascal Exp $
 
 ONLY_FOR_ARCHS =	alpha amd64 i386 m68k sparc sparc64 powerpc vax
 
 		objc		2.0 \
 		objc_gc		2.0
 
-REVISION-main =		3
-REVISION-c++ =		5
+REVISION-main =		4
+REVISION-c++ =		6
 REVISION-estdc =	2
-REVISION-g77 =		4
-REVISION-java =		4
-REVISION-objc =		4
-REVISION-ada =		4
+REVISION-g77 =		5
+REVISION-java =		5
+REVISION-objc =		5
+REVISION-ada =		5
 EPOCH = 		0
 
 MAINTAINER =	Marc Espie <espie@openbsd.org>

lang/gcc/3.3/patches/CVS/Entries

 /patch-gcc_config_mips_openbsd_h/1.1.1.1/Mon Jan  2 23:41:40 2012//
 /patch-gcc_config_mips_t-openbsd64/1.1.1.1/Mon Jan  2 23:41:40 2012//
 /patch-gcc_config_openbsd-libc_r_h/1.1.1.1/Mon Jan  2 23:41:40 2012//
-/patch-gcc_config_openbsd-libpthread_h/1.1.1.1/Mon Jan  2 23:41:40 2012//
 /patch-gcc_config_pa_openbsd_h/1.2/Mon Jan  2 23:41:40 2012//
 /patch-gcc_config_pa_pa_c/1.1.1.1/Mon Jan  2 23:41:40 2012//
 /patch-gcc_config_pa_t-openbsd/1.1.1.1/Mon Jan  2 23:41:40 2012//
 /patch-gcc_config_m88k_openbsd_h/1.2/Tue Apr 24 11:04:16 2012//
 /patch-gcc_config_openbsd_h/1.2/Tue Apr 24 11:04:16 2012//
 /patch-gcc_cp_Make-lang_in/1.2/Tue Apr 24 11:04:16 2012//
+/patch-gcc_config_openbsd-libpthread_h/1.2/Tue Aug 21 11:12:48 2012//
 D

lang/gcc/3.3/patches/patch-gcc_config_openbsd-libpthread_h

-$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1.1.1 2005/01/03 15:21:27 espie Exp $
---- gcc/config/openbsd-libpthread.h.orig	Mon Jan  3 10:17:43 2005
-+++ gcc/config/openbsd-libpthread.h	Mon Jan  3 10:17:43 2005
+$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.2 2012/08/20 12:35:41 pascal Exp $
+--- gcc/config/openbsd-libpthread.h.orig	Thu Aug 16 03:08:41 2012
++++ gcc/config/openbsd-libpthread.h	Thu Aug 16 03:09:49 2012
 @@ -0,0 +1,23 @@
 +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
 +   specified on the command line. */
 +the Free Software Foundation, 59 Temple Place - Suite 330,
 +Boston, MA 02111-1307, USA.  */
 +
-+#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p}}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"
 +

lang/gcc/4.2/CVS/Entries

 D/pkg////
 /gcc4.port.mk/1.15/Tue Jan  3 00:43:46 2012//
 /distinfo/1.13/Tue Jan 24 12:04:54 2012//
-/Makefile/1.79/Fri Jun 22 11:04:30 2012//
+/Makefile/1.80/Tue Aug 21 11:12:49 2012//

lang/gcc/4.2/Makefile

-# $OpenBSD: Makefile,v 1.79 2012/06/21 13:56:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.80 2012/08/20 12:35:41 pascal Exp $
 
 ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
 #BROKEN=adjust for types changes
 PKGNAME-objc =  gobjc-${FULL_PKGVERSION}
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 
-REVISION-main = 9
-REVISION-c++ = 13
+REVISION-main = 10
+REVISION-c++ = 14
 REVISION-estdc = 3
-REVISION-f95 = 11
-REVISION-java = 11
-REVISION-objc = 10
-REVISION-ada = 9
+REVISION-f95 = 12
+REVISION-java = 12
+REVISION-objc = 11
+REVISION-ada = 10
 EPOCH = 0
 
 SHARED_LIBS =	estdc++		13.0 \

lang/gcc/4.2/patches/CVS/Entries

 /patch-gcc_config_i386_openbsdelf_h/1.4/Tue Jan  3 00:43:47 2012//
 /patch-gcc_config_m68k_openbsd_h/1.4/Mon Jan  2 23:41:43 2012//
 /patch-gcc_config_mips_openbsd_h/1.2/Mon Jan  2 23:41:43 2012//
-/patch-gcc_config_openbsd-libpthread_h/1.1/Mon Jan  2 23:41:43 2012//
 /patch-gcc_config_rs6000_openbsd1_h/1.1/Mon Jan  2 23:41:43 2012//
 /patch-gcc_config_rs6000_openbsd_h/1.1/Mon Jan  2 23:41:43 2012//
 /patch-gcc_config_rs6000_t-openbsd/1.1/Mon Jan  2 23:41:43 2012//
 /patch-gcc_config_openbsd_h/1.4/Tue Apr 24 11:04:17 2012//
 /patch-gcc_config_rs6000_sysv4_h/1.1/Mon Apr 23 14:12:19 2012//
 /patch-boehm-gc_pthread_support_c/1.2/Tue May  8 11:03:51 2012//
+/patch-gcc_config_openbsd-libpthread_h/1.2/Tue Aug 21 11:12:49 2012//
 D

lang/gcc/4.2/patches/patch-gcc_config_openbsd-libpthread_h

-$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2006/10/20 13:43:18 espie Exp $
---- gcc/config/openbsd-libpthread.h.orig	Wed Oct 18 13:46:36 2006
-+++ gcc/config/openbsd-libpthread.h	Wed Oct 18 13:46:50 2006
+$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.2 2012/08/20 12:35:41 pascal Exp $
+--- gcc/config/openbsd-libpthread.h.orig	Thu Aug 16 03:15:26 2012
++++ gcc/config/openbsd-libpthread.h	Thu Aug 16 03:16:44 2012
 @@ -0,0 +1,23 @@
 +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
 +   specified on the command line. */
 +the Free Software Foundation, 59 Temple Place - Suite 330,
 +Boston, MA 02111-1307, USA.  */
 +
-+#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"
 +

lang/gcc/4.6/CVS/Entries

 /distinfo/1.5/Sun Apr  1 11:05:24 2012//
 /TODO/1.7/Mon Apr  2 11:05:17 2012//
 /gcc4.port.mk/1.9/Thu Apr 19 11:04:06 2012//
-/Makefile/1.28/Mon Jul  2 11:04:09 2012//
+/Makefile/1.29/Tue Aug 21 11:12:50 2012//

lang/gcc/4.6/Makefile

-# $OpenBSD: Makefile,v 1.28 2012/07/01 18:28:40 pascal Exp $
+# $OpenBSD: Makefile,v 1.29 2012/08/20 12:35:41 pascal Exp $
 
 ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
 
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 PKGNAME-go =	gccgo-${FULL_PKGVERSION}
 
-REVISION-main = 3
-REVISION-c++ = 6
+REVISION-main = 4
+REVISION-c++ = 7
 REVISION-estdc = 3
-REVISION-f95 = 3
-REVISION-java = 4
-REVISION-objc = 3
-REVISION-ada = 3
-REVISION-go = 3
+REVISION-f95 = 4
+REVISION-java = 5
+REVISION-objc = 4
+REVISION-ada = 4
+REVISION-go = 4
 
 SHARED_LIBS =	estdc++		14.0 \
 		gfortran	3.0 \

lang/gcc/4.6/patches/CVS/Entries

 /patch-gcc_config_rs6000_sysv4_h/1.3/Tue Apr 24 11:04:18 2012//
 /patch-boehm-gc_pthread_support_c/1.2/Tue May  8 11:03:51 2012//
 /patch-libstdc++-v3_include_std_mutex/1.1/Mon May 14 23:39:39 2012//
+/patch-gcc_config_openbsd-libpthread_h/1.3/Mon Aug 20 12:35:41 2012//
 D

lang/gcc/4.6/patches/patch-gcc_config_openbsd-libpthread_h

+$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.3 2012/08/20 12:35:41 pascal Exp $
+--- gcc/config/openbsd-libpthread.h.orig	Thu Aug 16 03:22:15 2012
++++ gcc/config/openbsd-libpthread.h	Thu Aug 16 03:22:55 2012
+@@ -18,5 +18,5 @@
+    along with GCC; see the file COPYING3.  If not see
+    <http://www.gnu.org/licenses/>.  */
+ 
+-#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"
+ 

lang/gcc/4.7/CVS/Entries

 D/patches////
 D/pkg////
 /distinfo/1.2/Mon Jul  2 11:04:10 2012//
-/Makefile/1.9/Sun Jul 15 11:04:39 2012//
+/Makefile/1.10/Tue Aug 21 11:12:50 2012//

lang/gcc/4.7/Makefile

-# $OpenBSD: Makefile,v 1.9 2012/07/15 08:56:26 pascal Exp $
+# $OpenBSD: Makefile,v 1.10 2012/08/20 12:35:41 pascal Exp $
 
 ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
 
 #PKGNAME-go =	gccgo-${FULL_PKGVERSION}
 PKGSPEC-main = gcc->=4.7,<4.8
 
+REVISION-main =	0
+REVISION-c++ =	0
+REVISION-estdc = 0
+REVISION-f95 =	0
+REVISION-objc = 0
+REVISION-ada =	0
+
 SHARED_LIBS =	estdc++		15.0 \
 		gfortran	4.0 \
 		gcj		2.0 \

lang/gcc/4.7/patches/CVS/Entries

 /patch-libstdc++-v3_src_Makefile_in/1.2/Mon Jul  2 11:04:10 2012//
 /patch-gcc_config_gcc/1.3/Mon Aug 20 11:12:44 2012//
 /patch-gcc_config_rs6000_openbsd_h/1.2/Mon Aug 20 11:12:44 2012//
+/patch-gcc_config_openbsd-libpthread_h/1.1/Mon Aug 20 12:35:41 2012//
 D

lang/gcc/4.7/patches/patch-gcc_config_openbsd-libpthread_h

+$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2012/08/20 12:35:41 pascal Exp $
+--- gcc/config/openbsd-libpthread.h.orig	Thu Aug 16 03:30:37 2012
++++ gcc/config/openbsd-libpthread.h	Thu Aug 16 03:30:49 2012
+@@ -18,5 +18,5 @@
+    along with GCC; see the file COPYING3.  If not see
+    <http://www.gnu.org/licenses/>.  */
+ 
+-#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"
+ 

lang/ghc/patches/CVS/Entries

 /patch-testsuite_tests_ghc-regress_codeGen_should_run_all_T/1.1/Mon Jan  2 23:41:46 2012//
 /patch-libraries_unix_cbits_execvpe_c/1.1/Fri Mar 23 20:17:06 2012//
 /patch-libraries_unix_include_execvpe_h/1.1/Fri Mar 23 20:17:06 2012//
-/patch-compiler_nativeGen_AsmCodeGen_lhs/1.1/Sun Aug 12 11:31:33 2012//
-/patch-compiler_nativeGen_PIC_hs/1.1/Sun Aug 12 11:31:33 2012//
-/patch-compiler_nativeGen_PPC_CodeGen_hs/1.1/Sun Aug 12 11:31:33 2012//
-/patch-compiler_nativeGen_SPARC_CodeGen_CCall_hs/1.1/Sun Aug 12 11:31:33 2012//
-/patch-compiler_nativeGen_X86_CodeGen_hs/1.1/Sun Aug 12 11:31:33 2012//
 /patch-configure/1.10/Sun Aug 12 11:31:33 2012//
 /patch-extra-gcc-opts_in/1.1/Sun Aug 12 11:31:33 2012//
 D

lang/ghc/patches/patch-compiler_nativeGen_AsmCodeGen_lhs

-$OpenBSD: patch-compiler_nativeGen_AsmCodeGen_lhs,v 1.1 2012/08/12 11:31:33 pascal Exp $
---- compiler/nativeGen/AsmCodeGen.lhs.orig	Sat Aug 11 22:00:05 2012
-+++ compiler/nativeGen/AsmCodeGen.lhs	Sat Aug 11 22:00:20 2012
-@@ -19,6 +19,9 @@ module AsmCodeGen ( nativeCodeGen ) where
- #include "HsVersions.h"
- #include "nativeGen/NCG.h"
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
- 
- #if   alpha_TARGET_ARCH
- import Alpha.CodeGen

lang/ghc/patches/patch-compiler_nativeGen_PIC_hs

-$OpenBSD: patch-compiler_nativeGen_PIC_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
---- compiler/nativeGen/PIC.hs.orig	Sat Aug 11 22:00:37 2012
-+++ compiler/nativeGen/PIC.hs	Sat Aug 11 22:00:55 2012
-@@ -38,6 +38,10 @@
-       and ppc-linux).
- -}
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
-+
- module PIC (
-         cmmMakeDynamicReference,
-         ReferenceKind(..),

lang/ghc/patches/patch-compiler_nativeGen_PPC_CodeGen_hs

-$OpenBSD: patch-compiler_nativeGen_PPC_CodeGen_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
---- compiler/nativeGen/PPC/CodeGen.hs.orig	Sat Aug 11 22:01:50 2012
-+++ compiler/nativeGen/PPC/CodeGen.hs	Sat Aug 11 22:02:13 2012
-@@ -24,6 +24,10 @@ where
- #include "nativeGen/NCG.h"
- #include "../includes/MachDeps.h"
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
-+
- -- NCG stuff:
- import PPC.Instr
- import PPC.Cond

lang/ghc/patches/patch-compiler_nativeGen_SPARC_CodeGen_CCall_hs

-$OpenBSD: patch-compiler_nativeGen_SPARC_CodeGen_CCall_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
---- compiler/nativeGen/SPARC/CodeGen/CCall.hs.orig	Sat Aug 11 22:02:33 2012
-+++ compiler/nativeGen/SPARC/CodeGen/CCall.hs	Sat Aug 11 22:02:48 2012
-@@ -5,6 +5,10 @@ module SPARC.CodeGen.CCall (
- 
- where
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
-+
- import SPARC.CodeGen.Gen64
- import SPARC.CodeGen.Gen32
- import SPARC.CodeGen.Base

lang/ghc/patches/patch-compiler_nativeGen_X86_CodeGen_hs

-$OpenBSD: patch-compiler_nativeGen_X86_CodeGen_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
---- compiler/nativeGen/X86/CodeGen.hs.orig	Sat Aug 11 22:01:14 2012
-+++ compiler/nativeGen/X86/CodeGen.hs	Sat Aug 11 22:01:31 2012
-@@ -29,6 +29,10 @@ where
- #include "nativeGen/NCG.h"
- #include "../includes/MachDeps.h"
- 
-+#ifdef PIC
-+#undef PIC
-+#endif
-+
- -- NCG stuff:
- import X86.Instr
- import X86.Cond

lang/ocaml/CVS/Entries

 D/pkg////
 /Makefile/1.56/Sun Aug 19 11:13:30 2012//
 /distinfo/1.16/Sun Aug 19 11:13:30 2012//
-/ocaml.port.mk/1.18/Sun Aug 19 11:13:30 2012//
+/ocaml.port.mk/1.19/Tue Aug 21 11:13:00 2012//

lang/ocaml/ocaml.port.mk

-# $OpenBSD: ocaml.port.mk,v 1.18 2012/08/18 21:49:16 avsm Exp $
+# $OpenBSD: ocaml.port.mk,v 1.19 2012/08/21 00:24:22 avsm Exp $
 
 # regular file usage for bytecode:
 # PLIST               -- bytecode base files
 	rm setup.cm[io] && \
 	${SETENV} ${CONFIGURE_ENV} ${_MODOASIS_SETUP} -configure \
 	--destdir ${WRKINST} \
+	--mandir ${PREFIX}/man \
+	--infodir ${PREFIX}/info \
 	--override pkg_name ${NAME} \
 	${CONFIGURE_ARGS}
 

mail/milter-checkrcpt/CVS/Entries

 D/pkg////
-/Makefile/1.1.1.1/Mon Jan  2 23:42:19 2012//
-/distinfo/1.1.1.1/Mon Jan  2 23:42:19 2012//
+/Makefile/1.2/Tue Aug 21 11:13:36 2012//
+/distinfo/1.2/Tue Aug 21 11:13:36 2012//

mail/milter-checkrcpt/Makefile

-# $OpenBSD: Makefile,v 1.1.1.1 2011/07/11 12:12:53 okan Exp $
+# $OpenBSD: Makefile,v 1.2 2012/08/20 20:55:01 okan Exp $
 
 COMMENT=	sendmail milter plugin for recipient checking
 
-DISTNAME=	milter-checkrcpt-0.1
+DISTNAME=	milter-checkrcpt-0.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 

mail/milter-checkrcpt/distinfo

-MD5 (milter-checkrcpt-0.1.tar.gz) = 58N/LpaeWWJ94hMoHKnDcQ==
-RMD160 (milter-checkrcpt-0.1.tar.gz) = +CCAyWSSuxJXyO40RWcZ2KQWUjI=
-SHA1 (milter-checkrcpt-0.1.tar.gz) = kg6JlBtcPCbBTJlTLTeX6RtbHVk=
-SHA256 (milter-checkrcpt-0.1.tar.gz) = EEG+lJ+bi4CbpR2GTq9jjg3QKujuS/7gSpR7FwucBxM=
-SIZE (milter-checkrcpt-0.1.tar.gz) = 7396
+SHA256 (milter-checkrcpt-0.3.tar.gz) = yTKgeVy8BEe2FEv7ktnc2tto3A5QENvgn7P3AcUZoqI=
+SIZE (milter-checkrcpt-0.3.tar.gz) = 7488
 D/p5-Math-Random-ISAAC////
 D/lpsolve////
 D/py-sympy////
-/Makefile/1.110/Sat Aug 18 11:14:38 2012//
+/Makefile/1.111/Tue Aug 21 11:14:06 2012//
+D/geogebra////
-# $OpenBSD: Makefile,v 1.110 2012/08/18 07:25:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.111 2012/08/21 07:18:45 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += R
      SUBDIR += fftw3,float
      SUBDIR += freemat
      SUBDIR += galculator
+     SUBDIR += geogebra
      SUBDIR += ginac
      SUBDIR += gnumeric
      SUBDIR += gnuplot

math/geogebra/CVS/Entries

+/Makefile/1.1.1.1/Tue Aug 21 07:18:17 2012//
+/distinfo/1.1.1.1/Tue Aug 21 07:18:17 2012//
+D/patches////
+D/pkg////

math/geogebra/CVS/Repository

+ports/math/geogebra

math/geogebra/CVS/Root

+/home/jtr2/openbsd/mirror

math/geogebra/Makefile

+# $OpenBSD: Makefile,v 1.1.1.1 2012/08/21 07:18:17 ajacoutot Exp $
+
+COMMENT=	educational mathematical software
+
+V=		4.0.38.0
+DISTNAME=	GeoGebra-Unixlike-Installer-${V}
+PKGNAME=	geogebra-${V}
+
+CATEGORIES=	math java
+
+HOMEPAGE=	http://www.geogebra.org
+
+# GeoGebra Source: GPLv3
+# Language Files and Documentation:
+#   Creative Commons Attribution-Share Alike 3.0
+# See: http://www.geogebra.org/download/license.txt
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=		http://geogebra.googlecode.com/files/
+
+MODULES=		java
+MODJAVA_VER=		1.7+
+MODJAVA_JRERUN=		Yes
+
+RUN_DEPENDS=		java/javaPathHelper \
+			devel/desktop-file-utils \
+			misc/shared-mime-info \
+			x11/gtk+2,-guic
+
+NO_BUILD=		Yes
+NO_REGRESS=		Yes
+PKG_ARCH=		*
+WRKDIST=		${WRKDIR}/geogebra-${V}
+
+pre-configure:
+	perl -pi -e 's,/usr,${WRKINST}${TRUEPREFIX},g' ${WRKSRC}/install.sh
+	perl -pi -e 's,/usr,${TRUEPREFIX},g' ${WRKSRC}/geogebra.desktop
+	${SUBST_CMD} ${WRKSRC}/geogebra
+
+do-install:
+	mkdir -p ${PREFIX}/share/mime/packages
+	mkdir -p ${PREFIX}/share/applications
+	cd ${WRKBUILD} && ./install.sh
+	gzip -d ${PREFIX}/share/icons/hicolor/scalable/apps/geogebra.svgz \
+		 -o ${PREFIX}/share/icons/hicolor/scalable/apps/geogebra.svg
+	gzip -d ${PREFIX}/share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.file.svgz \
+		-o ${PREFIX}/share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.file.svg
+	gzip -d ${PREFIX}/share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.tool.svgz \
+		-o ${PREFIX}/share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.tool.svg
+
+.include <bsd.port.mk>

math/geogebra/distinfo

+SHA256 (GeoGebra-Unixlike-Installer-4.0.38.0.tar.gz) = jvWKF8/Wb/ntGK+iJzj2aY4N9cd02bCaCfutC7RLOmM=
+SIZE (GeoGebra-Unixlike-Installer-4.0.38.0.tar.gz) = 14868843

math/geogebra/patches/CVS/Entries

+/patch-geogebra-4_0_38_0_geogebra/1.1.1.1/Tue Aug 21 07:18:17 2012//
+D

math/geogebra/patches/CVS/Repository

+ports/math/geogebra/patches

math/geogebra/patches/CVS/Root

+/home/jtr2/openbsd/mirror

math/geogebra/patches/patch-geogebra-4_0_38_0_geogebra

+$OpenBSD: patch-geogebra-4_0_38_0_geogebra,v 1.1.1.1 2012/08/21 07:18:17 ajacoutot Exp $
+--- geogebra.orig	Sat Jul 14 10:33:41 2012
++++ geogebra	Mon Aug 20 12:33:10 2012
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #---------------------------------------------
+ # Script to start GeoGebra
+ #---------------------------------------------
+@@ -9,13 +9,13 @@
+ # GG_SCRIPTNAME=<name of originally called script to start GeoGebra> # If unset, name of this script will be used
+ #
+ # GG_PATH=<path of directory containing geogebra.jar> # If unset, path of this script will be used.
+-# In this case if the path of script does not contain the geogebra.jar file, /usr/share/geogebra will be used.
++# In this case if the path of script does not contain the geogebra.jar file, ${TRUEPREFIX}/share/geogebra will be used.
+ #
+ # JAVACMD=<Java command> # If unset, java will be used
+ #
+ # GG_XMS=<initial Java heap size> # If unset, 32m will be used.
+ #
+-# GG_XMX=<maximum Java heap size> # If unset, 512m will be used.
++# GG_XMX=<maximum Java heap size> # If unset, 256m will be used.
+ #
+ # GG_DJAVA_LIBRARY_PATH=<native library path>
+ 
+@@ -34,24 +34,23 @@ if [ -z "$GG_XMS" ]; then
+ fi
+ 
+ #---------------------------------------------
+-# If GG_XMX not set, set to 512m
++# If GG_XMX not set, set to 256m
+ 
+ if [ -z "$GG_XMX" ]; then
+-	GG_XMX='512m'
++	GG_XMX='256m'
+ fi
+ 
+ #---------------------------------------------
+ # Set Java default options
+ 
+-JAVA_OPTS=("-Xms$GG_XMS" "-Xmx$GG_XMX")
+ if [ -n "$GG_DJAVA_LIBRARY_PATH" ]; then
+-	JAVA_OPTS[${#JAVA_OPTS[*]}]="-Djava.library.path=$GG_DJAVA_LIBRARY_PATH"
++	JAVA_OPTS="-Djava.library.path=$GG_DJAVA_LIBRARY_PATH"
+ fi
+ 
+ #---------------------------------------------
+ # Set GeoGebra default options
+ 
+-GG_OPTS=()
++GG_OPTS=""
+ 
+ #---------------------------------------------
+ # Define usage function
+@@ -93,7 +92,7 @@ _USAGE
+ # If JAVACMD not set, use java
+ 
+ if [ -z "$JAVACMD" ]; then
+-	JAVACMD='java'
++	JAVACMD=`javaPathHelper -c geogebra`
+ fi
+ 
+ #---------------------------------------------
+@@ -104,10 +103,10 @@ for i in "$@"; do
+ 	--help | --hel | --he | --h )
+ 		func_usage; exit 0 ;;
+ 	esac
+-	if [ $(expr match "$i" '.*--') -ne 0 ]; then
++	if [ $(expr -- "$i" : '.*--') -ne 0 ]; then
+ 		GG_OPTS[${#GG_OPTS[*]}]="$i"
+ 		shift $((1))
+-	elif [ $(expr match "$i" '.*-Xms') -ne 0 -o $(expr match "$i" '.*-Xmx') -ne 0  -o $(expr match "$i" '.*-Djava.library.path') -ne 0 ]; then
++	elif [ $(expr -- "$i" : '.*-Xms') -ne 0 -o $(expr -- "$i" : '.*-Xmx') -ne 0  -o $(expr -- "$i" : '.*-Djava.library.path') -ne 0 ]; then
+ 		JAVA_OPTS[${#JAVA_OPTS[*]}]="$i"
+ 		shift $((1))
+ 	fi
+@@ -117,20 +116,10 @@ done
+ # If GG_PATH not set, use path of this script
+ 
+ if [ -z "$GG_PATH" ]; then
+-	GG_PATH="${BASH_SOURCE[0]}"
+-	if [ -h "${GG_PATH}" ]; then
+-		while [ -h "${GG_PATH}" ]; do
+-			GG_PATH=`readlink "${GG_PATH}"`
+-		done
+-	fi
+-	pushd . > /dev/null
+-	cd `dirname ${GG_PATH}` > /dev/null
+-	GG_PATH=`pwd`
+-	popd > /dev/null
+-	test -r "${GG_PATH}/geogebra.jar" || GG_PATH='/usr/share/geogebra'
++	GG_PATH='${TRUEPREFIX}/share/geogebra'
+ fi
+ 
+ #---------------------------------------------
+ # Run
+ 
+-exec "$JAVACMD" "${JAVA_OPTS[@]}" -jar "$GG_PATH/geogebra.jar" "${GG_OPTS[@]}" "$@"
++exec "$JAVACMD" "-Xms$GG_XMS" "-Xmx$GG_XMX" "${JAVA_OPTS[@]}" -jar "$GG_PATH/geogebra.jar" "${GG_OPTS[@]}" "$@"

math/geogebra/pkg/CVS/Entries

+/DESCR/1.1.1.1/Tue Aug 21 07:18:17 2012//
+/PLIST/1.1.1.1/Tue Aug 21 07:18:17 2012//
+D

math/geogebra/pkg/CVS/Repository

+ports/math/geogebra/pkg

math/geogebra/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

math/geogebra/pkg/DESCR

+GeoGebra is free and multi-platform dynamic mathematics software for
+learning and teaching. It has received several educational software
+awards in Europe and the USA.

math/geogebra/pkg/PLIST

+@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/21 07:18:17 ajacoutot Exp $
+bin/geogebra
+share/applications/geogebra.desktop
+share/geogebra/
+share/geogebra/geogebra.jar
+share/geogebra/geogebra_algos.jar
+share/geogebra/geogebra_cas.jar
+share/geogebra/geogebra_export.jar
+share/geogebra/geogebra_gui.jar
+share/geogebra/geogebra_javascript.jar
+share/geogebra/geogebra_main.jar
+share/geogebra/geogebra_properties.jar
+share/geogebra/jlatexmath.jar
+share/geogebra/jlm_cyrillic.jar
+share/geogebra/jlm_greek.jar
+share/geogebra/unsigned/
+share/geogebra/unsigned/geogebra.jar
+share/geogebra/unsigned/geogebra_algos.jar
+share/geogebra/unsigned/geogebra_cas.jar
+share/geogebra/unsigned/geogebra_export.jar
+share/geogebra/unsigned/geogebra_gui.jar
+share/geogebra/unsigned/geogebra_javascript.jar
+share/geogebra/unsigned/geogebra_main.jar
+share/geogebra/unsigned/geogebra_properties.jar
+share/geogebra/unsigned/jlatexmath.jar
+share/geogebra/unsigned/jlm_cyrillic.jar
+share/geogebra/unsigned/jlm_greek.jar
+share/icons/hicolor/128x128/apps/geogebra.png
+share/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/16x16/apps/geogebra.png
+share/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/192x192/apps/geogebra.png
+share/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/22x22/apps/geogebra.png
+share/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/24x24/apps/geogebra.png
+share/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/256x256/apps/geogebra.png
+share/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/32x32/apps/geogebra.png
+share/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/36x36/apps/geogebra.png
+share/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/48x48/apps/geogebra.png
+share/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/64x64/apps/geogebra.png
+share/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/72x72/apps/geogebra.png
+share/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/96x96/apps/geogebra.png
+share/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.file.png
+share/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.tool.png
+share/icons/hicolor/scalable/apps/geogebra.svg
+share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.file.svg
+share/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.tool.svg
+share/mime/packages/geogebra.xml
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/update-mime-database %D/share/mime
+@unexec-delete %D/bin/update-mime-database %D/share/mime
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database

multimedia/avidemux/patches/CVS/Entries

 /patch-configure_in_bot/1.1/Mon Jan  2 23:43:19 2012//
 /patch-avidemux_ADM_script_ADM_JSFunctions_cpp/1.4/Sun Apr 15 11:37:41 2012//
 /patch-configure_in_in/1.8/Sat May  5 11:04:45 2012//
-/patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c/1.2/Sun Aug 12 11:14:28 2012//
-/patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp/1.1/Sat Aug 11 22:58:18 2012//
-/patch-avidemux_ADM_videoFilter_ADM_vidBlend_cpp/1.1/Sat Aug 11 22:58:18 2012//
-/patch-avidemux_ADM_videoFilter_ADM_vidDeintASM_cpp/1.1/Sat Aug 11 22:58:18 2012//
-/patch-avidemux_ADM_videoFilter_ADM_vidFields_cpp/1.1/Sat Aug 11 22:58:18 2012//
-/patch-avidemux_ADM_videoFilter_ADM_vidFlux_cpp/1.1/Sat Aug 11 22:58:18 2012//
-/patch-avidemux_ADM_videoFilter_ADM_vidResampleFPS_cpp/1.1/Sat Aug 11 22:58:18 2012//
-/patch-avidemux_ADM_video_ADM_interlaced_cpp/1.1/Sat Aug 11 22:58:18 2012//
+/patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c/1.3/Tue Aug 21 11:15:00 2012//
+/patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp/1.2/Tue Aug 21 11:15:01 2012//
+/patch-avidemux_ADM_videoFilter_ADM_vidBlend_cpp/1.2/Tue Aug 21 11:15:01 2012//
+/patch-avidemux_ADM_videoFilter_ADM_vidDeintASM_cpp/1.2/Tue Aug 21 11:15:01 2012//
+/patch-avidemux_ADM_videoFilter_ADM_vidFields_cpp/1.2/Tue Aug 21 11:15:01 2012//
+/patch-avidemux_ADM_videoFilter_ADM_vidFlux_cpp/1.2/Tue Aug 21 11:15:01 2012//