Re: update textproc/xpdf
On 06/07/14 22:38, Matthias Kilian wrote: On Fri, May 30, 2014 at 04:37:58PM +0200, Matthias Kilian wrote: Update to xpdf-3.04. [...] Tests, comments and oks are welcome. Are only Patrick Keshishian and me using this? Yes - I'd forgotten to test - it's working fine for me on amd64. Cheers Fred
Re: update textproc/xpdf
On Fri, May 30, 2014 at 04:37:58PM +0200, Matthias Kilian wrote:
> Update to xpdf-3.04.
[...]
> Tests, comments and oks are welcome.
Are only Patrick Keshishian and me using this?
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/xpdf/Makefile,v
> retrieving revision 1.83
> diff -u -p -r1.83 Makefile
> --- Makefile 11 Mar 2013 11:42:47 - 1.83
> +++ Makefile 30 May 2014 14:06:49 -
> @@ -2,12 +2,10 @@
>
> COMMENT= PDF viewer for X11
>
> -DISTNAME=xpdf-3.03
> -REVISION=0
> +DISTNAME=xpdf-3.04
> CATEGORIES= textproc x11
>
> MASTER_SITES=ftp://ftp.foolabs.com/pub/xpdf/ \
> - ftp://gd.tuwien.ac.at/publishing/xpdf/ \
> http://mirror.ctan.org/support/xpdf/
>
> HOMEPAGE=http://www.foolabs.com/xpdf/
> @@ -15,7 +13,7 @@ HOMEPAGE= http://www.foolabs.com/xpdf/
> # GPLv2 only or GPLv3 only or both (at our choice)
> PERMIT_PACKAGE_CDROM=Yes
>
> -LIB_DEPENDS+=x11/openmotif
> +LIB_DEPENDS+=graphics/png x11/openmotif
> USE_GMAKE= Yes
> CONFIGURE_STYLE=gnu
> CONFIGURE_ARGS= --enable-multithreaded \
> @@ -29,7 +27,7 @@ MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -
> RUN_DEPENDS= print/ghostscript/gnu-fonts
>
> WANTLIB= ICE SM X11 Xext Xpm Xt freetype Xm \
> - c m pthread stdc++ z
> + c m png pthread stdc++ z
>
> NO_TEST= Yes
>
> @@ -42,5 +40,9 @@ post-install:
> rm ${PREFIX}/man/man1/$i.1
> rm ${PREFIX}/bin/$i
> .endfor
> +# forgotten in Makefile.in (there's also a pdfthtml, but it conflicts
> +# with poppler-utils):
> + ${INSTALL_PROGRAM} ${WRKBUILD}/xpdf/pdftopng ${PREFIX}/bin
> + ${INSTALL_MAN} ${WRKSRC}/doc/pdftopng.1 ${PREFIX}/man/man1
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/xpdf/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 1 Oct 2011 19:46:35 - 1.17
> +++ distinfo 30 May 2014 13:14:12 -
> @@ -1,5 +1,2 @@
> -MD5 (xpdf-3.03.tar.gz) = r3X3cr7g5a5KgR/50D6sWg==
> -RMD160 (xpdf-3.03.tar.gz) = 7xM2wYkCb7Ds0Wnis3taWqIuBL4=
> -SHA1 (xpdf-3.03.tar.gz) = SZQj6KeV4O/XbKeYI5600NUv4kg=
> -SHA256 (xpdf-3.03.tar.gz) = As9j2PYybtpkQJbND5aeFYhwKthyIsHpOIqTwnD7zso=
> -SIZE (xpdf-3.03.tar.gz) = 795537
> +SHA256 (xpdf-3.04.tar.gz) = ETkMdHM6vLJiqspNtocQ8T///UK/4qCGGl38kSspd+U=
> +SIZE (xpdf-3.04.tar.gz) = 825519
> Index: patches/patch-doc_sample-xpdfrc
> ===
> RCS file: /cvs/ports/textproc/xpdf/patches/patch-doc_sample-xpdfrc,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-doc_sample-xpdfrc
> --- patches/patch-doc_sample-xpdfrc 1 Oct 2011 19:46:35 - 1.4
> +++ patches/patch-doc_sample-xpdfrc 30 May 2014 13:14:12 -
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-doc_sample-xpdfrc,v 1.4 2011/10/01 19:46:35 kili Exp $
> doc/sample-xpdfrc.orig Mon Aug 15 23:08:53 2011
> -+++ doc/sample-xpdfrcThu Aug 18 21:10:22 2011
> +--- doc/sample-xpdfrc.orig Wed May 28 20:50:50 2014
> doc/sample-xpdfrcFri May 30 14:26:13 2014
> @@ -56,7 +56,7 @@
>
> # Set the default PostScript file or command.
> @@ -10,7 +10,7 @@ $OpenBSD: patch-doc_sample-xpdfrc,v 1.4
>
> # Set the default PostScript paper size -- this can be letter, legal,
> # A4, or A3. You can also specify a paper size as width and height
> -@@ -88,5 +88,5 @@
> +@@ -87,5 +87,5 @@
> # Set the command used to run a web browser when a URL hyperlink is
> # clicked.
>
> Index: patches/patch-splash_Makefile_in
> ===
> RCS file: /cvs/ports/textproc/xpdf/patches/patch-splash_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-splash_Makefile_in
> --- patches/patch-splash_Makefile_in 25 Jan 2004 06:02:40 - 1.1
> +++ patches/patch-splash_Makefile_in 30 May 2014 13:14:12 -
> @@ -1,12 +1,12 @@
> $OpenBSD: patch-splash_Makefile_in,v 1.1 2004/01/25 06:02:40 brad Exp $
> splash/Makefile.in.orig 2004-01-24 23:49:23.0 -0500
> -+++ splash/Makefile.in 2004-01-24 23:49:34.0 -0500
> +--- splash/Makefile.in.orig Wed May 28 20:50:50 2014
> splash/Makefile.in Fri May 30 14:29:41 2014
> @@ -16,7 +16,7 @@ GOOLIBDIR = ../goo
> FOFISRCDIR = $(srcdir)/../fofi
> FOFILIBDIR = ../fofi
>
> --CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR)
> -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
> -+CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR)
> -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
> +-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR)
> -I$(FOFISRCDIR) -I$(srcdir) @freetype2_CFLAGS@
> ++CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR)
> -I$(FOFISRCDIR) -I$(srcdir) @freetype2_CFLAGS@
>
> CXX
UPDATE: mail/getmail 4.46.0
Here is an update to getmail 4.46.0.
Index: Makefile
===
RCS file: /cvs/ports/mail/getmail/Makefile,v
retrieving revision 1.90
diff -u -r1.90 Makefile
--- Makefile17 Jan 2014 06:41:55 - 1.90
+++ Makefile23 Apr 2014 13:19:03 -
@@ -2,7 +2,7 @@
COMMENT= IMAP/POP3/SDPS mail retriever
-MODPY_EGG_VERSION= 4.43.0
+MODPY_EGG_VERSION= 4.46.0
DISTNAME= getmail-${MODPY_EGG_VERSION}
CATEGORIES=mail
Index: distinfo
===
RCS file: /cvs/ports/mail/getmail/distinfo,v
retrieving revision 1.73
diff -u -r1.73 distinfo
--- distinfo17 Jan 2014 06:41:55 - 1.73
+++ distinfo23 Apr 2014 13:19:03 -
@@ -1,2 +1,2 @@
-SHA256 (getmail-4.43.0.tar.gz) = HiJFiWY0SYPTiv/SxEOSkXHUihEHz4KYKT5dKRqRbCk=
-SIZE (getmail-4.43.0.tar.gz) = 140511
+SHA256 (getmail-4.46.0.tar.gz) = 9CMmkpDor8AHHKvq6I0/Gt/Z3DUQQawUotTgW0StOJc=
+SIZE (getmail-4.46.0.tar.gz) = 189522
Re: UPDATE: graphics/libcaca 0.99.18 => 0.99.19
On 2014/06/07 14:58, Brian Callahan wrote: > Hi ports -- > > Attached is an update to libcaca. Library requires a minor bump. > Light testing with misc/toilet on amd64 and macppc. Build tested > gstreamer-0.10/plugins-good on amd64. > > OK? OK. there's a use-after-free fix in there btw (this will fix a crash in caca_file_open with gzip that will occur with openbsd malloc now that it junks a page by default when freeing).
UPDATE: graphics/libcaca 0.99.18 => 0.99.19
Hi ports --
Attached is an update to libcaca. Library requires a minor bump.
Light testing with misc/toilet on amd64 and macppc. Build tested
gstreamer-0.10/plugins-good on amd64.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/graphics/libcaca/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 15 Jan 2014 22:57:44 - 1.28
+++ Makefile 7 Jun 2014 18:10:53 -
@@ -2,10 +2,9 @@
COMMENT= color ascii art library
-DISTNAME= libcaca-0.99.beta18
-PKGNAME= libcaca-0.99.18
-REVISION= 0
-SHARED_LIBS += caca 1.1 # .0.99
+DISTNAME= libcaca-0.99.beta19
+PKGNAME= libcaca-0.99.19
+SHARED_LIBS += caca 1.2 # .0.99
CATEGORIES= graphics
HOMEPAGE= http://caca.zoy.org/wiki/libcaca
Index: distinfo
===
RCS file: /cvs/ports/graphics/libcaca/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 5 Jan 2014 18:39:05 - 1.9
+++ distinfo 7 Jun 2014 18:10:53 -
@@ -1,2 +1,2 @@
-SHA256 (libcaca-0.99.beta18.tar.gz) = d+oGYz9KYCLczU92wYI+FnpAywUwj8HH6g+h+A9sM6E=
-SIZE (libcaca-0.99.beta18.tar.gz) = 1168552
+SHA256 (libcaca-0.99.beta19.tar.gz) = EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ=
+SIZE (libcaca-0.99.beta19.tar.gz) = 1203495
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/graphics/libcaca/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 5 Jan 2014 18:39:05 - 1.4
+++ patches/patch-Makefile_in 7 Jun 2014 18:10:53 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2014/01/05 18:39:05 bcallah Exp $
Makefile.in.orig Fri Apr 6 16:48:34 2012
-+++ Makefile.in Sat Jan 4 14:38:00 2014
-@@ -320,7 +320,7 @@ top_build_prefix = @top_build_prefix@
+--- Makefile.in.orig Fri May 16 15:15:33 2014
Makefile.in Sat Jun 7 14:03:02 2014
+@@ -410,7 +410,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = kernel caca src examples tools \
Index: patches/patch-caca_Makefile_in
===
RCS file: patches/patch-caca_Makefile_in
diff -N patches/patch-caca_Makefile_in
--- patches/patch-caca_Makefile_in 5 Jan 2014 18:39:05 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-caca_Makefile_in,v 1.3 2014/01/05 18:39:05 bcallah Exp $
caca/Makefile.in.orig Fri Apr 6 16:48:33 2012
-+++ caca/Makefile.in Sat Jan 4 14:38:00 2014
-@@ -1146,7 +1146,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLT
-
- install-exec-local:
- $(mkinstalldirs) $(DESTDIR)$(libdir)
-- . ./libcaca.la || exit 1; \
- for x in $$library_names; do \
- ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
- done
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/libcaca/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 15 Jan 2014 22:57:44 - 1.4
+++ patches/patch-configure 7 Jun 2014 18:10:53 -
@@ -6,9 +6,9 @@ $OpenBSD: patch-configure,v 1.4 2014/01/
3. Disable detection of ftgl. (no --disable-ftgl option.)
configure.orig Fri Apr 6 16:48:32 2012
-+++ configure Wed Jan 15 15:16:46 2014
-@@ -17412,8 +17412,7 @@ if test -n "$FTGL_CFLAGS"; then
+--- configure.orig Fri May 16 15:15:32 2014
configure Sat Jun 7 14:03:02 2014
+@@ -17495,8 +17495,7 @@ if test -n "$FTGL_CFLAGS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.4 2014/01/
else
pkg_failed=yes
fi
-@@ -17429,8 +17428,7 @@ if test -n "$FTGL_LIBS"; then
+@@ -17512,8 +17511,7 @@ if test -n "$FTGL_LIBS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.4 2014/01/
else
pkg_failed=yes
fi
-@@ -18553,7 +18551,7 @@ fi
+@@ -18672,7 +18670,7 @@ fi
# Build development tools?
@@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.4 2014/01/
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5
$as_echo_n "checking for PANGOFT2... " >&6; }
-@@ -18844,7 +18842,7 @@ fi
+@@ -18963,7 +18961,7 @@ fi
# Use cppunit for unit tests?
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libcaca/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 17 Oct 2013 14:31:53 - 1.5
+++ pkg/PLIST 7 Jun 2014 18:10:53 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2013/10/17 14:31:53 naddy Exp $
bin/caca-config
+@bin bin/cacaclock
@bin bin/cac
Re: NEW: lang/yabasic
Hi, After feedback from sthen@ I have removed the patches and cleaned up the Makefile. Please let me know if this is succinct enough — I have only tested the build on amd64. Cheers yabasic-v2.tar.gz Description: GNU Zip compressed data Anders On 5 Jun 2014, at 10:33 am, Anders Jensen-Waud wrote: > Hello, > > I have ported yabasic (yet another basic interpreter) to OpenBSD. yabasic is > currently included in FreeBSD and several Linux distributions. Tarball is > attached. > > I have included a number of strcpy/strlcpy and strcat/strlcat patches to > remove security warnings during compile time. I am happy to feed those > patches back to the author. > > Would there be interest in including this in Ports? > > Regards, > > Anders >
Re: mpd-0.18.11 m4a support
> Attached is my first pass at removing some duplicate dependencies. FLAC
> is still required for the encoder side of things, mpd doesn't have a
> way to specify only the encoder like it does for other plugins. Also as
> far as I can tell ffmpeg does not have opus support at least in mpd
> right now that's still required as well.
>
> I also reordered WANTLIB and LIB_DEPENDS to be alphabetical.
>
> Input appreciated.
I think it's a good way forward (but I am not the maintainer).
We might want to look into removing the tremor flavor as well and merge it, no?
>
> --
> James Turner
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/mpd/Makefile,v
> retrieving revision 1.59
> diff -u -p -u -p -r1.59 Makefile
> --- Makefile 6 Jun 2014 14:53:37 - 1.59
> +++ Makefile 6 Jun 2014 21:15:23 -
> @@ -2,7 +2,7 @@
>
> COMMENT =Music Player Daemon
> DISTNAME = mpd-0.18.11
> -REVISION = 0
> +REVISION = 1
> CATEGORIES = audio
> HOMEPAGE = http://www.musicpd.org/
> MAINTAINER = David Coppa
> @@ -10,10 +10,10 @@ MAINTAINER = David Coppa # GPLv2+
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB =FLAC ao audiofile avcodec avformat avutil c \
> - cdio cdio_cdda cdio_paranoia curl glib-2.0 \
> - gthread-2.0 id3tag m mad mikmod ogg pthread \
> - samplerate sndfile sndio bz2 mpdclient opus z
> +WANTLIB =FLAC ao avcodec avformat avutil bz2 c cdio \
> + cdio_cdda cdio_paranoia curl glib-2.0 \
> + gthread-2.0 id3tag m mikmod mpdclient ogg \
> + opus pthread samplerate sndfile sndio z
>
> MASTER_SITES = http://www.musicpd.org/download/mpd/stable/
>
> @@ -21,33 +21,35 @@ MODULES = devel/gettext gcc4
> MODGCC4_ARCHS = i386 amd64 powerpc sparc64
> MODGCC4_LANGS = c++
>
> -LIB_DEPENDS =devel/libaudiofile \
> +LIB_DEPENDS =audio/flac \
> audio/libao \
> audio/libcdio \
> - audio/libsamplerate \
> - audio/flac \
> audio/libid3tag \
> - audio/libmad \
> audio/libmikmod \
> - audio/opus \
> audio/libmpdclient \
> + audio/libsamplerate \
> + audio/opus \
> + devel/glib2 \
> graphics/ffmpeg \
> - net/curl \
> - devel/glib2
> + net/curl
>
> FLAVORS =tremor
> FLAVOR ?=
>
> CONFIGURE_STYLE =gnu
> CONFIGURE_ARGS +=--bindir=${PREFIX}/sbin \
> + --disable-aac \
> --disable-alsa \
> + --disable-audiofile \
> --disable-fluidsynth \
> --disable-gme \
> --disable-inotify \
> --disable-jack \
> --disable-libwrap \
> + --disable-mad \
> --disable-mms \
> --disable-modplug \
> + --disable-mpc \
> --disable-mpg123 \
> --disable-oss \
> --disable-openal \
> @@ -58,16 +60,15 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbi
> --disable-sqlite \
> --disable-systemd-daemon \
> --disable-twolame-encoder \
> + --disable-vorbis \
> --disable-wavpack \
> --enable-ao \
> - --enable-audiofile \
> --enable-cdio-paranoia \
> --enable-curl \
> --enable-ffmpeg \
> + --enable-flac \
> --enable-lsr \
> - --enable-mad \
> --enable-mikmod \
> - --enable-mpc \
> --enable-pipe-output \
> --enable-sndfile \
> --with-zeroconf=no \
> @@ -79,23 +80,18 @@ CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}
>
> .if ${FLAVOR:Mtremor}
> CONFIGURE_ARGS +=--with-tremor \
> - --disable-shout \
> - --disable-vorbis-encoder \
> --disable-lame-encoder \
> - --disable-aac \
> - --disable-mpc
> + --disable-shout \
> + --disable-vorbis-encoder
> LIB_DEPENDS += audio/tremor
> WANTLIB += vorbisidec
> .else
> -WANTLIB += theora vorbis vorbisfile vorbisenc speex mp3la
