Index: head/Tools/scripts/bump_revision.pl =================================================================== --- head/Tools/scripts/bump_revision.pl (revision 413096) +++ head/Tools/scripts/bump_revision.pl (revision 413097) @@ -1,212 +1,274 @@ -#!/usr/bin/env perl -w +#!/usr/bin/env perl -wT # $FreeBSD$ # +# This Perl script helps with bumping the PORTREVISION of all ports +# that depend on a set of ports, for instance, when in the latter set +# one of the port bumped the .so library version. +# +# It is best executed with the working directory set to the base of a +# ports tree, usually /usr/ports. +# +# You must use either the -l (shaLlow, avoid grandparent dependencies, +# slower) or -g option (include grandparend dependencies) option. +# # MAINTAINER= gerald@FreeBSD.org # -use Getopt::Std; use strict; +use Getopt::Std; +use Carp 'verbose'; use Cwd; use Data::Dumper; use File::Basename; -use vars qw/$opt_c $opt_n $opt_i $opt_u/; +use vars qw/$opt_c $opt_n $opt_i $opt_u $opt_l $opt_g/; +$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; + sub usage { print </] - -c - Just check - -n - No tmpdir, just use dirname(INDEX) - -u - Your freebsd.org username. Defaults to \$ENV{USER}. - -i - Use this for INDEX name. Defaults to /usr/ports/INDEX. +Mandatory flags: + -l - shaLlow, only bump ports with direct dependencies. + -g - Grandchildren, also bump for indirect dependencies. +Optional flags: + -c - Check only (dry-run), do not change Makefiles. + -n - No tmpdir, just use the directory where INDEX resides. + -i - Use this for INDEX name. Defaults to /usr/ports/INDEX-n, + where n is the major version of the OS, or /usr/ports/INDEX if missing. + Improvements, suggestions,questions -> gerald\@FreeBSD.org EOF exit 1; } +$| = 1; + sub bumpMakefile { my ($p) = @_; my $makefile = "$p/Makefile"; my $fin; unless(open($fin, $makefile)) { print "-- Cannot open Makefile of $p, ignored.\n"; next; } my @lines = <$fin>; + if ($!) { die "Error while reading $makefile: $!. Aborting"; } close($fin) or die "Can't close $makefile b/c $!"; chomp(@lines); my $revision = 1; foreach my $line (@lines) { last if ($line =~ /^MAINTAINER/); $revision += $1 if ($line =~ /PORTREVISION\??=[ \t]*(\d+)$/); } my $printedrev = 0; - open(my $fout, '>', "$makefile"); + open(my $fout, '>', "$makefile.bumped"); foreach my $line (@lines) { if (!$printedrev) { if ($line =~ /^CATEGORIES??=/ || $line =~ /^PORTEPOCH??=/) { print $fout "PORTREVISION= $revision\n"; $printedrev = 1; # Fall through! } if ($line =~ /^PORTREVISION\?=/) { print $fout "PORTREVISION?= $revision\n"; $printedrev = 1; next; } if ($line =~ /^PORTREVISION=/) { print $fout "PORTREVISION= $revision\n"; $printedrev = 1; next; } } print $fout "$line\n"; } close($fout) or die "Can't close $makefile b/c $!"; + rename "$makefile.bumped", $makefile or die "Can't rename $makefile.bumped to $makefile: $!"; } -my $INDEX = "/usr/ports/INDEX"; -my $USER = $ENV{USER}; +my $osversion = `uname -r`; +chomp $osversion; +$osversion =~ s/\..*//; + +my $INDEX = "/usr/ports/INDEX-$osversion"; +if (!-f $INDEX) { $INDEX = "/usr/ports/INDEX"; } + +my $shallow = 0; { $opt_i = ""; $opt_u = ""; - getopts("cni:u:"); + getopts("cgi:lnu:"); $INDEX = $opt_i if ($opt_i); - $USER = $opt_u if ($opt_u); + $shallow = $opt_l if $opt_l; + if (not $opt_l and not $opt_g) { + die "Neither -g nor -l given. Aborting"; + } - die "$INDEX doesn't seem to exist. Please check the value supplied with -i or use -i." unless(-f $INDEX); + die "$INDEX doesn't seem to exist. Please check the value supplied with -i, or use -i /path/to/INDEX." unless(-f $INDEX); } -my $PORT = $ARGV[0]; -usage() unless($PORT); +usage() unless(@ARGV); -my $CVSROOT = $ENV{CVSROOT} // ':ext:$USER\@pcvs.freebsd.org:/home/pcvs'; +my $TMPDIR = File::Basename::dirname($INDEX); # +# Sanity checking +# +if (-d "$TMPDIR/.svn" and not $opt_n and not $opt_c) { + print "$TMPDIR/.svn exists, do you want to use the -n option? Press Ctrl-C to abort.\n"; + sleep 5; +} + +# # Read the index, save some interesting keys # my %index = (); { print "Reading $INDEX\n"; open(my $fin, '<', "$INDEX") or die "Cannot open $INDEX for reading."; my @lines = <$fin>; + if ($!) { die "Error while reading $INDEX: $! Aborting"; } chomp(@lines); close($fin); - foreach my $line (@lines) { - my @a = split(/\|/, $line); - my @b = split(/\//, $a[1]); + my @a; + my @b; + my $port; + map { + @a = split(/\|/, $_); + @b = split(/\//, $a[1]); - my $port = $b[-2]."/".$b[-1]; + $port = $b[-2]."/".$b[-1]; - $index{$port}{portname} = $b[-1]; - $index{$port}{portnameversion} = $a[0]; - $index{$port}{portdir} = $a[1]; - $index{$port}{comment} = $a[3]; - $index{$port}{deps} = (); + @{ $index{$port} }{'portname', 'portnameversion', 'portdir', 'comment', 'deps'} + = ($b[-1], $a[0], $a[1], $a[3], ()); if ($a[8]) { @b = split(" ", $a[8]); - foreach my $b (@b) { - $index{$port}{deps}{$b} = 1; - } + @{ $index{$port}{deps} }{@b} = (1) x @b; } - } - my @k = keys(%index); - print "- Processed ", $#k+1, " entries.\n"; + + } @lines; + print "- Processed ", scalar keys(%index), " entries.\n"; } -# -# See if the port does really exists. -# If specified as category/portname, that should be enough. -# If specified as portname, check all indexes for existence or duplicates. -# -unless (defined $index{$PORT}) { - my $count = 0; - my $n = ""; - foreach my $p (keys(%index)) { - if ($p =~ /\/$PORT$/) { - $n .= " " if ($n); - $n .= $p; - $count++; +my %DEPPORTS = (); + +foreach my $PORT (@ARGV) { + # + # See if the port does really exists. + # If specified as category/portname, that should be enough. + # If specified as portname, check all indexes for existence or duplicates. + # + unless (defined $index{$PORT}) { + my @found = grep /\/$PORT$/, keys(%index); + my $count = @found; + + if ($count == 0) { + die "Cannot find ${PORT} in ${INDEX}."; + } elsif ($count == 1) { + $PORT = $found[0]; + } else { + my $n = join(" ", @found); + die "Found ${PORT} more than once in ${INDEX}: $n. Try category/$PORT.\nAborting"; } } - if ($count == 0) { - die "Cannot find ${PORT} in ${INDEX}."; - } elsif ($count == 1) { - $PORT = $n; - } else { - die "Found ${PORT} more than once in ${INDEX}: $n. Try category/portname."; + + my $PORTNAMEVERSION = $index{$PORT}{portnameversion}; + print "Found $PORT as $PORTNAMEVERSION\n"; + + # + # Figure out all the ports depending on this one. + # + { + print "Searching for ports depending on $PORT\n"; + + foreach my $p (keys(%index)) { + if (defined $index{$p}{'deps'}{$PORTNAMEVERSION}) { + $DEPPORTS{$p} = 1; + } + } + print "- Found ", scalar keys(%DEPPORTS), " ports depending on $PORT.\n"; } } -my $PORTNAMEVERSION = $index{$PORT}{portnameversion}; -print "Found $PORT as $PORTNAMEVERSION\n"; - # -# Figure out all the ports depending on this one. +# In shallow mode, strip all those who don't have a direct dependency # -my %DEPPORTS = (); -my $ports = ""; -{ - print "Searching for ports depending on $PORT\n"; - foreach my $p (keys(%index)) { - if (defined $index{$p}{deps}{$PORTNAMEVERSION}) { - $DEPPORTS{$p} = 1; - $ports .= " " if ($ports); - $ports .= "ports/$p"; +sub direct_dependence($@) { + my ($port, @requisites) = @_; + open F, '-|', '/usr/bin/make', '-C', $port, qw/-V _RUN_DEPENDS -V _LIB_DEPENDS/ or die "cannot launch make: $!"; + my @lines = ; + chomp @lines; + my $deps = join(" ", @lines); + my %deps = map { $_ =~ s[/usr/ports/][]; ($_ => 1) } split " ", $deps; + if ($!) { die "cannot read depends from make: $!"; } + close F or die "cannot read depends from make: $!"; + my $required = grep { $_ } map { defined $deps{$_} } @requisites; + return $required; +} +if ($shallow) { + my $n = keys %DEPPORTS; + my $idx = 1; + foreach my $p (keys %DEPPORTS) { + print "- Checking requisites of port $idx/$n...\r"; + ++$idx; + unless (direct_dependence($p, @ARGV)) { + delete $DEPPORTS{$p}; } } - my @k = keys(%DEPPORTS); - print "- Found ", $#k+1, " ports depending on it.\n"; + print "- Found ", scalar keys(%DEPPORTS), " ports depending directly on either of @ARGV.\n"; } +my $ports = join(" ", keys %DEPPORTS); + # # Create a temp directory and cvs checkout the ports # (don't do error checking, too complicated right now) # - -my $TMPDIR = File::Basename::dirname($INDEX); -unless ($opt_n) { - $TMPDIR = getcwd() . "/.tmpdir.$$"; +unless ($opt_n or $opt_c) { + $TMPDIR = ".bump_rev_tmpdir.$$"; + print "svn checkout into $TMPDIR...\n"; mkdir($TMPDIR, 0755); chdir($TMPDIR); - system "cvs -d $CVSROOT co -T $ports"; - chdir($TMPDIR); + system "svn checkout --depth=immediates svn+ssh://svn.freebsd.org/ports/head/ ports" and die "SVN checkout failed (wait value $?), aborting"; + chdir('ports'); + system "svn update --set-depth=infinity $ports" and die "SVN checkout failed (wait value $?), aborting"; } # # Bump portrevisions # { print "Updating Makefiles\n"; - foreach my $p (keys(%DEPPORTS)) { + foreach my $p (sort keys(%DEPPORTS)) { print "- Updating Makefile of $p\n"; next if $opt_c; bumpMakefile "$p"; } } # # Commit the changes. Not automated. # unless ($opt_c) { print < # $FreeBSD$ PORTNAME= db48 PORTVERSION= 4.8.30.0 PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= DISTNAME= db-${PORTVERSION:R} DIST_SUBDIR= bdb -MAINTAINER= mandree@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Berkeley DB package, revision 4.8 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE DEPRECATED= Please migrate to db5 or db6, make sure that bitcoin and siblings moved to another database or version by then # This port expires along with FreeBSD 10.X. EXPIRATION_DATE= 2018-04-30 BDBVER= ${PORTVERSION:R:R} CONFIGURE_ARGS= --enable-compat185 --enable-dump185 --enable-cxx \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} \ --bindir=${PREFIX}/bin/${PORTNAME} CONFIGURE_SCRIPT= ../dist/configure USES= libtool:keepla GNU_CONFIGURE= yes INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_LDCONFIG= yes .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100101 IGNORE= db48 is not supported on FreeBSD 11+ with clang 3.8 - upgrade to db5 .endif .if ${ARCH} == "aarch64" || ${ARCH} == "armv6" # db48 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 CONFIGURE_ARGS+= --enable-posixmutexes .endif post-patch: ${REINPLACE_CMD} -Ee 's|--mode=install cp -p|--mode=install ${INSTALL} -s|;' ${WRKSRC}/${CONFIGURE_SCRIPT} post-install: .for i in libdb libdb_cxx ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so .endfor cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER}; done .include Index: head/databases/db5/Makefile =================================================================== --- head/databases/db5/Makefile (revision 413096) +++ head/databases/db5/Makefile (revision 413097) @@ -1,123 +1,123 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= db5 PORTVERSION= 5.3.28 PORTREVISION= 3 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= # # the distfiles aren't named db5-* but db-*: DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb -MAINTAINER= mandree@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= The Oracle Berkeley DB, revision ${BDBVER} BDBVER= ${PORTVERSION:R} BDBMAJ= ${BDBVER:R} CONFIGURE_ARGS= --enable-cxx --enable-stl \ --enable-compat185 --enable-dump185 \ --disable-tcl \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} \ --bindir=${PREFIX}/bin/${PORTNAME} CONFIGURE_SCRIPT= ../dist/configure GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} OPTIONS_DEFINE= CRYPTO L10N SQL JAVA DOCS OPTIONS_DEFAULT=CRYPTO CRYPTO_DESC= Cryptography support L10N_DESC= Localization support (EXPERIMENTAL) SQL_DESC= Enable SQL API (EXPERIMENTAL) .include .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*} # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 # also bug#205001 CONFIGURE_ARGS+= --enable-posixmutexes .endif .if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET+=install_docs docdir=${DOCSDIR} PORTDOCS= * .endif .if ${PORT_OPTIONS:MSQL} CONFIGURE_ARGS+= --enable-sql_codegen --enable-sql PLIST_SUB+= SQL="" libdb_sql= libdb_sql .else PLIST_SUB+= SQL="@comment " libdb_sql= .endif .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION= 1.6+ CONFIGURE_ARGS+= --enable-java CPPFLAGS+= "-I${JAVA_HOME}/include" CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" PLIST_SUB+= JAVA="" libdb_java= libdb_java .else PLIST_SUB+= JAVA="@comment " libdb_java= .endif .if ${PORT_OPTIONS:MCRYPTO} CONFIGURE_ARGS+= --with-cryptography=yes .else CONFIGURE_ARGS+= --with-cryptography=no .endif .if ${PORT_OPTIONS:ML10N} CONFIGURE_ARGS+= --enable-localization .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug --enable-umrw .endif post-patch: ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* post-install: .for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBMAJ}.so.0 ${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a ${CHMOD} a-w ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.a \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.la .endfor cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \ ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done .if ${PORT_OPTIONS:MDOCS} .for i in api_reference/TCL ${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i} .endfor .if empty(PORT_OPTIONS:MJAVA) ${RM} -r -f ${STAGEDIR}${DOCSDIR}/java .for i in gsg gsg_db_rep gsg_txn ${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA .endfor .endif .if empty(PORT_OPTIONS:MSQL) ${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql .endif .endif .include Index: head/databases/db6/Makefile =================================================================== --- head/databases/db6/Makefile (revision 413096) +++ head/databases/db6/Makefile (revision 413097) @@ -1,119 +1,119 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= db6 PORTVERSION= 6.1.26 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= # the distfiles aren't named db6-* but db-*: DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb -MAINTAINER= mandree@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= The Oracle Berkeley DB, revision ${BDBVER} LICENSE= AGPLv3 BDBVER= ${PORTVERSION:R} BDBMAJ= ${BDBVER:R} CONFIGURE_ARGS= --enable-cxx --enable-stl \ --enable-compat185 --enable-dump185 \ --disable-tcl \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} \ --bindir=${PREFIX}/bin/${PORTNAME} CONFIGURE_SCRIPT= ../dist/configure GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} OPTIONS_DEFINE= CRYPTO L10N SQL JAVA DOCS OPTIONS_DEFAULT=CRYPTO CRYPTO_DESC= Cryptography support L10N_DESC= Localization support (EXPERIMENTAL) SQL_DESC= Enable SQL API (EXPERIMENTAL) .include .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*} # db6 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 # and also bug #205001 CONFIGURE_ARGS+= --enable-posixmutexes .endif .if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET+=install_docs PORTDOCS= * .endif .if ${PORT_OPTIONS:MSQL} CONFIGURE_ARGS+= --enable-sql_codegen --enable-sql PLIST_SUB+= SQL="" libdb_sql= libdb_sql .else PLIST_SUB+= SQL="@comment " libdb_sql= .endif .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION= 1.6+ CONFIGURE_ARGS+= --enable-java CPPFLAGS+= "-I${JAVA_HOME}/include" CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" PLIST_SUB+= JAVA="" libdb_java= libdb_java .else PLIST_SUB+= JAVA="@comment " libdb_java= .endif .if ${PORT_OPTIONS:MCRYPTO} CONFIGURE_ARGS+= --with-cryptography=yes .else CONFIGURE_ARGS+= --with-cryptography=no .endif .if ${PORT_OPTIONS:ML10N} CONFIGURE_ARGS+= --enable-localization .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug --enable-umrw .endif post-patch: ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \ ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* \ ${WRKSRC}/../src/dbinc/atomic.h post-install: .for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a .endfor cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done .if ${PORT_OPTIONS:MDOCS} .for i in api_reference/TCL ${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i} .endfor .if empty(PORT_OPTIONS:MJAVA) ${RM} -r -f ${STAGEDIR}${DOCSDIR}/java .for i in gsg gsg_db_rep gsg_txn ${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA .endfor .endif .if empty(PORT_OPTIONS:MSQL) ${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql .endif .endif .include Index: head/deskutils/docear/Makefile =================================================================== --- head/deskutils/docear/Makefile (revision 413096) +++ head/deskutils/docear/Makefile (revision 413097) @@ -1,56 +1,56 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= docear PORTVERSION= 1.2.0 _suffix= _stable CATEGORIES= deskutils java MASTER_SITES= http://docear.org/downloads/${PORTVERSION}${_suffix}/ \ SF/docear/1.x/${PORTVERSION}${_suffix} \ LOCAL/mandree/${DIST_SUBDIR}/ DISTNAME= docear_linux DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}${_suffix} -MAINTAINER= mandree@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Mind Mapping tool with Reference, Library, and PDF Management LICENSE= GPLv2 USES= desktop-file-utils shared-mime-info USE_JAVA= yes JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ NO_BUILD= yes JDATADIR= ${JAVASHAREDIR}/${PORTNAME} icon= ${DATADIR}/${PORTNAME}-icon48x48.png WRKSRC= ${WRKDIR}/docear-1.2.0.0_stable_build291 SUB_FILES= docear.desktop post-patch: ${REINPLACE_CMD} -e 's/readlink -mn/readlink -n/g' \ -e 's,#!/bin/bash,#!/bin/sh,' \ ${WRKSRC}/docear.sh do-install: @${RM} -f ${WRKSRC}/docear.bat \ ${WRKSRC}/docear.exe \ ${WRKSRC}/*.bak # We can't install into $DOCSDIR or support disabling a DOCS option # since the documentation is an integral part of the installation, # such as online help via the program menus. ${MKDIR} ${STAGEDIR}${JDATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${JDATADIR}) ${PRINTF} '#!/bin/sh\nset -eu\nexport JAVA_HOME="%s"\ncd "%s"\nexec "%s" "$$@"\n' \ '${JAVA_HOME}' '${JDATADIR}' '${JDATADIR}/docear.sh' \ >${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${CHMOD} a=rx ${STAGEDIR}${JDATADIR}/docear.sh \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/docear48.png "${STAGEDIR}${icon}" ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xml ${STAGEDIR}${PREFIX}/share/mime/packages/ .include Index: head/sysutils/busybox/Makefile =================================================================== --- head/sysutils/busybox/Makefile (revision 413096) +++ head/sysutils/busybox/Makefile (revision 413097) @@ -1,61 +1,61 @@ # Created by: luigi@FreeBSD.org # $FreeBSD$ PORTNAME= busybox PORTVERSION= 1.24.1 CATEGORIES= sysutils misc shells MASTER_SITES= http://www.busybox.net/downloads/ LOCAL/mandree PATCH_SITES= http://www.busybox.net/downloads/fixes-${PORTVERSION}/ PATCH_DIST_STRIP= -p1 -MAINTAINER= mandree@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Busybox for FreeBSD LICENSE= GPLv2 BUILD_DEPENDS= gsed:textproc/gsed CONFLICTS_INSTALL= busybox-unstable-* PORTSCOUT= skipv:1.25.0 CFLAGS+= -fno-builtin-mempcpy # avoid -Wshadow warnings MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}" # findutils/find.c l. 752+, uses a GCC extension/invalid C code: USES= compiler:nestedfct cpe gmake tar:bzip2 PLIST_FILES= bin/busybox OPTIONS_DEFINE= DOCS STATIC STATIC_LDFLAGS= -static .include .if ${PORT_OPTIONS:MDOCS} USES+= perl5 USE_PERL5= build PORTDOCS= * .endif post-patch: ${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/scripts/gen_build_files.sh ${REINPLACE_CMD} -e 's///' \ ${WRKSRC}/libbb/appletlib.c \ ${WRKSRC}/shell/hush.c ${REINPLACE_CMD} -e 's///' \ ${WRKSRC}/scripts/basic/*.c do-configure: ${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} ${RM} -f ${STAGEDIR}${DOCSDIR}/.gitignore .endif .include