UPDATE: converters/enca 1.15
Hi, This diff updates enca to the latest release. Tested on amd64. Comments ? OK ? -- Alexandr Shadchin Index: Makefile === RCS file: /cvs/ports/converters/enca/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile21 Mar 2013 08:45:13 - 1.5 +++ Makefile11 Dec 2013 09:28:25 - @@ -2,11 +2,11 @@ COMMENT= detect character set and encoding of text files -DISTNAME= enca-1.14 +DISTNAME= enca-1.15 SHARED_LIBS += enca 0.0 # 5.1 CATEGORIES=converters textproc -HOMEPAGE= http://gitorious.org/enca/ +HOMEPAGE= http://cihar.com/software/enca/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes Index: distinfo === RCS file: /cvs/ports/converters/enca/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo1 Feb 2013 11:49:42 - 1.2 +++ distinfo11 Dec 2013 09:28:25 - @@ -1,2 +1,2 @@ -SHA256 (enca-1.14.tar.gz) = mAhYcBPb6hGjYGsxDRkv6gGCvIbjEdVmIlGglIvRh6A= -SIZE (enca-1.14.tar.gz) = 697466 +SHA256 (enca-1.15.tar.gz) = qF/D8zCEyuwMwCWfU+qPYWu8LeGB8Vdaboc/6RinbGg= +SIZE (enca-1.15.tar.gz) = 668920 Index: pkg/PLIST === RCS file: /cvs/ports/converters/enca/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 1 Feb 2013 11:49:42 - 1.3 +++ pkg/PLIST 11 Dec 2013 09:28:25 - @@ -16,14 +16,3 @@ libexec/enca/extconv/recode libexec/enca/extconv/umap @man man/man1/enca.1 @man man/man1/enconv.1 -share/gtk-doc/ -share/gtk-doc/html/ -share/gtk-doc/html/libenca/ -share/gtk-doc/html/libenca/ch01.html -share/gtk-doc/html/libenca/index.html -share/gtk-doc/html/libenca/index.sgml -share/gtk-doc/html/libenca/libenca-Analyser.html -share/gtk-doc/html/libenca/libenca-Auxiliary-Functions.html -share/gtk-doc/html/libenca/libenca-Charsets-and-Surfaces.html -share/gtk-doc/html/libenca/libenca-Typedefs-and-Constants.html -share/gtk-doc/html/libenca/libenca.devhelp
Re: WIP: LLVM 3.4
On Sat, Dec 07, 2013 at 06:29:56PM -0500, Brad Smith wrote: > On 06/12/13 3:26 PM, Brad Smith wrote: > >On 05/12/13 3:35 AM, Brad Smith wrote: > >>Here is a work in progress update to LLVM 3.4. This has only been lightly > >>tested on amd64. I need this build tested on i386, powerpc, sparc64 and > >>mips64 to start off. If you have such an arch please try building it as > >>soon as possible as I'd like to report any issues upstream if there are > >>any. Any runtime testing feedback would also be appreciated. > > > >Still looking for build tests for sparc64 and mips64. > > and mips64? mips64 is looking good so far, it's currently generating man pages... > > > -- > This message has been scanned for viruses and > dangerous content by MailScanner, and is > believed to be clean. >
PATCH: Use portcheck as portimport's helper
> kirby@ reminded that portimport(1) was not updated after portcheck(1)
> import. Among other things, it allows to run portimport from custom
> directory, which was requested by kirby@ in the first place.
>
> Any comments/okays on the following patch then?
Improved version, after some input from sthen@. Also includes manual
page update. okay?
--
zhuk@
Index: man/man1/portimport.1
===
RCS file: /cvs/ports/infrastructure/man/man1/portimport.1,v
retrieving revision 1.2
diff -u -p -r1.2 portimport.1
--- man/man1/portimport.1 11 Apr 2013 15:18:00 - 1.2
+++ man/man1/portimport.1 11 Dec 2013 10:02:11 -
@@ -22,6 +22,8 @@
.Nd import a new port to the ports cvs repository
.Sh SYNOPSIS
.Nm
+.Op Fl U
+.Op Fl p Ar portsdir
.Op Fl u Ar username
.Sh DESCRIPTION
.Nm
@@ -33,8 +35,13 @@ repository, avoiding common mistakes.
It has to be executed from within the new port's directory.
.Pp
.Nm
-verifies that a minimal directory and file structure for a port is in
-place and that no bogus files exist.
+calls the
+.Xr portcheck 1
+internally to verify that directory and file structure for a port is in
+place and that no bogus files exist, and also to detect the
+.Ev PKGPATH
+for a port.
+.Pp
The import is done in two steps.
In the first step, the
.Fl n
@@ -49,6 +56,15 @@ of the local ports tree.
.Pp
The following options are available:
.Bl -tag -width Ds
+.It Fl p Ar portsdir
+Forces the given directory to be treated as ports root directory.
+Passed through to
+.Xr portcheck 1 .
+.It Fl U
+Skip checks not useful for already committed stuff when, e.g., when
+moving stuff around the tree.
+Passed through to
+.Xr portcheck 1 .
.It Fl u Ar username
Set the username used for
.Xr ssh 1 ,
@@ -57,9 +73,12 @@ Defaults to the local username.
.El
.Sh SEE ALSO
.Xr cvs 1
+.Xr portcheck 1
.Sh HISTORY
This command is based on the portimport script of Marc Espie, lightly
modified by Stuart Henderson and rewritten by Robert Peichaer.
+Later, actual checks were moved to a separate utility,
+.Xr portcheck 1 .
.Sh CAVEATS
The
.Ev CVSROOT
Index: bin/portimport
===
RCS file: /cvs/ports/infrastructure/bin/portimport,v
retrieving revision 1.2
diff -u -p -r1.2 portimport
--- bin/portimport 11 Apr 2013 15:18:00 - 1.2
+++ bin/portimport 11 Dec 2013 10:02:11 -
@@ -18,52 +18,54 @@
# Based on Marc Espie's portimport.
# sthen: Modified to handle imports from mystuff/ and do a dry run first.
# rpe: rewrite based on sthen@'s version
+# zhuk: checks and detection of pkgpath moved to portcheck(1)
set -e
+set -u
usage() {
- echo "usage: $(basename $0) [-u username]" >&2
+ echo "usage: ${0##*/} [-U] [-p portsdir] [-u username]" >&2
exit 1
}
user=$(id -un)
+portsdir=
+portcheck_args=
+unset portcheck_args[0]
-while getopts "u:" OPT; do
+while getopts "p:Uu:" OPT; do
case $OPT in
- u) user="$OPTARG";;
+ p) portsdir="$OPTARG"
+ portcheck_args[${#portcheck_args[@]}]="-p$portsdir";;
+ U) portcheck_args[${#portcheck_args[@]}]="-U";;
+ u) user=$OPTARG;;
*) usage;;
esac
done
-cvsroot=$u...@cvs.openbsd.org:/cvs
-error=false
-fulldir=$(pwd)
-importname="ports/${fulldir##*/ports/*(mystuff/|openbsd-wip/|p5-ports-wip/)}"
-timestamp=$(date '+%Y%m%d')
+shift $(($OPTIND - 1))
+(($# > 0)) && usage
-err() { echo "$*"; error=true; }
+error=false
+pkgpath=$(portcheck "${portcheck_args[@]:---}") || error=true
+if $error; then
+ read ans?'Do you want to continue after those errors? [y/N] '
+ [[ $ans == +(y|Y) ]] || exit
+fi
-[[ -f Makefile && -f distinfo && -f pkg/DESCR && -f pkg/PLIST ]] || err "No
ports files?"
-find . -name .git -print|read i && err "You git!"
-find . -name .\*.swp -print|read i && err "Found vim swap file"
-find . -name \*.orig -print|read i && err "Found .orig file, ouch"
-find . -name typescript-print|read i && err "Found typescript file, ouch"
-find . -path ./w-\*-print|read i && err "Please wipe out work
directory before importing"
-find . -type d -name core -print|read i && err "directory named core found,
cvs will ignore it"
-find . -type f -name .todo -print|read i && err "devtodo file found"
-find . -type d -name CVS -print|read i && err "Some CVS stuff already in
there, very funky"
-$error && exit 1
+portsdir=${portsdir:-${PWD%"/$pkgpath"}}
+timestamp=$(date '+%Y%m%d')
+cvsroot=$u...@cvs.openbsd.org:/cvs
echo -n "Import would go into: "
-cvs -n -d$cvsroot import $importname $user ${user}_$timestamp 2>/dev/null | \
+cvs -n -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp 2>/dev/null |
\
grep Makefile | head -1 | awk '{print $2}' | xargs dirname
-read ans?'Correct path? [y/n] '
+read ans?'Does this look correct? [y/n] '
if [[ $ans == +(y|Y) ]]; then
Re: WIP: LLVM 3.4
On 11/12/13 4:59 AM, Tobias Ulmer wrote: On Sat, Dec 07, 2013 at 06:29:56PM -0500, Brad Smith wrote: On 06/12/13 3:26 PM, Brad Smith wrote: On 05/12/13 3:35 AM, Brad Smith wrote: Here is a work in progress update to LLVM 3.4. This has only been lightly tested on amd64. I need this build tested on i386, powerpc, sparc64 and mips64 to start off. If you have such an arch please try building it as soon as possible as I'd like to report any issues upstream if there are any. Any runtime testing feedback would also be appreciated. Still looking for build tests for sparc64 and mips64. and mips64? mips64 is looking good so far, it's currently generating man pages... Ya, that is at the very end. Ok. good. Thanks. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: PATCH: Use portcheck as portimport's helper
On 2013/12/11 14:08, Vadim Zhukov wrote:
> > kirby@ reminded that portimport(1) was not updated after portcheck(1)
> > import. Among other things, it allows to run portimport from custom
> > directory, which was requested by kirby@ in the first place.
> >
> > Any comments/okays on the following patch then?
>
> Improved version, after some input from sthen@. Also includes manual
> page update. okay?
>
> --
> zhuk@
> usage() {
> - echo "usage: $(basename $0) [-u username]" >&2
> + echo "usage: ${0##*/} [-U] [-p portsdir] [-u username]" >&2
> exit 1
> }
I'm still dubious about this one, the argument about special characters
seems bogus (we haven't had any problems with rc.subr which uses basename
and definitely has weirder filenames to deal with than "portimport") ..
I don't buy "de facto standard", basename is very common. I suppose it's
clear from the context what it's meant to do, but I don't see it commonly
used in scripts and if it was used outside of a usage() block it would
certainly have many readers wondering what it is..
Re: [patch] ports using @{,un}exec with LOCALBASE supposed in PATH
On 2013/12/11 06:55, Sébastien Marie wrote:
> Hi,
>
> During snapshot update, I encounter this problem:
>
> > guile-1.8.8p3:slib-3b1->3b4p0: ok
> > /bin/sh: guile: not found
> > system(/bin/sh, -c, guile -c "(use-modules (ice-9 slib)) (require
> > 'printf)") failed: exit(127)
> > guile-1.8.8p1->1.8.8p3: ok
>
> It is due to @exec in pkg/PLIST:
>
> > @comment force the creation of slibcat
> > @exec guile -c "(use-modules (ice-9 slib)) (require 'printf)"
>
> and because my script for "pkg_add -u" don't include /usr/local in PATH.
>
> Should be better to don't use search path for @exec ? Specially when
> LOCALBASE is supposed to be included ?
>
> If it is ok, here a patch for several others ports that relied on
> LOCALBASE in PATH for @exec/@unexec:
>
> - devel/doc++
> - graphics/asymptote
> - lang/guile
> - print/texlive
>
> Please note, that there are others ports that relied on system base (for
> chmod, ln, rm, install-info, cp...), but I suppose it is safe to suppose
> /bin or /usr/bin are in PATH.
>
> Below a patch for the 4 ports listed before. For all except guile,
> there used mktexlsr, so assure that TEXMFMAIN is setted to good
> directory (like others ports using mktexlsr does).
Makes sense, OK with me, I can commit them later if there are no
objections unless somebody beats me to it.
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/doc++/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 11 Mar 2013 10:50:03 - 1.20
> +++ Makefile 11 Dec 2013 05:50:26 -
> @@ -3,7 +3,7 @@
> COMMENT= documentation system for C, C++, IDL and Java
>
> DISTNAME=doc++-3.4.10
> -REVISION = 2
> +REVISION = 3
> CATEGORIES= devel
>
> HOMEPAGE=http://docpp.sourceforge.net/
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/doc++/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 11 Aug 2007 10:44:24 - 1.8
> +++ pkg/PLIST 11 Dec 2013 05:50:26 -
> @@ -48,5 +48,5 @@ share/texmf/tex/latex/doc++/docxx-fr.sty
> share/texmf/tex/latex/doc++/docxx-ja.sty
> share/texmf/tex/latex/doc++/docxx-ro.sty
> share/texmf/tex/latex/doc++/docxx.sty
> -@exec mktexlsr > /dev/null 2>&1
> -@unexec mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> +@unexec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/asymptote/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 25 Nov 2013 14:16:22 - 1.14
> +++ Makefile 11 Dec 2013 05:50:26 -
> @@ -4,7 +4,7 @@ COMMENT= powerful descriptive vector gr
>
> DISTNAME=asymptote-2.10.src
> PKGNAME= ${DISTNAME:S/.src//g}
> -REVISION = 5
> +REVISION = 6
> CATEGORIES= graphics
>
> HOMEPAGE=http://asymptote.sourceforge.net/
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/asymptote/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 1 Aug 2011 11:35:34 - 1.3
> +++ pkg/PLIST 11 Dec 2013 05:50:26 -
> @@ -444,5 +444,5 @@ share/texmf/tex/latex/asymptote/asycolor
> share/texmf/tex/latex/asymptote/asymptote.sty
> share/texmf/tex/latex/asymptote/latexmkrc
> share/texmf/tex/latex/asymptote/ocg.sty
> -@exec mktexlsr > /dev/null 2>&1
> -@unexec-delete mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> +@unexec-delete TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/guile/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- Makefile 8 Dec 2013 12:21:09 - 1.43
> +++ Makefile 11 Dec 2013 05:50:26 -
> @@ -4,7 +4,7 @@ COMMENT= GNU's Ubiquitous Intelligent La
>
> VERSION= 1.8.8
> DISTNAME=guile-${VERSION}
> -REVISION=3
> +REVISION=4
> SHARED_LIBS= guile 20.0 \
> guile-srfi-srfi-1-v-3 3.2 \
> guile-srfi-srfi-13-14-v-3 3.1 \
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/lang/guile/pkg/PLIST,v
> retrieving revision 1.14
> diff -u -p -r1.14 PLIST
> --- pkg/PLIST 8 Dec 2013 12:21:09 - 1.14
> +++ pkg/PLIST 11 Dec 2013 05:50:26 -
> @@ -306,5 +306,5 @@ share/guile/${V}/srfi/srfi-88.scm
> share/guile/${V}/srfi/srfi-9.scm
> share/guile/slib
> @comment force the creation of slibcat
> -@exec guile -c "(use-modules (ice-9 slib)) (require 'printf)"
> +@exec %D/bin/guile -c "(use-modules (ice-9 slib)) (require 'printf)"
> @unexec rm %D/share/gui
Re: remove duplicate ports webpages
On 2013/12/10 20:47, Daniel Dickman wrote: > The web pages that were merged into the ports faq are still on the > website and people keep emailing around links to them and updating > them without remembering to update the ports faq. > > This patch replaces each of the old pages with a redirect page to the > ports faq. Since it's a a bit on the large side, it's online: > http://goo.gl/3MRoUE committed these, thank you. > Here's a patch to sync the ports faq with changes that were made in > those old pages but were not also made in the ports faq: > http://goo.gl/tXFyFO pkg_add -u is correct, -i is implicit on a terminal. I'll add the portcheck note. > A live version the redirect pages can also be viewed/tested on-line here > http://goo.gl/qD16IF >
Re: Pqiv Image Viewer
Claudio writes:
> Is there a chance of getting this into ports if it's fine?
There was a bit of cleanup to do before thinking about that.
Here's another tarball, which fixes:
- ordering of variables (see Makefile.template)
- void CFLAGS and LDFLAGS; they were not passed to the build,
same for FAKE_FLAGS
- CFLAGS not respected, which leads to the build using -O3; use
MAKE_FLAGS
- dependency on gtk+3 (and not gtk+2)
- manpage formatting, mandoc doesn't support the .po roff request.
- DISTFILES handling using the less redundant distname{name}suffix
syntax.
- incomplete WANTLIB (+ gettext module)
- out of sync Makefile patch (unneeded hunks and comments)
- DESCR could give more information (is that enough?)
About the build warnings,
ok?
pqiv.tgz
Description: Binary data
--
jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: Pqiv Image Viewer
On Wed, Dec 11, 2013 at 02:34:22PM +0100, Jérémie Courrèges-Anglas wrote:
> Claudio writes:
>
> > Is there a chance of getting this into ports if it's fine?
>
> There was a bit of cleanup to do before thinking about that.
> Here's another tarball, which fixes:
> - ordering of variables (see Makefile.template)
> - void CFLAGS and LDFLAGS; they were not passed to the build,
> same for FAKE_FLAGS
> - CFLAGS not respected, which leads to the build using -O3; use
> MAKE_FLAGS
> - dependency on gtk+3 (and not gtk+2)
> - manpage formatting, mandoc doesn't support the .po roff request.
> - DISTFILES handling using the less redundant distname{name}suffix
> syntax.
> - incomplete WANTLIB (+ gettext module)
> - out of sync Makefile patch (unneeded hunks and comments)
> - DESCR could give more information (is that enough?)
No need to LIB_DEPENDS on cairo/glib2, gtk+3 already does, and use tabs
instead of spaces (COMMENT, USE/NO_* lines..)
With that, looks ok to me.
Landry
Re: Pqiv Image Viewer
Landry Breuil writes: [...] > No need to LIB_DEPENDS on cairo/glib2, gtk+3 already does, Is "No need to" to be interpreted here as "should not", ie. a general porting recommendation? Upstream explicitely uses this: `pkg-config --libs gtk+-3.0 glib-2.0 cairo gio-2.0` If for whatever reason our gtk+3 doesn't depend on cairo anymore the deps will be out of sync. And I see no problem with listing direct deps explicitely. This question is afaik not specific to gtk+3. > and use tabs > instead of spaces (COMMENT, USE/NO_* lines..) > > With that, looks ok to me. > > Landry -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: Pqiv Image Viewer
On Wed, Dec 11, 2013 at 03:12:58PM +0100, Jérémie Courrèges-Anglas wrote: > Landry Breuil writes: > > [...] > > > No need to LIB_DEPENDS on cairo/glib2, gtk+3 already does, > > Is "No need to" to be interpreted here as "should not", ie. a general > porting recommendation? > > Upstream explicitely uses this: > `pkg-config --libs gtk+-3.0 glib-2.0 cairo gio-2.0` > > If for whatever reason our gtk+3 doesn't depend on cairo anymore the > deps will be out of sync. And I see no problem with listing direct deps > explicitely. This question is afaik not specific to gtk+3. smaller is better, but that's a matter of taste :) Landry
Re: Pqiv Image Viewer
On Wed, Dec 11, 2013 at 03:22:20PM +0100, Landry Breuil wrote: > On Wed, Dec 11, 2013 at 03:12:58PM +0100, Jérémie Courrèges-Anglas wrote: > > Landry Breuil writes: > > > > [...] > > > > > No need to LIB_DEPENDS on cairo/glib2, gtk+3 already does, > > > > Is "No need to" to be interpreted here as "should not", ie. a general > > porting recommendation? > > > > Upstream explicitely uses this: > > `pkg-config --libs gtk+-3.0 glib-2.0 cairo gio-2.0` > > > > If for whatever reason our gtk+3 doesn't depend on cairo anymore the > > deps will be out of sync. And I see no problem with listing direct deps > > explicitely. This question is afaik not specific to gtk+3. > > smaller is better, but that's a matter of taste :) Usually what _i_ do is only specifying direct deps if upstream insists on using a particular version - and that tends to bitrot over time if you forget to update it. Ie look at www/webkit's LIB_DEPENDS. But no one will yell at you for specifying gtk3/glib2/cairo, though in that particular case i really doubt gtk3 will stop using glib2 & cairo someday. Landry
Re: Pqiv Image Viewer
On 2013/12/11 15:12, Jérémie Courrèges-Anglas wrote:
> Landry Breuil writes:
>
> [...]
>
> > No need to LIB_DEPENDS on cairo/glib2, gtk+3 already does,
>
> Is "No need to" to be interpreted here as "should not", ie. a general
> porting recommendation?
>
> Upstream explicitely uses this:
> `pkg-config --libs gtk+-3.0 glib-2.0 cairo gio-2.0`
imho it would be correct to list the dependency in this case, though
in practice it only really makes a difference on !shared arch, and
gtk+3 is shared-only.
> If for whatever reason our gtk+3 doesn't depend on cairo anymore the
> deps will be out of sync. And I see no problem with listing direct deps
> explicitely. This question is afaik not specific to gtk+3.
I'd kind-of prefer for them to be visibly out of sync ("port doesn't
build") as at least then there's a chance the WANTLIB will be regenerated ;)
Re: Pqiv Image Viewer
> I'd kind-of prefer for them to be visibly out of sync ("port doesn't
> build") as at least then there's a chance the WANTLIB will be regenerated ;)
I personally never put the whole dep chain into LIB_DEPENDS -- the reason is
that I work on the whole tree regularly and it is way easier if you don't have
the explicit LIB_DEPENDS, that can save you a bump.
e.g.
when glib2,-main moved to glib2 I had to bump all ports that had a
RUN+LIB_DEPENDS on devel/glib2 and I am *very* happy not every port that has
glib-2.0 in WANTLIB also has a direct LIB_DEPENDS to devel/glib2, that would
have been a bigger nightmare than it already was.
--
Antoine
NEW: fonts/cosmic-sans-neue-mono
Hi ports -- Attached is a new port: fonts/cosmic-sans-neue-mono. Cosmic Sans Neue Mono is a programming font designed with functionality in mind. Not to be confused with other, similarly named fonts. OK? ~Brian cosmic-sans-neue-mono.tgz Description: Binary data
Re: NEW: fonts/cosmic-sans-neue-mono
Now with 100% more @fontdir in PLIST! On 12/11/13 13:14, Brian Callahan wrote: Hi ports -- Attached is a new port: fonts/cosmic-sans-neue-mono. Cosmic Sans Neue Mono is a programming font designed with functionality in mind. Not to be confused with other, similarly named fonts. OK? ~Brian cosmic-sans-neue-mono.tgz Description: Binary data
lang/ghc: drop ps and pdf docs
Remove postscript and pdf documentation.
The haddock manual and the ghc users guide are already available
as HTML, and everything else in Haskell land (especially all the
libraries) is HTML only, so there's no point in keeping them.
This may help edd@ to work on even more minimal minimalistic texlive
packages.
(And I've no idea wether that LATEX_DOCS=NO in MAKE_FLAGS used for
the no_doc flavor actually does anything, but the *normal* build
succeeds without dblatex and even texlive installed)
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile25 Nov 2013 14:16:23 - 1.106
+++ Makefile11 Dec 2013 20:30:22 -
@@ -13,6 +13,7 @@ DISTNAME =ghc-${MODGHC_VER}
PKGNAME-main = ghc-${MODGHC_VER}
REVISION-main =1
PKGNAME-doc = ghc-doc-${MODGHC_VER}
+REVISION-doc = 0
CATEGORIES = lang devel
HOMEPAGE = http://www.haskell.org/ghc/
@@ -79,16 +80,14 @@ CONFIGURE_ENV +=CONF_CC_OPTS_STAGE0="-f
MAKE_FLAGS += StripLibraries=YES \
INSTALL_BIN_OPTS=-s \
- HSCOLOUR_SRCS=NO
+ HSCOLOUR_SRCS=NO \
+ BUILD_DOCBOOK_PDF=NO \
+ BUILD_DOCBOOK_PS=NO
.if ${FLAVOR:Mno_doc}
MAKE_FLAGS += HADDOCK_DOCS=NO \
LATEX_DOCS=NO \
- BUILD_DOCBOOK_HTML=NO \
- BUILD_DOCBOOK_PDF=NO \
- BUILD_DOCBOOK_PS=NO
-.else
-BUILD_DEPENDS += textproc/dblatex
+ BUILD_DOCBOOK_HTML=NO
.endif
# Thank god that they're only building compilers and no nuclear
Index: pkg/PLIST-doc
===
RCS file: /cvs/ports/lang/ghc/pkg/PLIST-doc,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST-doc
--- pkg/PLIST-doc 18 Jul 2013 21:43:24 - 1.18
+++ pkg/PLIST-doc 11 Dec 2013 18:45:38 -
@@ -1,7 +1,5 @@
@comment $OpenBSD: PLIST-doc,v 1.18 2013/07/18 21:43:24 kili Exp $
share/doc/ghc/
-share/doc/ghc/haddock.pdf
-share/doc/ghc/haddock.ps
share/doc/ghc/html/
share/doc/ghc/html/haddock/
share/doc/ghc/html/haddock/ch01s03.html
@@ -2535,5 +2533,3 @@ share/doc/ghc/html/users_guide/win32-dll
share/doc/ghc/html/users_guide/win32.html
share/doc/ghc/html/users_guide/wrong-compilee.html
share/doc/ghc/html/users_guide/wrong.html
-share/doc/ghc/users_guide.pdf
-share/doc/ghc/users_guide.ps
UPDATE/FIX: editors/beav
This switches the editors/beav port from old 4.3BSD tty ioctls to
termios. While there, I also did a general overhaul of the port:
* Use the latest (2004) Debian version as upstream.
* Improved description, from Debian.
* Miscellaneous clean-up.
I don't know if Kevin still wants to be listed as maintainer...
ok?
Index: Makefile
===
RCS file: /cvs/ports/editors/beav/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile11 Mar 2013 11:02:49 - 1.26
+++ Makefile11 Dec 2013 20:40:06 -
@@ -2,23 +2,37 @@
COMMENT= binary editor and viewer
-DISTNAME= beav_1.40-15
-PKGNAME= beav-1.40.15
+VERSION= 1.40
+# Debian
+REV= 18
+
+DISTNAME= beav-140
+PKGNAME= beav-${VERSION}.${REV}
CATEGORIES=editors
MAINTAINER=Kevin Lo
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c curses
+
+WANTLIB= c ncurses
MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/b/beav/}
-WRKDIST= ${WRKDIR}/beav-1.40
+DISTFILES= beav_${VERSION}.orig.tar.gz
+PATCHFILES=beav_${VERSION}-${REV}.diff.gz
+PATCH_DIST_STRIP=-p1
+
+ALL_TARGET=beav
+MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS} -DUNIX -DBSD"
-USE_GROFF =Yes
NO_TEST= Yes
-post-install:
+do-install:
+ ${INSTALL_PROGRAM} ${WRKBUILD}/beav ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/beav.1 ${PREFIX}/man/man1
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/beav
+ ${INSTALL_DATA} ${WRKSRC}/beav140.txt ${PREFIX}/share/doc/beav/beav.txt
@perl -i -pe 's:%%PREFIX%%:${TRUEPREFIX}:' ${PREFIX}/man/man1/beav.1
.include
Index: distinfo
===
RCS file: /cvs/ports/editors/beav/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo5 Apr 2007 15:38:07 - 1.4
+++ distinfo11 Dec 2013 20:40:06 -
@@ -1,5 +1,4 @@
-MD5 (beav_1.40-15.tar.gz) = smFBn67WFcUAwwr0ZPzgHQ==
-RMD160 (beav_1.40-15.tar.gz) = m/QcFl1y7HYmFAQrIe6FirDzqmM=
-SHA1 (beav_1.40-15.tar.gz) = ig6SLfKVUEOrKYJEsUmL2viaLhs=
-SHA256 (beav_1.40-15.tar.gz) = 3ANhHD0dn8KN6VVr2j+tAADWys5/9EAbeRv8ToUMfBE=
-SIZE (beav_1.40-15.tar.gz) = 131476
+SHA256 (beav_1.40-18.diff.gz) = eQRiTnHK1MOtybAgAnjoQXLxNog9bi/Mytl3+Q0XY6M=
+SHA256 (beav_1.40.orig.tar.gz) = etkF5BJL8QXKDiE9ghK+0jFVmCWsEViHlLm+epE5ndw=
+SIZE (beav_1.40-18.diff.gz) = 14218
+SIZE (beav_1.40.orig.tar.gz) = 128103
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 22 May 2010 15:05:29 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2010/05/22 15:05:29 espie Exp $
Makefile.orig Sat Dec 13 09:34:59 1997
-+++ Makefile Sat May 22 16:56:49 2010
-@@ -1,7 +1,6 @@
- # This is the makefile for BSD UNIX
- #CFLAGS= -g -DUNIX
--CFLAGS= -O2 -DUNIX
--CC=gcc
-+CFLAGS+= -DUNIX -DBSD
-
- OFILES= basic.o ebcdic.o fileio.o region.o text.o wangpc.o \
- buffer.o echo.o language.o main.o search.o tty.o window.o \
-@@ -16,10 +15,16 @@ CFILES= basic.c ebcdic.c fileio.c region.c text.c
-
- HFILES= def.h prototyp.h
-
--beav: $(OFILES)
-- $(CC) $(CFLAGS) $(OFILES) -lncurses -o beav
-+all beav: $(OFILES)
-+ $(CC) $(CFLAGS) $(OFILES) -lcurses -o beav
-
-+install: beav
-+ $(BSD_INSTALL_PROGRAM) beav $(PREFIX)/bin
-+ mkdir -p $(PREFIX)/share/doc/beav
-+ $(BSD_INSTALL_DATA) beav140.txt $(PREFIX)/share/doc/beav/beav.txt
-+ $(BSD_INSTALL_MAN) beav.1 $(PREFIX)/man/man1
-+
- clean:
- rm -f *.o beav
-
--(OFILES): $(HFILES)
-+$(OFILES): $(HFILES)
Index: patches/patch-beav_1
===
RCS file: /cvs/ports/editors/beav/patches/patch-beav_1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-beav_1
--- patches/patch-beav_122 May 2010 15:05:29 - 1.3
+++ patches/patch-beav_111 Dec 2013 20:40:06 -
@@ -1,10 +1,19 @@
$OpenBSD: patch-beav_1,v 1.3 2010/05/22 15:05:29 espie Exp $
beav.1.origSun Aug 20 20:05:22 1995
-+++ beav.1 Sat May 22 16:56:49 2010
+--- beav.1.origWed Dec 11 16:58:55 2013
beav.1 Wed Dec 11 17:12:31 2013
+@@ -23,7 +23,7 @@ These commands can be used to navigate around the wind
+ .br
+ \fImove-back-line\fB Ctl-P\fB moves up\fR
+ .br
+-\fImove-forw-char\fb Ctl-F\fB moves right\fR
++\fImove-forw-char\fB Ctl-F\fB moves right\fR
+ .br
+ \fImove-forw-line\fB Ctl-N\fB moves down\fR
+ .br
@@ -59,5 +59,5 @@ The \fIquit-no-save\fR command,\fB Ctl-X Ctl-C\fR, wil
If there is any data that has not been saved you will be warned.
.PP
.SH FILES
--/usr/doc/beav/beav.txt
+-/usr/share/doc/beav/beav140.txt.gz
+%%PREFIX%%/share/doc/beav/beav.txt
Index: patc
new: let xmms play mpa/mp4/aac audio
Found a plugin that plays all the m4a's I had lying around. Port tarball at http://darwinsys.com/tmp/audio_xmms-mp4-port.tgz Comments/ok? audio_xmms-mp4-port.tgz Description: application/tar-gz
UPDATE: snort 2.9.5.6
Hello,
attached is an update of snort to recent version 2.9.5.6.
Please test, comment and eventually commit.
Special thanks to Bhagya Bantwal from Sourcefire for a patch to fix
crashes on sparc64 on first alert.
Regards,
Markus
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile24 Sep 2013 02:35:23 - 1.82
+++ Makefile11 Dec 2013 20:16:33 -
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.5.5
+VERSION = 2.9.5.6
DISTNAME = snort-${VERSION}
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo24 Sep 2013 02:35:23 - 1.27
+++ distinfo11 Dec 2013 20:16:33 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.5.5.tar.gz) = AsjMYGC9qgsAU3ynD20nKFU3WUiuzlJT3Rjw12x/U54=
-SIZE (snort-2.9.5.5.tar.gz) = 5048740
+SHA256 (snort-2.9.5.6.tar.gz) = ae0JB3wfoiaPgUyO/25hO3/oh2oTjfHNZXnP+7dH21U=
+SIZE (snort-2.9.5.6.tar.gz) = 5049188
Index: patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_preprocessors_Stream5_snort_stream5_tcp_c
--- patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 21 Aug 2013
02:28:45 - 1.10
+++ patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 11 Dec 2013
20:16:33 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.10
2013/08/21 02:28:45 lteo Exp $
src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Jul 9 17:33:09 2013
-+++ src/preprocessors/Stream5/snort_stream5_tcp.c Mon Aug 5 14:37:49 2013
-@@ -7495,7 +7495,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
+--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Fri Sep 27 17:37:54 2013
src/preprocessors/Stream5/snort_stream5_tcp.c Wed Nov 20 20:07:03 2013
+@@ -7505,7 +7505,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
char src_addr[17];
char dst_addr[17];
bzero((char *)timestamp, TIMEBUF_SIZE);
Index: patches/patch-src_sfutil_sfxhash_c
===
RCS file: patches/patch-src_sfutil_sfxhash_c
diff -N patches/patch-src_sfutil_sfxhash_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_sfutil_sfxhash_c 11 Dec 2013 20:16:33 -
@@ -0,0 +1,49 @@
+$OpenBSD$
+
+fix crashes on archs with strict memory alignment, at least sparc64
+
+patch from Bhagya Bantwal from Sourcefire, Thanks!
+
+--- src/sfutil/sfxhash.c.orig Tue Jun 4 23:19:53 2013
src/sfutil/sfxhash.c Tue Dec 3 22:27:24 2013
+@@ -235,6 +235,13 @@ SFXHASH * sfxhash_new( int nrows, int keysize, int dat
+ h->anrfree = anrfree;
+ h->usrfree = usrfree;
+ h->keysize = keysize;
++
++#ifdef WORDS_MUSTALIGN
++if ((h->keysize) & 7)
++h->pad = (8 - ((h->keysize) & 7));
++#else
++h->pad = 0;
++#endif
+ h->datasize = datasize;
+ h->nrows= nrows;
+ h->max_nodes = 0;
+@@ -579,7 +586,7 @@ SFXHASH_NODE * sfxhash_newnode( SFXHASH * t )
+ {
+ if ((t->max_nodes == 0) || (t->count < t->max_nodes))
+ {
+-hnode = (SFXHASH_NODE*)s_alloc( t, sizeof(SFXHASH_NODE) +
++hnode = (SFXHASH_NODE*)s_alloc( t, sizeof(SFXHASH_NODE) + t->pad +
+ t->keysize + t->datasize );
+ }
+ }
+@@ -727,7 +734,7 @@ int sfxhash_add( SFXHASH * t, void * key, void * data
+ if( t->datasize )
+ {
+ /* Set up the new data pointer */
+-hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->keysize;
++hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->pad +
t->keysize;
+
+ if(data)
+ {
+@@ -806,7 +813,7 @@ SFXHASH_NODE * sfxhash_get_node( SFXHASH * t, const vo
+ if( t->datasize )
+ {
+ /* Set up the new data pointer */
+-hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->keysize;
++hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->pad +
t->keysize;
+ }
+ else
+ {
Index: patches/patch-src_sfutil_sfxhash_h
===
RCS file: patches/patch-src_sfutil_sfxhash_h
diff -N patches/patch-src_sfutil_sfxhash_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_sfutil_sfxhash_h 11 Dec 2013 20:16:33 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+fix crashes on archs with strict memory alignment, at least sparc64
+
+patch from Bhagya Bantwal
Re: NEW: devel/phantomjs
On 2013/12/05 10:57, Francisco de Borja Lopez Rio wrote:
> On Wed, Dec 04, 2013 at 11:37:07AM +, Stuart Henderson wrote:
> >
> > MESSAGE should go; if every port which installed examples under
> > share/examples/portname printed a message about it, installing or
> > updating ports would be excessively noisy.
> >
> > BUILD_DEPENDS on print/freetype seems unlikely to be correct - this
> > is a very old version providing libttf (which you don't have in WANTLIB).
> > the usual freetype is in base (X) and provides libfreetype which is
> > listed in WANTLIB.
> >
> > the "#!/usr/bin/env bash" lines should be replaced with proper paths
> > rather than relying on the environment, I would use "perl -pi -e
> > 's,^#!/usr/bin/env bash,#!${LOCALBASE}/bin/bash,' ${WRKSRC}/..." for
> > this.
> >
> > i'd add a comment next to the PARALLEL_BUILD line, e.g.
> >
> > # passed via environment rather than on the command line to make
> > PARALLEL_BUILD =No
> >
> > "NO_TEST" is meant to indicate that there are no tests, not that there
> > are tests which fail - so please remove the NO_TEST line, but it may be
> > appropriate to add a comment noting the failures.
> >
>
> All done, attached is the updated version of the port, which is also
> available here for download:
>
> http://codigo23.net/openbsd/ports/phantomjs.tar.gz
New tar.gz attached with minor changes: move category to www (devel is
very busy), tweak the license marker, add newline at EOF in DESCR,
and enable parallel builds for dpb.
This one is OK sthen@ if anybody would like to import it (or would
like to give me an OK to import)..
Build isn't *too* bad, about 45min on my laptop.
phantomjs.tgz
Description: application/tar-gz
