Permalink
Browse files

Revert "Revert "Merge branch 'master' of ssh://us.holligan.net/home/a…

…ndrew/openbsd-wip/""

This reverts commit 43e9b0b.

Conflicts:

	multimedia/get_flash_videos/Makefile
	multimedia/get_flash_videos/pkg/PLIST
	multimedia/phonon/Makefile
	net/wireshark16/Makefile
	x11/grantlee/Makefile
  • Loading branch information...
grayed committed Oct 15, 2012
1 parent 9457026 commit 270b4b7684879e4064cf166c5b8eebcda33d3984
Showing 768 changed files with 339,376 additions and 13,631 deletions.
View
@@ -20,50 +20,28 @@ sysutils/conky Ready for import. Sent to maintainer 2012-07-24, similar update
OCaml 4.00:
-All tested on amd64 and sparc64
Sent to lang/ocaml maintainer Anil Madhavapeddy <anil@recoil.org>
-databases/ocaml-postgresql ready for import.
databases/ocaml-sqlite3 ready for import.
+devel/camomile ready for import.
devel/cil ready for import.
devel/coccinelle ready for import.
-devel/ocaml-batteries ready for import.
devel/ocaml-calendar ready for import.
-devel/ocaml-camomile ready for import.
-devel/ocaml-mlgmp ready for import.
-devel/ocaml-net ready for import.
-devel/ocaml-pcre ready for import.
-devel/ocaml-react ready for import.
devel/ocaml-lwt ready for import.
-devel/ocaml-zed ready for import.
devel/ocaml-lambda-term ready for import.
-devel/ocamlclean ready for import.
-devel/omake ready for import.
-devel/ounit ready for import.
-graphics/ocaml-camlimages ready for import.
lang/obc waiting for i386 test
-lang/ocaml ready for import.
+lang/ocaml needs testing.
lang/ocamlduce ready for import, but BROKEN
lang/utop ready for import.
math/coq ready for import.
-net/mldonkey/stable ready for import.
net/unison/stable ready for import.
-productivity/wyrd ready for import.
-security/(ocaml-)cryptokit ready for import. Renamed cryptokit->ocaml-crytokit
-security/ocaml-ssl ready for import.
-sysutils/findlib ready for import.
textproc/hevea ready for import.
-textproc/ocaml-text ready for import.
-textproc/ocaml-rss ready for import.
textproc/ocaml-xmlm ready for import.
-textproc/ocaml-xml-light ready for import.
www/ocaml-tyxml ready for import.
-
-KDE 4.8 related
-
-textproc/liblrdf: Ready for import. Sent to ports@ October 10, 2011 (grayed)
-textproc/raptor: Ready for import. Sent to ports@ October 10, 2011 (grayed)
-textproc/rasqal: Ready for import. Sent to ports@ October 10, 2011 (grayed)
-textproc/redland: Ready for import. Sent to ports@ October 10, 2011 (grayed)
-math/libqalculate Ready for import. Sent to ports@ October 24, 2011 (grayed, amitkulz)
+KDE 4.9 related
+---------------
+textproc/liblrdf: Ready for import. Sent to ports@ October 04, 2012 (grayed)
+textproc/raptor: Ready for import. Sent to ports@ October 04, 2012 (grayed)
+textproc/rasqal: Ready for import. Sent to ports@ October 04, 2012 (grayed)
+textproc/redland: Ready for import. Sent to ports@ October 04, 2012 (grayed)
View
@@ -1,39 +0,0 @@
-# $OpenBSD$
-
-COMMENT = ultra-low delay audio codec (0.5.1.x API)
-
-V = 0.5.1.1
-DISTNAME = celt-$V
-PKGNAME = celt051-$V
-
-CATEGORIES = audio
-
-HOMEPAGE = http://www.celt-codec.org/
-
-SHARED_LIBS += celt051 0.0 # 0.0
-
-# BSD
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM =Yes
-PERMIT_DISTFILES_FTP = Yes
-
-MASTER_SITES = http://downloads.xiph.org/releases/celt/
-
-WANTLIB = c m ogg>=5 #sndio
-
-LIB_DEPENDS = audio/libogg
-
-USE_LIBTOOL = Yes
-
-CONFIGURE_STYLE = gnu
-
-CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
- --with-ogg=${LOCALBASE}
-
-# XXX: Need to port to sndio
-#CONFIGURE_ENV = CPPFLAGS="-DUSE_SNDIO"
-
-SEPARATE_BUILD = Yes
-
-.include <bsd.port.mk>
View
@@ -1 +0,0 @@
-- Port to sndio (copy patches from audio/celt?)
View
@@ -1,5 +0,0 @@
-MD5 (celt-0.5.1.1.tar.gz) = jy0ZZctPqHJAeo78QxQKSw==
-RMD160 (celt-0.5.1.1.tar.gz) = NFkVQru603nMQuVMcmkCrUXGudQ=
-SHA1 (celt-0.5.1.1.tar.gz) = Y0WmlQxWhf10gSc4YLwKXsm4GH4=
-SHA256 (celt-0.5.1.1.tar.gz) = UF1+LExKhZDUYPU231xocCzdAAbVrrSqGURxULUOVF8=
-SIZE (celt-0.5.1.1.tar.gz) = 440621
@@ -1,13 +0,0 @@
-$OpenBSD$
-
-Reflect correct library name.
-
---- celt051.pc.in.orig Wed Apr 11 20:12:58 2012
-+++ celt051.pc.in Wed Apr 11 20:13:02 2012
-@@ -10,5 +10,5 @@ Description: CELT is a low-delay audio codec
- Version: @CELT_VERSION@
- Requires:
- Conflicts:
--Libs: -L${libdir} -lcelt -lm
-+Libs: -L${libdir} -lcelt051 -lm
- Cflags: -I${includedir}
View
@@ -1,6 +0,0 @@
-The CELT codec is an experimental audio codec for use in low-delay
-speech and audio communication. It's meant to close the gap between
-Vorbis and Speex for applications where both high quality audio and
-low delay are desired.
-
-This package contains the celt051 API.
@@ -1,2 +0,0 @@
-@comment $OpenBSD$
-@lib lib/libcelt051.so.${LIBcelt051_VERSION}
View
@@ -1,12 +0,0 @@
-@comment $OpenBSD$
-%%SHARED%%
-@bin bin/celtdec051
-@bin bin/celtenc051
-include/celt051/
-include/celt051/celt.h
-include/celt051/celt_header.h
-include/celt051/celt_types.h
-lib/libcelt051.a
-lib/libcelt051.la
-lib/pkgconfig/
-lib/pkgconfig/celt051.pc
View
@@ -7,10 +7,11 @@ COMMENT-kde4 = KDE4 Plasma runner for Clementine
DISTNAME = clementine-1.0.1
PKGNAME-main = ${PKGNAME}
PKGNAME-kde4 = ${PKGNAME:C/-/-kde4-/1}
-REVISION-main = 2
+REVISION-main = 4
REVISION-kde4 = 0
HOMEPAGE = http://clementine-player.org/
+FLAVOR ?=
PSEUDO_FLAVORS = no_kde4
MULTI_PACKAGES = -main -kde4
@@ -35,7 +36,7 @@ WANTLIB-main += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB-main += gstapp-0.10 gstbase-0.10 gstcdda-0.10 gstreamer-0.10
WANTLIB-main += gsttag-0.10
WANTLIB-main += avcodec avutil cdio lastfm mtp protobuf-lite qca2
-WANTLIB-main += qjson tag>=5.0 usb xml2
+WANTLIB-main += qjson tag>=5.0 usb-1.0 xml2
WANTLIB-kde4 = ${WANTLIB-common} ${MODKDE4_WANTLIB}
WANTLIB-kde4 += lib/qt4/QtSvg kdeui plasma
@@ -51,7 +52,7 @@ MODKDE4_USE =
BUILD_DEPENDS = devel/boost
RUN_DEPENDS-main = devel/desktop-file-utils \
- x11/qt4,-sqlite
+ multimedia/gstreamer-0.10/plugins-ugly
RUN_DEPENDS-kde4 = ${BUILD_PKGPATH},-main \
${MODKDE4_RUN_DEPENDS}
@@ -65,13 +66,13 @@ LIB_DEPENDS-main = ${MODGETTEXT_LIB_DEPENDS} \
audio/liblastfm \
devel/libmtp \
devel/libplist \
+ devel/libusb1 \
devel/protobuf \
devel/qjson \
graphics/ffmpeg \
graphics/glew \
multimedia/gstreamer-0.10/core \
- multimedia/gstreamer-0.10/plugins-base,-main \
- multimedia/gstreamer-0.10/plugins-base,-cdda \
+ multimedia/gstreamer-0.10/plugins-base \
security/qca2
LIB_DEPENDS-kde4 = ${MODKDE4_LIB_DEPENDS}
View
@@ -35,8 +35,10 @@ CONFIGURE_STYLE = gnu
MODRUBY_RUNDEP = No
-# __tests is built as part of 'all', but doesn't really run any tests
-NO_REGRESS = Yes
+REGRESS_DEPENDS = ${BUILD_PKGPATH}
+
+do-regress:
+ cd ${WRKBUILD}/_bin && ./tests
pre-configure:
perl -pi -e 's,(\b|!)(/usr/bin/)?ruby\b,\1${RUBY},g' ${WRKSRC}/configure
View
@@ -0,0 +1 @@
+Fix regressions.
View
@@ -0,0 +1,41 @@
+# $OpenBSD: Makefile.template,v 1.61 2012/03/29 13:41:58 sthen Exp $
+
+COMMENT = minimal MIDI sequencer
+
+#http://www.filter24.org/seq24/seq24-0.8.7.tar.gz
+DISTNAME = seq24-0.8.7
+
+CATEGORIES = audio
+
+HOMEPAGE = http://www.filter24.org/seq24/
+
+MAINTAINER = Edd Barrett <edd@openbsd.org>
+
+# XXX
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 atkmm-1.6 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 gobject-2.0
+WANTLIB += gtk-x11-2.0 gtkmm-2.4 iconv intl 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++ xcb xcb-render xcb-shm z
+
+MASTER_SITES = ${HOMEPAGE}
+
+LIB_DEPENDS = x11/gtk2mm
+
+CONFIGURE_STYLE = autoconf
+AUTOCONF_VERSION = 2.68
+AUTOMAKE_VERSION = 1.11
+
+CONFIGURE_ARGS = --disable-jack-support
+MAKE_FLAGS = ALSA_LIBS= ALSA_CFLAGS=
+
+NO_REGRESS = Yes
+
+.include <bsd.port.mk>
View
@@ -0,0 +1,2 @@
+SHA256 (seq24-0.8.7.tar.gz) = +6nFR5mcL6aMmTvy42cIc0PsKUjNEXLUR+AI4fpSs+4=
+SIZE (seq24-0.8.7.tar.gz) = 194461
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- configure.in.orig Wed May 31 02:17:06 2006
++++ configure.in Fri Sep 21 14:42:43 2012
+@@ -15,8 +15,9 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+
+ dnl Checks for libraries.
+-AC_CHECK_LIB(rt,main, ,
+- AC_MSG_ERROR([POSIX.1b RealTime Library Missing -lrt]))
++dnl Not needed on OpenBSD
++#AC_CHECK_LIB(rt,main, ,
++# AC_MSG_ERROR([POSIX.1b RealTime Library Missing -lrt]))
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -28,7 +29,9 @@ AC_C_CONST
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(select)
+
+-AM_PATH_ALSA(0.9.0)
++dnl not on OpenBSD
++#AM_PATH_ALSA(0.9.0)
++ALSA_LIBS=""
+
+ ####AM_PATH_GTKMM(1.2.0) OLD
+
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- src/dump.cpp.orig Fri Sep 21 14:56:31 2012
++++ src/dump.cpp Fri Sep 21 14:58:08 2012
+@@ -3,9 +3,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++
++#if defined(__LINUX__)
+ #include <alsa/asoundlib.h>
+
+-
+ snd_seq_t *open_seq();
+ void midi_action(snd_seq_t *seq_handle);
+
+@@ -101,3 +102,9 @@ int main(int argc, char *argv[]) {
+ }
+ }
+ }
++#else
++int main(int argc, char *argv[]) {
++ printf("Not supported on this platform\n");
++ return (EXIT_SUCCESS);
++}
++#endif
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- src/mainwnd.h.orig Fri Sep 21 13:40:35 2012
++++ src/mainwnd.h Fri Sep 21 13:40:03 2012
+@@ -109,7 +109,11 @@ class mainwnd : public Gtk::Window
+
+ Entry *m_entry_notes;
+
++#if defined(__OpenBSD__)
++ sigc::connection m_timeout_connect;
++#else
+ SigC::Connection m_timeout_connect;
++#endif
+
+ void file_new_dialog( void );
+ void file_save_dialog( void );
Oops, something went wrong.

1 comment on commit 270b4b7

@grayed

This comment has been minimized.

Show comment Hide comment
@grayed

grayed Oct 15, 2012

Collaborator

This was a VERY large hammer to get back changes from a few weeks. Everyone who was working on something before recent Andrew's merges, PLEASE, review THIS commit. Thanks and sorry for any possible inconvenience here.

Collaborator

grayed commented on 270b4b7 Oct 15, 2012

This was a VERY large hammer to get back changes from a few weeks. Everyone who was working on something before recent Andrew's merges, PLEASE, review THIS commit. Thanks and sorry for any possible inconvenience here.

Please sign in to comment.