diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index 86f15406092..5a98edc807b 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -38,4 +38,10 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/cad/qelectrotech/pkg-plist b/cad/qelectrotech/pkg-plist index 2c12f1e0314..ff46afd03e1 100644 --- a/cad/qelectrotech/pkg-plist +++ b/cad/qelectrotech/pkg-plist @@ -684,11 +684,11 @@ share/mimelnk/application/x-qet-titleblock.desktop %%DATADIR%%/elements/10_electric/10_allpole/395_electronics&semiconductors/qet_directory %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/appareil_ferme_cle_prisonniere.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/appareil_ouvert_cle_prisonniere.elmt -%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt +%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_rentree_manoeuvre_libre.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_sorti.elmt -%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_%%QT_LIBDIR%%re_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt -%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_%%QT_LIBDIR%%re_pene_sorti.elmt -%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisioniere_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt +%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_libre_pene_rentree_manoeuvre_libre.elmt +%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_libre_pene_sorti.elmt +%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisioniere_pene_rentree_manoeuvre_libre.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisionniere_pene_rentree_manoeuvre_bloquee.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/contacteur_crm.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/contacteur_f_crm.elmt @@ -716,7 +716,7 @@ share/mimelnk/application/x-qet-titleblock.desktop %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/ligne_triphase.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/ligne_triphase_2.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/qet_directory -%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_%%QT_LIBDIR%%re.elmt +%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_libre.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_prisionniere.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/signal_capacitif.elmt %%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/transf_cm.elmt @@ -1682,7 +1682,7 @@ share/mimelnk/application/x-qet-titleblock.desktop %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta301.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta302.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta401.elmt -%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta%%QT_LIBDIR%%.elmt +%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xentalib.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/gv2me.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/lc1d.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/lc1k.elmt @@ -2404,7 +2404,7 @@ share/mimelnk/application/x-qet-titleblock.desktop %%DATADIR%%/elements/20_logic/40_flowchart/souspgm03.elmt %%DATADIR%%/elements/20_logic/40_flowchart/sur_page.elmt %%DATADIR%%/elements/20_logic/qet_directory -%%DATADIR%%/elements/30_hydraulic/21_tanks/bache_a_l_air_%%QT_LIBDIR%%re.elmt +%%DATADIR%%/elements/30_hydraulic/21_tanks/bache_a_l_air_libre.elmt %%DATADIR%%/elements/30_hydraulic/21_tanks/bache_pressurisee.elmt %%DATADIR%%/elements/30_hydraulic/21_tanks/qet_directory %%DATADIR%%/elements/30_hydraulic/31_control_valves/01_single_parts/11_actuation/bouton.elmt @@ -2811,7 +2811,7 @@ share/mimelnk/application/x-qet-titleblock.desktop %%DATADIR%%/elements/60_energy/11_water/schemas/grupo-seg-termo.elmt %%DATADIR%%/elements/60_energy/11_water/schemas/intercambiador.elmt %%DATADIR%%/elements/60_energy/11_water/schemas/llave-acometida.elmt -%%DATADIR%%/elements/60_energy/11_water/schemas/llave-equi%%QT_LIBDIR%%rado.elmt +%%DATADIR%%/elements/60_energy/11_water/schemas/llave-equilibrado.elmt %%DATADIR%%/elements/60_energy/11_water/schemas/llave-paso-regul.elmt %%DATADIR%%/elements/60_energy/11_water/schemas/llave-vivienda.elmt %%DATADIR%%/elements/60_energy/11_water/schemas/llavepaso.elmt @@ -3094,8 +3094,8 @@ share/mimelnk/application/x-qet-titleblock.desktop %%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_01.elmt %%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_3v_a_secteur_01.elmt %%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle.elmt -%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equi%%QT_LIBDIR%%rage_debimetre_01.elmt -%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equi%%QT_LIBDIR%%rage_ta_01.elmt +%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_debimetre_01.elmt +%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_ta_01.elmt %%DATADIR%%/elements/60_energy/qet_directory %%DATADIR%%/examples/741.qet %%DATADIR%%/examples/ArduinoLCD.qet diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index aed242b2ec6..d599c8232c1 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= DBD-mysql -PORTVERSION= 4.040 +PORTVERSION= 4.041 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/databases/p5-DBD-mysql/distinfo b/databases/p5-DBD-mysql/distinfo index e70d4e34436..efb23aa8338 100644 --- a/databases/p5-DBD-mysql/distinfo +++ b/databases/p5-DBD-mysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479732114 -SHA256 (DBD-mysql-4.040.tar.gz) = a3438bba3cce02b13870b146b9db76a519b98e978d9dfe8516a63daff2989040 -SIZE (DBD-mysql-4.040.tar.gz) = 149783 +TIMESTAMP = 1480439290 +SHA256 (DBD-mysql-4.041.tar.gz) = 4777de11c464b515db9da95c08c225900d0594b65ba3256982dc21f9f9379040 +SIZE (DBD-mysql-4.041.tar.gz) = 150508 diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 602ce111ee3..69037fe7d34 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -204,6 +204,10 @@ CONFIGURE_ARGS+=--with-krb5 # For testing files in FILESDIR .include +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + .if defined(SERVER_ONLY) pre-build: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile index 6cda6d8b0c0..cc9dc13d01c 100644 --- a/databases/py-alembic/Makefile +++ b/databases/py-alembic/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= alembic -PORTVERSION= 0.8.8 +PORTVERSION= 0.8.9 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-alembic/distinfo b/databases/py-alembic/distinfo index 132ab77e651..5c90dddbb3d 100644 --- a/databases/py-alembic/distinfo +++ b/databases/py-alembic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476770608 -SHA256 (alembic-0.8.8.tar.gz) = cd6f2192ca2307bfe2a2a61f8a261420addc59a09a6379a6550e0a15693b0b8a -SIZE (alembic-0.8.8.tar.gz) = 970125 +TIMESTAMP = 1480407925 +SHA256 (alembic-0.8.9.tar.gz) = 0932bed55a4546b8aa6f59b8ad8b92b0161e7bd46adc538d50afb1c96b3571c1 +SIZE (alembic-0.8.9.tar.gz) = 977728 diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile index ce855c75319..1573b0507f9 100644 --- a/deskutils/howm/Makefile +++ b/deskutils/howm/Makefile @@ -1,15 +1,13 @@ # $FreeBSD$ PORTNAME= howm -PORTVERSION= 1.4.2 +PORTVERSION= 1.4.3 CATEGORIES= deskutils MASTER_SITES= http://howm.sourceforge.jp/a/ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Write fragmentarily and read collectively -BROKEN= fails to build - GNU_CONFIGURE= yes USE_EMACS= yes ELISP= action-lock.el bcomp.el cheat-font-lock.el \ diff --git a/deskutils/howm/distinfo b/deskutils/howm/distinfo index f14b578105e..eaaa9ca7739 100644 --- a/deskutils/howm/distinfo +++ b/deskutils/howm/distinfo @@ -1,2 +1,3 @@ -SHA256 (howm-1.4.2.tar.gz) = 6d4683ff55573e4edefad8bc03ee2714c9f443151936903f0b5ad99d73e73e7f -SIZE (howm-1.4.2.tar.gz) = 544559 +TIMESTAMP = 1480165897 +SHA256 (howm-1.4.3.tar.gz) = fb7336e0a52df3d5fe72e1bbf4ffb57f1139757f6af2964ee62cc94b4729dcab +SIZE (howm-1.4.3.tar.gz) = 552747 diff --git a/deskutils/howm/files/patch-howm-vars.el b/deskutils/howm/files/patch-howm-vars.el index 57588532f0f..dc235cd564a 100644 --- a/deskutils/howm/files/patch-howm-vars.el +++ b/deskutils/howm/files/patch-howm-vars.el @@ -1,11 +1,11 @@ ---- howm-vars.el.orig 2011-08-23 20:48:27.000000000 +0900 -+++ howm-vars.el 2012-03-11 22:18:42.730947048 +0900 -@@ -679,7 +679,7 @@ - "*Command name for fgrep. +--- howm-vars.el.orig 2015-12-31 22:41:45.000000000 +0900 ++++ howm-vars.el 2016-11-26 22:46:32.596292000 +0900 +@@ -759,7 +759,7 @@ This variable is obsolete and may be removed in future.") (defvar howm-view-grep-default-option -- (labels ((ed (d) (concat "--exclude-dir=" d))) -+ (labels ((ed (d) (concat "--exclude=" d))) - (let* ((has-ed (condition-case nil - (eq 0 (call-process howm-view-grep-command nil nil nil - (ed "/") "--version")) + ;; "labels" causes a trouble in git-head emacs (d5e3922) [2015-01-31] +- (let* ((ed (lambda (d) (concat "--exclude-dir=" d))) ++ (let* ((ed (lambda (d) (concat "--exclude=" d))) + (has-ed (condition-case nil + (eq 0 (call-process howm-view-grep-command nil nil nil + (apply ed "/") "--version")) diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 42fb76b698a..c813c3d2570 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -3,7 +3,7 @@ PORTNAME= binutils PORTVERSION= 2.27 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= SOURCEWARE/binutils/releases diff --git a/devel/binutils/files/patch-bfd_elfnn-aarch64.c b/devel/binutils/files/patch-bfd_elfnn-aarch64.c new file mode 100644 index 00000000000..4967426b6fa --- /dev/null +++ b/devel/binutils/files/patch-bfd_elfnn-aarch64.c @@ -0,0 +1,28 @@ +--- bfd/elfnn-aarch64.c.orig 2016-11-20 12:04:44.613621000 +0000 ++++ bfd/elfnn-aarch64.c 2016-11-20 12:05:01.143334000 +0000 +@@ -4369,7 +4369,9 @@ + off = h->got.offset; + BFD_ASSERT (off != (bfd_vma) - 1); + if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h) +- || (bfd_link_pic (info) ++ || ((bfd_link_pic (info) ++ || (!bfd_link_relocatable (info) ++ && (info->export_dynamic || info->dynamic))) + && SYMBOL_REFERENCES_LOCAL (info, h)) + || (ELF_ST_VISIBILITY (h->other) + && h->root.type == bfd_link_hash_undefweak)) +@@ -8891,6 +8893,14 @@ + + h->root.u.def.section->output_section->vma + + h->root.u.def.section->output_offset); + } ++ else if (!bfd_link_relocatable (info) ++ && (info->export_dynamic || info->dynamic) ++ && SYMBOL_REFERENCES_LOCAL (info, h)) ++ { ++ BFD_ASSERT ((h->got.offset & 1) != 0); ++ rela.r_info = ELFNN_R_INFO (h->dynindx, AARCH64_R (GLOB_DAT)); ++ rela.r_addend = 0; ++ } + else + { + do_glob_dat: diff --git a/devel/elfkickers/Makefile b/devel/elfkickers/Makefile index 2323dc5793e..856bc416417 100644 --- a/devel/elfkickers/Makefile +++ b/devel/elfkickers/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= elfkickers -PORTVERSION= 3.0 -PORTREVISION= 2 +PORTVERSION= 3.1 CATEGORIES= devel sysutils MASTER_SITES= http://www.muppetlabs.com/~breadbox/pub/software/ DISTNAME= ELFkickers-${PORTVERSION} @@ -12,15 +11,16 @@ MAINTAINER= sbz@FreeBSD.org COMMENT= Collection of programs to manipulate ELF files LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake ELFBINS= ebfc elfls elftoc infect objres rebind sstrip PORTDOCS= COPYING Changelog README +OPTIONS_DEFINE= DOCS + post-patch: - @${GREP} -lR "\/elf.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's,linux/,,g' -e 's,asm/,,g' @${GREP} -lR "gcc" ${WRKSRC}/*/Makefile | ${XARGS} \ ${REINPLACE_CMD} -e 's,gcc,${CC},g' @@ -30,12 +30,18 @@ do-build: .endfor do-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - .for f in ${ELFBINS} ${INSTALL_SCRIPT} ${WRKSRC}/${f}/${f} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${f}/${f:S,$,.1,} ${STAGEDIR}${PREFIX}/man/man1 .endfor +post-install: +.for f in ${ELFBINS} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} +.endfor + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + .include diff --git a/devel/elfkickers/distinfo b/devel/elfkickers/distinfo index 97fc3f197f7..58f3288770f 100644 --- a/devel/elfkickers/distinfo +++ b/devel/elfkickers/distinfo @@ -1,2 +1,3 @@ -SHA256 (ELFkickers-3.0.tar.gz) = 8597dc38ecb1a352f86c5075608547f2c4dcd50f4ba89de70c5494cf6611c6aa -SIZE (ELFkickers-3.0.tar.gz) = 99527 +TIMESTAMP = 1480450986 +SHA256 (ELFkickers-3.1.tar.gz) = 6d663fb06dd723a078282937052368498e3860d3c42f0d765579d496e5f51a58 +SIZE (ELFkickers-3.1.tar.gz) = 101406 diff --git a/devel/elfkickers/files/patch-elfrw__elfrw.h b/devel/elfkickers/files/patch-elfrw__elfrw.h deleted file mode 100644 index 59b1a605099..00000000000 --- a/devel/elfkickers/files/patch-elfrw__elfrw.h +++ /dev/null @@ -1,27 +0,0 @@ ---- ./elfrw/elfrw.h.orig 2011-05-31 01:47:08.000000000 +0200 -+++ ./elfrw/elfrw.h 2011-06-08 12:16:37.000000000 +0200 -@@ -10,6 +10,24 @@ - #include - #include - -+#ifdef __FreeBSD__ -+typedef uint16_t Elf64_Section; -+ -+#define PT_GNU_STACK 0x6474e551 -+#define PT_GNU_RELRO 0x6474e552 -+ -+#if __FreeBSD_version < 700022 -+#define SHT_GNU_HASH 0x6ffffff6 -+#define EM_CRIS 76 -+#define EM_M32R 88 -+#define EM_MN10300 89 -+#endif -+ -+#define ELFCLASSNUM 3 -+#define ELFDATANUM 3 -+#define EV_NUM 2 -+#endif -+ - /* - * The initialization functions. Call one of these to set the flavor - * of ELF structures to translate to and from. The library can be diff --git a/devel/elfkickers/files/patch-elftoc__mknames.c b/devel/elfkickers/files/patch-elftoc__mknames.c deleted file mode 100644 index 8d23072b3eb..00000000000 --- a/devel/elfkickers/files/patch-elftoc__mknames.c +++ /dev/null @@ -1,25 +0,0 @@ ---- ./elftoc/mknames.c.orig 2011-06-08 12:17:12.000000000 +0200 -+++ ./elftoc/mknames.c 2011-06-08 12:20:02.000000000 +0200 -@@ -108,17 +108,19 @@ - _("68K_", EM_68K), - _("ALPHA_", EM_ALPHA), - _("ARM_", EM_ARM), -- _("CRIS_", EM_CRIS), - __("HP_", "PARISC_", EM_PARISC), - __("IA_64_", "IA64_", EM_IA_64), -- _("M32R_", EM_M32R), - _("MIPS_", EM_MIPS), -- _("MN10300_", EM_MN10300), - _("PPC_", EM_PPC), - _("PPC64_", EM_PPC64), - _("SH_", EM_SH), - _("SPARC_", EM_SPARC), - _("X86_64_", EM_X86_64), -+#if __FreeBSD_cc_version_ > 700022 -+ _("CRIS_", EM_CRIS), -+ _("M32R_", EM_M32R), -+ _("MN10300_", EM_MN10300) -+#endif - }; - - #define machineidcount ((int)(sizeof machineids / sizeof *machineids)) diff --git a/devel/elfkickers/files/patch-elftoc__outbase.h b/devel/elfkickers/files/patch-elftoc__outbase.h deleted file mode 100644 index 12d0e0cd37e..00000000000 --- a/devel/elfkickers/files/patch-elftoc__outbase.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ./elftoc/outbase.h.orig 2011-05-22 20:46:29.000000000 +0200 -+++ ./elftoc/outbase.h 2011-06-08 12:16:37.000000000 +0200 -@@ -7,6 +7,10 @@ - #ifndef _outbase_h_ - #define _outbase_h_ - -+#ifdef __FreeBSD__ -+#define NT_AUXV 6 -+#endif -+ - /* Set the current output file. Call this before calling any output - * functions. (The FILE* argument is given as a void* so as to not - * include stdio.h here.) diff --git a/devel/elfkickers/files/patch-elftoc__pieces.c b/devel/elfkickers/files/patch-elftoc__pieces.c deleted file mode 100644 index cd0a109372a..00000000000 --- a/devel/elfkickers/files/patch-elftoc__pieces.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./elftoc/pieces.c.orig 2011-05-26 03:25:14.000000000 +0200 -+++ ./elftoc/pieces.c 2011-06-08 12:16:37.000000000 +0200 -@@ -16,6 +16,10 @@ - #include "out.h" - #include "pieces.h" - -+#ifdef __FreeBSD__ -+typedef uint64_t Elf32_Xword; -+#endif -+ - /* Flags used to insert warnings in the generated source code. - */ - #define PW_MISALIGNED 0x0001 /* piece misaligned for original type */ diff --git a/devel/elfkickers/files/patch-elftoc__readelf.h b/devel/elfkickers/files/patch-elftoc__readelf.h deleted file mode 100644 index 8655c83ab6d..00000000000 --- a/devel/elfkickers/files/patch-elftoc__readelf.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ./elftoc/readelf.h.orig 2011-05-22 20:46:29.000000000 +0200 -+++ ./elftoc/readelf.h 2011-06-08 12:16:37.000000000 +0200 -@@ -7,6 +7,12 @@ - #ifndef _readelf_h_ - #define _readelf_h_ - -+#ifdef __FreeBSD__ -+#define ELFCLASSNUM 3 -+#define ELFDATANUM 3 -+#define EV_NUM 2 -+#endif -+ - /* Read all of the basic headers from the file image (namely the ELF - * header, the program segment header table, and the section header - * table). False is returned if the file could not be parsed as an ELF diff --git a/devel/liblxqt/pkg-plist b/devel/liblxqt/pkg-plist index fbb4d9d4efe..f6f952f4c64 100644 --- a/devel/liblxqt/pkg-plist +++ b/devel/liblxqt/pkg-plist @@ -31,9 +31,9 @@ %%LXQT_INCLUDEDIR%%/LXQt/lxqtsettings.h %%LXQT_INCLUDEDIR%%/LXQt/lxqtsingleapplication.h %%LXQT_INCLUDEDIR%%/LXQt/lxqttranslator.h -%%QT_LIBDIR%%/liblxqt.so -%%QT_LIBDIR%%/liblxqt.so.0 -%%QT_LIBDIR%%/liblxqt.so.%%VERSION%% +lib/liblxqt.so +lib/liblxqt.so.0 +lib/liblxqt.so.%%VERSION%% libdata/pkgconfig/lxqt.pc share/cmake/lxqt/find-modules/FindXdgUserDirs.cmake share/cmake/lxqt/lxqt-config-version.cmake diff --git a/devel/libqtxdg/pkg-plist b/devel/libqtxdg/pkg-plist index 9ee178fb746..92775e8d377 100644 --- a/devel/libqtxdg/pkg-plist +++ b/devel/libqtxdg/pkg-plist @@ -19,12 +19,12 @@ include/qt5xdg/xdgmimetype.h include/qt5xdg/xmlhelper.h include/qt5xdgiconloader/%%VERSION%%/private/xdgiconloader/xdgiconloader_p.h include/qt5xdgiconloader/xdgiconloader_export.h -%%QT_LIBDIR%%/libQt5Xdg.so -%%QT_LIBDIR%%/libQt5Xdg.so.2 -%%QT_LIBDIR%%/libQt5Xdg.so.%%VERSION%% -%%QT_LIBDIR%%/libQt5XdgIconLoader.so -%%QT_LIBDIR%%/libQt5XdgIconLoader.so.2 -%%QT_LIBDIR%%/libQt5XdgIconLoader.so.%%VERSION%% +lib/libQt5Xdg.so +lib/libQt5Xdg.so.2 +lib/libQt5Xdg.so.%%VERSION%% +lib/libQt5XdgIconLoader.so +lib/libQt5XdgIconLoader.so.2 +lib/libQt5XdgIconLoader.so.%%VERSION%% libdata/pkgconfig/Qt5Xdg.pc libdata/pkgconfig/Qt5XdgIconLoader.pc share/cmake/qt5xdg/qt5xdg-config-version.cmake diff --git a/devel/p5-AnyEvent-Filesys-Notify/Makefile b/devel/p5-AnyEvent-Filesys-Notify/Makefile index e5de3f92753..02e689c8115 100644 --- a/devel/p5-AnyEvent-Filesys-Notify/Makefile +++ b/devel/p5-AnyEvent-Filesys-Notify/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= AnyEvent-Filesys-Notify -PORTVERSION= 1.19 +PORTVERSION= 1.21 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MGRIMES diff --git a/devel/p5-AnyEvent-Filesys-Notify/distinfo b/devel/p5-AnyEvent-Filesys-Notify/distinfo index dc9f09b93e2..41aa545618e 100644 --- a/devel/p5-AnyEvent-Filesys-Notify/distinfo +++ b/devel/p5-AnyEvent-Filesys-Notify/distinfo @@ -1,2 +1,3 @@ -SHA256 (AnyEvent-Filesys-Notify-1.19.tar.gz) = ed39c8774f4963954e9db750ea25bf2dedac989d5deff6c26bb47e332ef3a8d0 -SIZE (AnyEvent-Filesys-Notify-1.19.tar.gz) = 25443 +TIMESTAMP = 1480400809 +SHA256 (AnyEvent-Filesys-Notify-1.21.tar.gz) = e8c73f003071b4240f719a7755ac78ebd72fb33b56499c97cc9b029d058e96b4 +SIZE (AnyEvent-Filesys-Notify-1.21.tar.gz) = 34271 diff --git a/devel/p5-App-FatPacker/Makefile b/devel/p5-App-FatPacker/Makefile index 5c7fc9c0318..3d23b7c1803 100644 --- a/devel/p5-App-FatPacker/Makefile +++ b/devel/p5-App-FatPacker/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= App-FatPacker -PORTVERSION= 0.010004 +PORTVERSION= 0.010005 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-App-FatPacker/distinfo b/devel/p5-App-FatPacker/distinfo index 116bc2b2fb6..cce01d1d648 100644 --- a/devel/p5-App-FatPacker/distinfo +++ b/devel/p5-App-FatPacker/distinfo @@ -1,2 +1,3 @@ -SHA256 (App-FatPacker-0.010004.tar.gz) = 542b4c7100f46cb179b88d93ee5b78140cbd7ba816311b99e7d676c34d732992 -SIZE (App-FatPacker-0.010004.tar.gz) = 11293 +TIMESTAMP = 1480402923 +SHA256 (App-FatPacker-0.010005.tar.gz) = 5661fe0f1cea0548ab7ad1040ffaf469699a622ff6780ff3240f6868b088bfd3 +SIZE (App-FatPacker-0.010005.tar.gz) = 11507 diff --git a/devel/p5-App-cpanminus/Makefile b/devel/p5-App-cpanminus/Makefile index 8be3e1c0c46..93239844327 100644 --- a/devel/p5-App-cpanminus/Makefile +++ b/devel/p5-App-cpanminus/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= App-cpanminus -PORTVERSION= 1.7039 +PORTVERSION= 1.7042 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MIYAGAWA diff --git a/devel/p5-App-cpanminus/distinfo b/devel/p5-App-cpanminus/distinfo index b8f891c889e..237f6ef043d 100644 --- a/devel/p5-App-cpanminus/distinfo +++ b/devel/p5-App-cpanminus/distinfo @@ -1,2 +1,3 @@ -SHA256 (App-cpanminus-1.7039.tar.gz) = 09bcd8303fcf9866d7bb9ff5c7df5f8d49d0cbe3d69c42446860ed1fc17064e4 -SIZE (App-cpanminus-1.7039.tar.gz) = 316814 +TIMESTAMP = 1480403345 +SHA256 (App-cpanminus-1.7042.tar.gz) = 9da50e155df72bce55cb69f51f1dbb4b62d23740fb99f6178bb27f22ebdf8a46 +SIZE (App-cpanminus-1.7042.tar.gz) = 317681 diff --git a/devel/qbs/files/patch-git_5c1183a b/devel/qbs/files/patch-git_5c1183a new file mode 100644 index 00000000000..6860cfc8b34 --- /dev/null +++ b/devel/qbs/files/patch-git_5c1183a @@ -0,0 +1,36 @@ +This fixes a build failure with libc++ 3.9.0 (FreeBSD 12+): + +In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/api/internaljobs.cpp:39: +In file included from /wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/buildgraph/executor.h:45: +/usr/include/c++/v1/queue:400:5: error: static_assert failed "" + static_assert((is_same<_Tp, value_type>::value), "" ); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/wrkdirs/usr/ports/devel/qbs/work/qbs-src-1.6.1/src/lib/corelib/buildgraph/executor.h:156:12: note: in instantiation of template class 'std::__1::priority_queue >, qbs::Internal::Executor::ComparePriority>' requested here + Leaves m_leaves; + +commit 5c1183aa377ae8de487d5541360369ebd2ee0f6b +Author: Christian Kandeler +Date: Mon Nov 28 14:54:43 2016 +0100 + + Executor: Fix undefined behavior + + C++17 introduces new requirements on the template parameters of + std::priority_queue. + + Task-number: QBS-1051 + Change-Id: I9a22b8f2d3c1f0bd532b0a76f5d2a16bebc303f7 + Reviewed-by: Raphael Kubo da Costa + Reviewed-by: Joerg Bornemann + +--- src/lib/corelib/buildgraph/executor.h ++++ src/lib/corelib/buildgraph/executor.h +@@ -107,7 +107,8 @@ private: + bool operator() (const BuildGraphNode *x, const BuildGraphNode *y) const; + }; + +- typedef std::priority_queue, ComparePriority> Leaves; ++ typedef std::priority_queue, ++ ComparePriority> Leaves; + + void doBuild(); + void prepareAllNodes(); diff --git a/devel/qscintilla2-qt5/pkg-plist b/devel/qscintilla2-qt5/pkg-plist index 903ead92c6c..5aa468f614a 100644 --- a/devel/qscintilla2-qt5/pkg-plist +++ b/devel/qscintilla2-qt5/pkg-plist @@ -48,10 +48,10 @@ %%QT_INCDIR%%/Qsci/qsciscintillabase.h %%QT_INCDIR%%/Qsci/qscistyle.h %%QT_INCDIR%%/Qsci/qscistyledtext.h -%%QT_LIBDIR%%/libqscintilla2-qt5.so -%%QT_LIBDIR%%/libqscintilla2-qt5.so.12 -%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0 -%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0.1 +lib/libqscintilla2-qt5.so +lib/libqscintilla2-qt5.so.12 +lib/libqscintilla2-qt5.so.12.0 +lib/libqscintilla2-qt5.so.12.0.1 %%QT_MKSPECDIR%%/features/qscintilla2.prf %%QT_DATADIR%%/qsci/api/python/Python-2.4.api %%QT_DATADIR%%/qsci/api/python/Python-2.5.api diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist index dc5eb1a0768..54fa1df1aec 100644 --- a/devel/qscintilla2/pkg-plist +++ b/devel/qscintilla2/pkg-plist @@ -48,10 +48,10 @@ %%QT_INCDIR%%/Qsci/qsciscintillabase.h %%QT_INCDIR%%/Qsci/qscistyle.h %%QT_INCDIR%%/Qsci/qscistyledtext.h -%%QT_LIBDIR%%/libqscintilla2.so -%%QT_LIBDIR%%/libqscintilla2.so.12 -%%QT_LIBDIR%%/libqscintilla2.so.12.0 -%%QT_LIBDIR%%/libqscintilla2.so.12.0.1 +lib/qt4/libqscintilla2.so +lib/qt4/libqscintilla2.so.12 +lib/qt4/libqscintilla2.so.12.0 +lib/qt4/libqscintilla2.so.12.0.1 %%QT_MKSPECDIR%%/features/qscintilla2.prf share/qt4/qsci/api/python/Python-2.4.api share/qt4/qsci/api/python/Python-2.5.api diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index cf3281ee30c..3d86173e61b 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -2,10 +2,10 @@ %%QT_INCDIR%%/QtAssistant/QtAssistant %%QT_INCDIR%%/QtAssistant/qassistantclient.h %%QT_INCDIR%%/QtAssistant/qassistantclient_global.h -%%QT_LIBDIR%%/libQtAssistantClient.prl -%%QT_LIBDIR%%/libQtAssistantClient.so -%%QT_LIBDIR%%/libQtAssistantClient.so.4 -%%QT_LIBDIR%%/libQtAssistantClient.so.4.6 -%%QT_LIBDIR%%/libQtAssistantClient.so.4.6.3 +lib/qt4/libQtAssistantClient.prl +lib/qt4/libQtAssistantClient.so +lib/qt4/libQtAssistantClient.so.4 +lib/qt4/libQtAssistantClient.so.4.6 +lib/qt4/libQtAssistantClient.so.4.6.3 libdata/pkgconfig/QtAssistantClient.pc %%QT_MKSPECDIR%%/features/assistant.prf diff --git a/dns/credns/Makefile b/dns/credns/Makefile index 7cc9ea7af37..544ca152ddc 100644 --- a/dns/credns/Makefile +++ b/dns/credns/Makefile @@ -59,4 +59,10 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index 103d71fc836..5a26743b298 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -18,10 +18,10 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs LIB_DEPENDS= libboost_context.so:devel/boost-libs BROKEN_sparc64= Does not compile on sparc64 -BROKEN_FreeBSD_9= linker error -USES= compiler:c++11-lib cpe gmake pkgconfig ssl tar:bzip2 +USES= compiler:c++11-lib cpe gmake localbase pkgconfig ssl tar:bzip2 GNU_CONFIGURE= YES +CXXFLAGS+= -D_GLIBCXX_USE_C99 CPE_VENDOR= powerdns @@ -54,4 +54,15 @@ USERS= pdns_recursor GROUPS= pdns .endif -.include +.include + +.if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports +.endif + +.if ${OSVERSION} < 1000000 && ${ARCH} == i386 +#BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops +LDFLAGS+= -latomic +.endif + +.include diff --git a/dns/validns/Makefile b/dns/validns/Makefile index 7f5b500fefc..8873cb930d4 100644 --- a/dns/validns/Makefile +++ b/dns/validns/Makefile @@ -37,4 +37,10 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/finance/prestashop/Makefile b/finance/prestashop/Makefile index 7f08db8f07d..526634a1029 100644 --- a/finance/prestashop/Makefile +++ b/finance/prestashop/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= prestashop -PORTVERSION= 1.7.0.1 +PORTVERSION= 1.7.0.2 CATEGORIES= finance www MASTER_SITES= http://www.prestashop.com/download/old/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/finance/prestashop/distinfo b/finance/prestashop/distinfo index c2d6f5fb576..1bbbd25a77b 100644 --- a/finance/prestashop/distinfo +++ b/finance/prestashop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479804376 -SHA256 (prestashop_1.7.0.1.zip) = d452a85b1a17567b66c8dcfba2c65c9457ed9df3cc8f05598db9eac1c6fc8382 -SIZE (prestashop_1.7.0.1.zip) = 55426387 +TIMESTAMP = 1480422870 +SHA256 (prestashop_1.7.0.2.zip) = 9f762be0282d913500853a300f3a442a8ab9312e016412fdae6dc9b82ff51d6f +SIZE (prestashop_1.7.0.2.zip) = 55631336 diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 2cd63afc9dc..4478256ca02 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -64,4 +64,10 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index b9ba7a89b03..0773c22558d 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -171,6 +171,10 @@ CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .include +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + .if !defined(_BUILDING_PROFTPD_MODULE) .if empty(ICONV_PREFIX) diff --git a/graphics/gle-graphics/pkg-plist b/graphics/gle-graphics/pkg-plist index a55f6eaefe9..152285a7a29 100644 --- a/graphics/gle-graphics/pkg-plist +++ b/graphics/gle-graphics/pkg-plist @@ -1,7 +1,7 @@ -%%QT_BINDIR%%/gle -%%QT_BINDIR%%/glebtool -%%QT_BINDIR%%/manip -%%QT_BINDIR%%/qgle +bin/gle +bin/glebtool +bin/manip +bin/qgle lib/libgle-graphics-4.2.4c.so libdata/pkgconfig/gle-graphics.pc man/man1/gle.1.gz diff --git a/irc/bip/Makefile b/irc/bip/Makefile index 5cd1fa7a405..690dffbc563 100644 --- a/irc/bip/Makefile +++ b/irc/bip/Makefile @@ -45,4 +45,10 @@ post-install-EXAMPLES-on: ${INSTALL_DATA} ${WRKSRC}/samples/${i} ${STAGEDIR}${EXAMPLESDIR} .endfor -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index 352930985d6..52ebd2a6543 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -74,4 +74,10 @@ post-patch: cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .endif -.include +.include + +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile index b0c376a8af4..6a837ce8876 100644 --- a/lang/ruby22/Makefile +++ b/lang/ruby22/Makefile @@ -79,6 +79,10 @@ CPE_UPDATE= p${RUBY_PATCHLEVEL} .include +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + # PORTEPOCH/PORTREVISION hack .if ${PORTEPOCH} != 0 diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index f55347eb815..0a4069a0360 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -77,6 +77,10 @@ USE_OPENSSL= no .include +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + THREADS_CONFIGURE_WITH= pthread MOUSE_CONFIGURE_ENABLE= mouse NLS_CONFIGURE_ENABLE= nls diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 962fcb7d499..bb1da69b150 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -92,4 +92,10 @@ post-install-X11-off: ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index dd3aa5cb7f6..21fadf29b49 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -41,4 +41,10 @@ post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} -.include +.include + +.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/mail/panda-cclient/Makefile b/mail/panda-cclient/Makefile index c69db209beb..8af8d8a3022 100644 --- a/mail/panda-cclient/Makefile +++ b/mail/panda-cclient/Makefile @@ -35,6 +35,10 @@ PKGMESSAGE= pkg-message-ssl .include +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + USE_LDCONFIG= yes ALL_TARGET= bsf .if ! ${PORT_OPTIONS:MSSL} diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index cee9c152b41..6eaf051c3f1 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -3,7 +3,7 @@ PORTNAME= procmail PORTVERSION= 3.22 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail MASTER_SITES= ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \ ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \ @@ -30,7 +30,7 @@ PORTEXAMPLES= 1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \ advanced dirname forward local_procmail_lmtp.m4 mailstat post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config.h ${WRKSRC}/src/autoconf # Allow parallel builds (-jX) to work @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|' diff --git a/mail/procmail/files/patch-config.h b/mail/procmail/files/patch-config.h index b5bc1b48f42..7c54253b1c1 100644 --- a/mail/procmail/files/patch-config.h +++ b/mail/procmail/files/patch-config.h @@ -26,12 +26,12 @@ system mailbox. This also must be an absolute path */ -#define ETCRC "/etc/procmailrc" /* optional global procmailrc startup -+#define ETCRC "%%PREFIX%%/etc/procmailrc" /* optional global procmailrc startup ++#define ETCRC "/usr/local/etc/procmailrc" /* optional global procmailrc startup file (will only be read if procmail is started with no rcfile on the command line). */ -#define ETCRCS "/etc/procmailrcs/" /* optional trusted path prefix for -+#define ETCRCS "%%PREFIX%%/etc/procmailrcs/" /* optional trusted path prefix for ++#define ETCRCS "/usr/local/etc/procmailrcs/" /* optional trusted path prefix for rcfiles which will be executed with the uid of the owner of the rcfile (this only happens if procmail is called with the -m option, without variable assignments on the command diff --git a/mail/procmail/files/patch-src-autoconf b/mail/procmail/files/patch-src-autoconf index ef615cb599b..41ab653bd40 100644 --- a/mail/procmail/files/patch-src-autoconf +++ b/mail/procmail/files/patch-src-autoconf @@ -18,3 +18,15 @@ if $MAKE _autotst >$DEVNULL 2>&1 test -f _autotst then +@@ -1491,6 +1493,11 @@ + fi + done + ++case ":$lpath:" in ++ *:/usr/local/bin:*) ;; ++ *) lpath="$lpath:/usr/local/bin" ;; ++esac ++ + echo "#define defPATH \"PATH=\$HOME/bin:$lpath\"" >>$ACONF + echo "#define defSPATH \"PATH=$lpath\"" >>$ACONF + diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile index 8ffd128c723..ca21753f12a 100644 --- a/mail/spamd/Makefile +++ b/mail/spamd/Makefile @@ -53,6 +53,10 @@ OPTIONS_DEFINE= DOCS .include +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} diff --git a/math/R/Makefile b/math/R/Makefile index e4c5cd8be1a..12891b8b690 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -3,7 +3,7 @@ PORTNAME= R PORTVERSION= 3.3.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} @@ -65,7 +65,7 @@ ATLAS_VARS= MANUAL_PACKAGE_BUILD=\ CAIROPANGO_IMPLIES= X11 CAIROPANGO_CONFIGURE_WITH=cairo CAIROPANGO_USES= gettext jpeg pkgconfig -CAIROPANGO_USE= gnome=pango,cairo +CAIROPANGO_USE= GNOME=pango,cairo GHOSTSCRIPT_IMPLIES= X11 GHOSTSCRIPT_USES= ghostscript ICU_CONFIGURE_WITH= ICU @@ -81,7 +81,11 @@ LDOUBLE_CONFIGURE_ENABLE=long-double LETTER_CONFIGURE_ENV= R_PAPERSIZE=letter LIBR_CONFIGURE_ENABLE= R-shlib LTO_CONFIGURE_ENABLE= lto -LTO_USE= gcc=yes +LTO_CONFIGURE_ENV= AR="${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT:S/.//g}" \ + RANLIB="${LOCALBASE}/bin/gcc-ranlib${GCC_DEFAULT:S/.//g}" +LTO_USE= GCC=yes +LTO_VARS= BINUTILS="ADDR2LINE AS CPPFILT GPROF LD NM OBJCOPY \ + OBJDUMP READELF SIZE STRINGS" MEMPROF_CONFIGURE_ENABLE=memory-profiling NETLIB_USES= blaslapack:netlib NETLIB_CONFIGURE_ON= --disable-BLAS-shlib @@ -90,7 +94,7 @@ NLS_USES= gettext OPENBLAS_USES= blaslapack:openblas OPENBLAS_CONFIGURE_ON= --disable-BLAS-shlib OPENMP_CONFIGURE_ENABLE=openmp -OPENMP_USE= compiler:openmp +OPENMP_USES= compiler:openmp PNG_IMPLIES= X11 PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= libpng @@ -115,33 +119,9 @@ TIFF_CONFIGURE_WITH= libtiff X11_CONFIGURE_WITH= x X11_USE= xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt -R_SOVERSION= 1 -RBLAS_SOVERSION= 2 -RLAPACK_SOVERSION= 4 - -PLIST_SUB= R_SOVERSION="${R_SOVERSION}" \ - RBLAS_SOVERSION="${RBLAS_SOVERSION}" \ - RLAPACK_SOVERSION="${RLAPACK_SOVERSION}" - -.include -.include "compiler.mk" - -.if ${PORT_OPTIONS:MLIBR} || ${PORT_OPTIONS:MRBLAS} -USE_LDCONFIG= ${PREFIX}/lib/R/lib -.endif - post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure -## TODO: Add missing soname and soversion to shared libraries -post-install: -.for L in R Rblas Rlapack - if [ -d ${STAGEDIR}${PREFIX}/lib/R/lib ]; then \ - cd ${STAGEDIR}${PREFIX}/lib/R/lib; \ - if [ -f lib${L}.so ]; then \ - ${LN} -sf lib${L}.so lib${L}.so.${${L:tu}_SOVERSION}; \ - fi; \ - fi -.endfor - -.include +.include +.include "compiler.mk" +.include diff --git a/math/R/pkg-plist b/math/R/pkg-plist index 5fac0bae859..2cb5ab06b83 100644 --- a/math/R/pkg-plist +++ b/math/R/pkg-plist @@ -101,11 +101,8 @@ lib/R/include/Rmath.h lib/R/include/Rversion.h lib/R/include/S.h %%RBLAS%%lib/R/lib/libRblas.so -%%RBLAS%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%% %%RBLAS%%lib/R/lib/libRlapack.so -%%RBLAS%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%% %%LIBR%%lib/R/lib/libR.so -%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%% lib/R/library/KernSmooth/DESCRIPTION lib/R/library/KernSmooth/INDEX lib/R/library/KernSmooth/Meta/Rd.rds diff --git a/math/octave-forge-interval/files/patch-mpfr__to__string__d.cc b/math/octave-forge-interval/files/patch-mpfr__to__string__d.cc index 110ec181d5f..acc19a5addc 100644 --- a/math/octave-forge-interval/files/patch-mpfr__to__string__d.cc +++ b/math/octave-forge-interval/files/patch-mpfr__to__string__d.cc @@ -9,3 +9,21 @@ std::numeric_limits ::min_exponent - 1 - exponent); +@@ -219,7 +219,7 @@ DEFUN_DLD (mpfr_to_string_d, args, nargo + + // shift mantissa by 32 bits to format the first part + // sprintf (... "%x" ...) requires an unsigned 4-byte int +- mantissa *= std::pow (2.0, sizeof (uint32_t) * 8); ++ mantissa *= uint64_t (1) << (sizeof (uint32_t) * 8); + uint32_t first_part = static_cast (mantissa); + + // remove first mantissa part +@@ -227,7 +227,7 @@ DEFUN_DLD (mpfr_to_string_d, args, nargo + + // shift mantissa by remaining 20 bits such that + // it is an integer +- mantissa *= std::pow (2.0, ++ mantissa *= uint64_t (1) << ( + std::numeric_limits + ::digits - 1 - 32); + uint32_t second_part = static_cast (mantissa); diff --git a/math/vtk6/pkg-plist b/math/vtk6/pkg-plist index 6c9a2b70866..cc84b2e8794 100644 --- a/math/vtk6/pkg-plist +++ b/math/vtk6/pkg-plist @@ -825,7 +825,7 @@ %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkGUISupportQtWebkit.cmake %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkRenderingQt.cmake %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkViewsQt.cmake -%%SHARED%%%%DESIGNER%%%%QT_LIBDIR%%/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so +%%SHARED%%%%DESIGNER%%lib/qt4/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelGeometryJava.so %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelMPIJava.so %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkIOMPIImageJava.so diff --git a/misc/seabios/Makefile b/misc/seabios/Makefile index 80e15388646..9678edb71db 100644 --- a/misc/seabios/Makefile +++ b/misc/seabios/Makefile @@ -11,7 +11,8 @@ COMMENT= Open source implementation of a 16bit X86 BIOS LICENSE= LGPL3 -BROKEN_powerpc64= Does not build +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= specific to x86 USES= gmake python:build diff --git a/multimedia/dvbcut/pkg-plist b/multimedia/dvbcut/pkg-plist index 08808d9e528..26521793675 100644 --- a/multimedia/dvbcut/pkg-plist +++ b/multimedia/dvbcut/pkg-plist @@ -1,4 +1,3 @@ -@comment %%QT_BINDIR%%/dvbcut bin/dvbcut share/applications/dvbcut.desktop share/mime/packages/dvbcut.xml diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index b34647c236a..3f1343c55ea 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -64,7 +64,7 @@ FFMPEG_CFLAGS_OFF+=-msse .if ${ARCH} == aarch64 || ${ARCH} == armv6 CONFIGURE_ENV+= ASFLAGS=-no-integrated-as -CFLAGS= -no-integrated-as +CFLAGS+= -no-integrated-as BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin diff --git a/multimedia/gstreamer-qt4/pkg-plist b/multimedia/gstreamer-qt4/pkg-plist index f099835fee0..d46d2e36df8 100644 --- a/multimedia/gstreamer-qt4/pkg-plist +++ b/multimedia/gstreamer-qt4/pkg-plist @@ -123,8 +123,8 @@ lib/libQtGStreamerUi-%%GST_VERSION%%.so.%%VERSION%% lib/libQtGStreamerUtils-%%GST_VERSION%%.so lib/libQtGStreamerUtils-%%GST_VERSION%%.so.0 lib/libQtGStreamerUtils-%%GST_VERSION%%.so.%%VERSION%% -%%QT_LIBDIR%%/imports/QtGStreamer/libQtGStreamerQuick1.so -%%QT_LIBDIR%%/imports/QtGStreamer/qmldir +lib/qt4/imports/QtGStreamer/libQtGStreamerQuick1.so +lib/qt4/imports/QtGStreamer/qmldir libdata/pkgconfig/QtGLib-2.0.pc libdata/pkgconfig/QtGStreamer-%%GST_VERSION%%.pc libdata/pkgconfig/QtGStreamerUi-%%GST_VERSION%%.pc diff --git a/multimedia/librtmp/Makefile b/multimedia/librtmp/Makefile index 10b80652147..881b352130f 100644 --- a/multimedia/librtmp/Makefile +++ b/multimedia/librtmp/Makefile @@ -18,4 +18,10 @@ CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} WRKSRC= ${WRKDIR}/${DISTNAME}/librtmp -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist index ea28945103e..6a7150c6611 100644 --- a/multimedia/phonon/pkg-plist +++ b/multimedia/phonon/pkg-plist @@ -186,8 +186,8 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in %%QT_PREFIX%%/%%QT_INCDIR%%/Phonon %%QT_PREFIX%%/%%QT_INCDIR%%/phonon -%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so -%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so.4 -%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so -%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so.4 +%%QT_PREFIX%%/lib/qt4/libphonon.so +%%QT_PREFIX%%/lib/qt4/libphonon.so.4 +%%QT_PREFIX%%/lib/qt4/libphononexperimental.so +%%QT_PREFIX%%/lib/qt4/libphononexperimental.so.4 %%QT_PREFIX%%/%%QT_MKSPECDIR%%/modules/qt_phonon.pri diff --git a/multimedia/qt4-mobility/pkg-plist b/multimedia/qt4-mobility/pkg-plist index e387c082143..00cb15c33a4 100644 --- a/multimedia/qt4-mobility/pkg-plist +++ b/multimedia/qt4-mobility/pkg-plist @@ -5,14 +5,14 @@ %%BEARER%%%%QT_INCDIR%%/QtMobility/qlatin1constant.h %%BEARER%%%%QT_INCDIR%%/QtMobility/qmalgorithms.h %%BEARER%%%%QT_INCDIR%%/QtMobility/qmobilityglobal.h -%%BEARER%%%%QT_LIBDIR%%/libQtBearer.prl -%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so -%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1 -%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2 -%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2.2 +%%BEARER%%lib/qt4/libQtBearer.prl +%%BEARER%%lib/qt4/libQtBearer.so +%%BEARER%%lib/qt4/libQtBearer.so.1 +%%BEARER%%lib/qt4/libQtBearer.so.1.2 +%%BEARER%%lib/qt4/libQtBearer.so.1.2.2 %%BEARER%%%%QT_MKSPECDIR%%/features/mobility.prf %%BEARER%%%%QT_MKSPECDIR%%/features/mobilityconfig.prf -%%CONNECTIVITY%%%%QT_BINDIR%%/ndefhandlergen +%%CONNECTIVITY%%bin/ndefhandlergen %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothAddress %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceDiscoveryAgent %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceInfo @@ -75,11 +75,11 @@ %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/qrfcommsocket.h %%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/libdeclarative_connectivity.so %%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/qmldir -%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.prl -%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so -%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1 -%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2 -%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2.2 +%%CONNECTIVITY%%lib/qt4/libQtConnectivity.prl +%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so +%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1 +%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2 +%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2.2 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContact %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAbstractRequest %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAction @@ -218,11 +218,11 @@ %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qcontacturl.h %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontacts.h %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontactsglobal.h -%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.prl -%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so -%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1 -%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2 -%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2.2 +%%CONTACTS%%lib/qt4/libQtContacts.prl +%%CONTACTS%%lib/qt4/libQtContacts.so +%%CONTACTS%%lib/qt4/libQtContacts.so.1 +%%CONTACTS%%lib/qt4/libQtContacts.so.1.2 +%%CONTACTS%%lib/qt4/libQtContacts.so.1.2.2 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackActuator %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackEffect %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackFileEffect @@ -236,11 +236,11 @@ %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/qfeedbackplugininterfaces.h %%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/libdeclarative_feedback.so %%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/qmldir -%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.prl -%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so -%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1 -%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2 -%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2.2 +%%FEEDBACK%%lib/qt4/libQtFeedback.prl +%%FEEDBACK%%lib/qt4/libQtFeedback.so +%%FEEDBACK%%lib/qt4/libQtFeedback.so.1 +%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2 +%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2.2 %%GALLERY%%%%QT_INCDIR%%/QtGallery/QAbstractGallery %%GALLERY%%%%QT_INCDIR%%/QtGallery/QDocumentGallery %%GALLERY%%%%QT_INCDIR%%/QtGallery/QGalleryAbstractRequest @@ -270,11 +270,11 @@ %%GALLERY%%%%QT_INCDIR%%/QtGallery/qgallerytyperequest.h %%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/libdeclarative_gallery.so %%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/qmldir -%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.prl -%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so -%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1 -%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2 -%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2.2 +%%GALLERY%%lib/qt4/libQtGallery.prl +%%GALLERY%%lib/qt4/libQtGallery.so +%%GALLERY%%lib/qt4/libQtGallery.so.1 +%%GALLERY%%lib/qt4/libQtGallery.so.1.2 +%%GALLERY%%lib/qt4/libQtGallery.so.1.2.2 %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAddress %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAreaMonitor %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoBoundingArea @@ -430,11 +430,11 @@ %%LOCATION%%%%QT_INCDIR%%/QtLocation/qnmeapositioninfosource.h %%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/libdeclarative_location.so %%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/qmldir -%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.prl -%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so -%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1 -%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2 -%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2.2 +%%LOCATION%%lib/qt4/libQtLocation.prl +%%LOCATION%%lib/qt4/libQtLocation.so +%%LOCATION%%lib/qt4/libQtLocation.so.1 +%%LOCATION%%lib/qt4/libQtLocation.so.1.2 +%%LOCATION%%lib/qt4/libQtLocation.so.1.2.2 %%LOCATION%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so %%LOCATION%%%%QT_PLUGINDIR%%/landmarks/libqtlandmarks_sqlite.so %%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/QAbstractAudioDeviceInfo @@ -582,11 +582,11 @@ %%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/qvideowindowcontrol.h %%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/libdeclarative_multimedia.so %%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/qmldir -%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.prl -%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so -%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1 -%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2 -%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2.2 +%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.prl +%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so +%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1 +%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2 +%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2.2 %%MULTIMEDIA%%%%QT_PLUGINDIR%%/audio/libqtmedia_pulse.so %%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqgstengine.so %%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_v4lengine.so @@ -730,13 +730,13 @@ %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qorganizertodotime.h %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizer.h %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizerglobal.h -%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.prl -%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so -%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1 -%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2 -%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2.2 -%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/qcrmlgen -%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/vsexplorer +%%ORGANIZER%%lib/qt4/libQtOrganizer.prl +%%ORGANIZER%%lib/qt4/libQtOrganizer.so +%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1 +%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2 +%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2.2 +%%PUBLISHSUBSCRIBE%%bin/qcrmlgen +%%PUBLISHSUBSCRIBE%%bin/vsexplorer %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpace %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpacePublisher %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpaceSubscriber @@ -745,11 +745,11 @@ %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/qvaluespacesubscriber.h %%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/libdeclarative_publishsubscribe.so %%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/qmldir -%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.prl -%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so -%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1 -%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2 -%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2.2 +%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.prl +%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so +%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1 +%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2 +%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2.2 %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporter %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandler %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandlerV2 @@ -774,11 +774,11 @@ %%VERSIT%%%%QT_INCDIR%%/QtVersit/qversitwriter.h %%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/libdeclarative_contacts.so %%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/qmldir -%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.prl -%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so -%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1 -%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2 -%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2.2 +%%VERSIT%%lib/qt4/libQtVersit.prl +%%VERSIT%%lib/qt4/libQtVersit.so +%%VERSIT%%lib/qt4/libQtVersit.so.1 +%%VERSIT%%lib/qt4/libQtVersit.so.1.2 +%%VERSIT%%lib/qt4/libQtVersit.so.1.2.2 %%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_backuphandler.so %%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_vcardpreserver.so %%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/QVersitOrganizerExporter @@ -794,9 +794,9 @@ %%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/qversittimezonehandler.h %%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/libdeclarative_organizer.so %%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/qmldir -%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.prl -%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so -%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1 -%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2 -%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2.2 +%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.prl +%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so +%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1 +%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2 +%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2.2 %%VERSITFEEDBACK%%%%QT_PLUGINDIR%%/feedback/libqtfeedback_mmk.so diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index 256fd10dd3f..1dd948b0378 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -31,7 +31,7 @@ BUILD_DEPENDS+= protoc:devel/protobuf LIB_DEPENDS+= libprotobuf.so:devel/protobuf TESTS_USE= QT4=testlib -TESTS_PLIST_FILES= %%QT_BINDIR%%/test_bitcoin-qt \ +TESTS_PLIST_FILES= bin/test_bitcoin-qt \ bin/test_bitcoin .endif diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index 8f08d2a75e7..d9e0fa03637 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -35,6 +35,10 @@ KQUEUE_CONFIGURE_WITH= kqueue .include +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + # Disable amd64 atomic ops on i386 when using gcc # undefined reference to __sync_add_and_fetch_8 # undefined reference to __sync_fetch_and_and_8 diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile index 0c65cbb4919..2cbdab9520e 100644 --- a/net-p2p/litecoin/Makefile +++ b/net-p2p/litecoin/Makefile @@ -37,7 +37,7 @@ LIB_DEPENDS+= libprotobuf.so:devel/protobuf DBUS_USE= QT4=dbus TESTS_USE= QT4=testlib -TESTS_PLIST_FILES= %%QT_BINDIR%%/test_litecoin-qt +TESTS_PLIST_FILES= bin/test_litecoin-qt .endif OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET diff --git a/net-p2p/sonarr/Makefile b/net-p2p/sonarr/Makefile index bbce6b16c34..45b7baf88ad 100644 --- a/net-p2p/sonarr/Makefile +++ b/net-p2p/sonarr/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= sonarr -PORTVERSION= 2.0.0.4389 -PORTREVISION= 1 +PORTVERSION= 2.0.0.4409 +PORTREVISION= 0 CATEGORIES= net-p2p MASTER_SITES= http://download.sonarr.tv/v2/master/mono/ DISTNAME= NzbDrone.master.${PORTVERSION}.mono diff --git a/net-p2p/sonarr/distinfo b/net-p2p/sonarr/distinfo index af6a4f2122b..5f0a0a48229 100644 --- a/net-p2p/sonarr/distinfo +++ b/net-p2p/sonarr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478960865 -SHA256 (NzbDrone.master.2.0.0.4389.mono.tar.gz) = be9a00c994e3281350533f5e83f0ae9e006fbb7a27a6babb4799876a1a757b9f -SIZE (NzbDrone.master.2.0.0.4389.mono.tar.gz) = 6460948 +TIMESTAMP = 1480430611 +SHA256 (NzbDrone.master.2.0.0.4409.mono.tar.gz) = 825bd1afb1c2a95a2e6e367a931ac74aaac5dfd2ee44a467a4c82f17490d52cd +SIZE (NzbDrone.master.2.0.0.4409.mono.tar.gz) = 6461904 diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 58f31f24841..293dca76bce 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chrony -PORTVERSION= 2.4 +PORTVERSION= 2.4.1 CATEGORIES= net MASTER_SITES= http://download.tuxfamily.org/chrony/ diff --git a/net/chrony/distinfo b/net/chrony/distinfo index f03df35edb9..1ba0560bfbf 100644 --- a/net/chrony/distinfo +++ b/net/chrony/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1465554985 -SHA256 (chrony-2.4.tar.gz) = 8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f -SIZE (chrony-2.4.tar.gz) = 390077 +TIMESTAMP = 1479833642 +SHA256 (chrony-2.4.1.tar.gz) = 0fd59e0ef625b4459e3a9c7f221c52f56596582bce31abfae5f7369702edb6e0 +SIZE (chrony-2.4.1.tar.gz) = 390641 diff --git a/net/libsrtp/Makefile b/net/libsrtp/Makefile index e1db7dbf043..58a04c29b3b 100644 --- a/net/libsrtp/Makefile +++ b/net/libsrtp/Makefile @@ -44,4 +44,10 @@ post-build: check test runtest regression-test: build ${SETENV} LD_LIBRARY_PATH=${WRKSRC} ${MAKE_CMD} -C ${WRKSRC} runtest -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index 4ca273e0cf7..7ae357d6892 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -49,4 +49,10 @@ VAAPI_CONFIGURE_WITH= libva post-install: ${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb -.include +.include + +.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index d667b0ae8ca..402458c572f 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= libwebsockets -PORTVERSION= 2.0.2 +PORTVERSION= 2.1.0 DISTVERSIONPREFIX= v -CATEGORIES= net +CATEGORIES= net devel MASTER_SITES= GITHUB MAINTAINER= iblis@hs.ntnu.edu.tw @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= warmcat -PORTSCOUT= limit:^v\d+\. +PORTSCOUT= limit:^v\d+\.* USES= cmake pkgconfig ssl USE_LDCONFIG= yes @@ -29,7 +29,7 @@ CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITHOUT_TEST_CLIENT=ON \ -DLWS_WITHOUT_TEST_FRAGGLE=ON -OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER +OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS OPTIONS_SUB= yes HTTP_PROXY_DESC= HTTP proxy support @@ -54,4 +54,9 @@ UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON WEBSERVER_LIB_DEPENDS= libuv.so:devel/libuv +PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \ + -DLWS_WITH_SERVER_STATUS=ON \ + -DLWS_WITH_GENERIC_SESSIONS=ON +PLUGINS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 + .include diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo index 265195712f9..a9da6a922ec 100644 --- a/net/libwebsockets/distinfo +++ b/net/libwebsockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468814124 -SHA256 (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 43865604debd06686ac4d8d0783976c4e10dd519ccd5c94e1b53878ec6178a59 -SIZE (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 2998706 +TIMESTAMP = 1479903723 +SHA256 (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66 +SIZE (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = 3721679 diff --git a/net/libwebsockets/files/patch-CMakeLists.txt b/net/libwebsockets/files/patch-CMakeLists.txt index 38d66b1ec54..22e72e469f9 100644 --- a/net/libwebsockets/files/patch-CMakeLists.txt +++ b/net/libwebsockets/files/patch-CMakeLists.txt @@ -1,15 +1,15 @@ ---- CMakeLists.txt.orig 2016-06-06 11:59:30 UTC +--- CMakeLists.txt.orig 2016-10-06 19:19:50 UTC +++ CMakeLists.txt -@@ -602,7 +602,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM +@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM set(VISIBILITY_FLAG -fvisibility=hidden) endif() - if (UNIX) + if (UNIX OR LWS_WITH_ESP8266) - set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" ) + set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" ) - else(UNIX) + else() set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" ) - endif(UNIX) -@@ -1316,7 +1316,7 @@ Cflags: -I\${includedir}" + endif() +@@ -1416,7 +1416,7 @@ Cflags: -I\${includedir}" ) install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc" diff --git a/net/libwebsockets/files/patch-lib_server.c b/net/libwebsockets/files/patch-lib_server.c new file mode 100644 index 00000000000..5ccf6c54c6c --- /dev/null +++ b/net/libwebsockets/files/patch-lib_server.c @@ -0,0 +1,11 @@ +--- lib/server.c.orig 2016-11-23 13:04:24 UTC ++++ lib/server.c +@@ -110,7 +110,7 @@ lws_context_init_server(struct lws_conte + if (LWS_IPV6_ENABLED(vhost)) { + if (vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_MODIFY) { + int value = (vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_VALUE) ? 1 : 0; +- if (setsockopt(sockfd, SOL_IPV6, IPV6_V6ONLY, ++ if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, + (const void*)&value, sizeof(value)) < 0) { + compatible_close(sockfd); + return 1; diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist index 379c12e3442..54b70ee9f28 100644 --- a/net/libwebsockets/pkg-plist +++ b/net/libwebsockets/pkg-plist @@ -1,5 +1,6 @@ @comment $FreeBSD$ %%WEBSERVER%%bin/lwsws +%%WEBSERVER%%include/lejp.h include/libwebsockets.h include/lws_config.h lib/cmake/libwebsockets/LibwebsocketsConfig.cmake @@ -8,7 +9,24 @@ lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libwebsockets/LibwebsocketsTargets.cmake lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.8 +lib/libwebsockets.so.9 libdata/pkgconfig/libwebsockets.pc -%%WEBSERVER%%%%DATADIR%%-test-server/server-status/lwsws-logo.png -%%WEBSERVER%%%%DATADIR%%-test-server/server-status/server-status.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html +%%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js +%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png +%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html diff --git a/net/socat/Makefile b/net/socat/Makefile index afff12ed840..c7f727c870d 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -29,6 +29,9 @@ OPTIONS_DEFINE= DOCS .include .if ${SSL_DEFAULT} != base +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif diff --git a/net/tramp/Makefile b/net/tramp/Makefile index 763385df534..4c9ad574f20 100644 --- a/net/tramp/Makefile +++ b/net/tramp/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= tramp -PORTVERSION= 2.2.7 -PORTREVISION= 2 +PORTVERSION= 2.3.0 +#PORTREVISION= 0 CATEGORIES= net elisp MASTER_SITES= GNU PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/net/tramp/distinfo b/net/tramp/distinfo index dda0d0560b2..6888b2b8a37 100644 --- a/net/tramp/distinfo +++ b/net/tramp/distinfo @@ -1,2 +1,3 @@ -SHA256 (tramp-2.2.7.tar.gz) = ce9df3f898ccd56c5c0607d17456b4cfe14f8584c4c9ba25bbc009c44f0078d7 -SIZE (tramp-2.2.7.tar.gz) = 813729 +TIMESTAMP = 1480165959 +SHA256 (tramp-2.3.0.tar.gz) = f12dcc04aa2939d9b8e5501630db20499ad707e88b07630207c0794e89a83ceb +SIZE (tramp-2.3.0.tar.gz) = 428407 diff --git a/net/tramp/files/patch-configure.ac b/net/tramp/files/patch-configure.ac index 59c17fe43a7..e0cbd1f6431 100644 --- a/net/tramp/files/patch-configure.ac +++ b/net/tramp/files/patch-configure.ac @@ -1,21 +1,8 @@ ---- configure.ac.orig 2010-11-20 19:59:36.000000000 +0900 -+++ configure.ac 2010-11-26 23:08:05.306093104 +0900 -@@ -55,11 +55,10 @@ - AC_EMACS_INFO - - # Handle contrib files. "-" must be encoded as "_". --TRAMP_CONTRIB_FILES= -+TRAMP_CONTRIB_FILES=password.el - - AC_CONTRIB_FILES([base64_encode_region], [base64.el]) - AC_CONTRIB_FILES([format_spec], [format_spec.el]) --AC_CONTRIB_FILES([password_cache_add], [password.el], [optional]) - if test "${EMACS_GW}" = yes; then - AC_CONTRIB_FILES([socks_open_network_stream], [socks.el], [optional]) - fi -@@ -158,4 +157,4 @@ +--- configure.ac.orig 2016-06-26 19:35:17.000000000 +0900 ++++ configure.ac 2016-11-26 22:49:34.137729000 +0900 +@@ -140,4 +140,4 @@ # Regenerate autoloads. AC_MSG_NOTICE([regenerate autoloads]) rm -f lisp/tramp-loaddefs.el --make EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads +-make EMACS=${EMACS} -s -C lisp autoloads +gmake EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads diff --git a/net/tramp/files/patch-texi-Makefile.in b/net/tramp/files/patch-texi-Makefile.in index 108eb3479ca..48c3bac4f82 100644 --- a/net/tramp/files/patch-texi-Makefile.in +++ b/net/tramp/files/patch-texi-Makefile.in @@ -1,8 +1,8 @@ ---- texi/Makefile.in.orig 2011-02-13 20:38:54.000000000 +0900 -+++ texi/Makefile.in 2011-03-27 19:47:32.881845864 +0900 -@@ -48,8 +48,8 @@ +--- texi/Makefile.in.orig 2016-01-25 20:09:17.000000000 +0900 ++++ texi/Makefile.in 2016-11-29 15:30:25.384280000 +0900 +@@ -45,8 +45,8 @@ - TEXI_FILES = tramp.texi trampver.texi doclicense.texi \ + TEXI_FILES = tramp.texi trampver.texi doclicense.texi docstyle.texi \ $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi) -INFO_FILES = $(localinfodir)/tramp -INSTALL_FILES = $(DESTDIR)$(infodir)/tramp @@ -10,8 +10,8 @@ +INSTALL_FILES = $(DESTDIR)$(infodir)/tramp21.info CLEAN_FILES = @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*) - # To be used by maintainer only -@@ -62,19 +62,22 @@ + # To be used by maintainer only. +@@ -59,7 +59,7 @@ tramp: $(INFO_FILES) $(localinfodir)/dir @@ -20,21 +20,3 @@ clean: $(RM) $(CLEAN_FILES) - - distclean: clean - --$(localinfodir)/tramp: $(TEXI_FILES) -+$(localinfodir)/%.info: $(TEXI_FILES) - $(MKDIR) $(dir $@) - $(MAKEINFO) --footnote-style=end -D $(EMACS_GVFS) -D $(EMACS_GW) \ -- -D $(EMACS_INFO) -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi -+ -D $(EMACS_INFO) -D $(INSTALL_CHAPTER) -o $@ $*.texi - --$(DESTDIR)$(infodir)/tramp: -+$(localinfodir)/tramp21.info: $(localinfodir)/tramp.info -+ cp $(localinfodir)/tramp.info $@ -+ -+$(DESTDIR)$(infodir)/tramp21.info: - $(MKDIR) $(dir $@) - $(INSTALL) $(INFO_FILES) $(DESTDIR)$(infodir) - diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist index e2c16a6eae5..4be167ccd42 100644 --- a/net/tramp/pkg-plist +++ b/net/tramp/pkg-plist @@ -8,8 +8,6 @@ %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/run-at-time.elc %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.el %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.elc -%%TRAMP_LISPDIR%%/password.el -%%TRAMP_LISPDIR%%/password.elc %%TRAMP_LISPDIR%%/tramp-adb.el %%TRAMP_LISPDIR%%/tramp-adb.elc %%TRAMP_LISPDIR%%/tramp-cmds.el diff --git a/net/vtun/Makefile b/net/vtun/Makefile index a18c0f662a1..02c7ff94a58 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -54,4 +54,10 @@ post-install: @cd ${STAGEDIR}${PREFIX}/man/man1/ && \ ${LN} -s vtund.8 ../man1/vtun.1 -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/ports-mgmt/pkg_replace/Makefile b/ports-mgmt/pkg_replace/Makefile index 7af8ad8fd6c..484b3f8b16e 100644 --- a/ports-mgmt/pkg_replace/Makefile +++ b/ports-mgmt/pkg_replace/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pkg_replace -PORTVERSION= 20160411 +PORTVERSION= 20161113 CATEGORIES= ports-mgmt MASTER_SITES= http://member.tokoha-u.ac.jp/~kdeguchi/download/ diff --git a/ports-mgmt/pkg_replace/distinfo b/ports-mgmt/pkg_replace/distinfo index 2369059c2d4..b0ccac617cd 100644 --- a/ports-mgmt/pkg_replace/distinfo +++ b/ports-mgmt/pkg_replace/distinfo @@ -1,2 +1,3 @@ -SHA256 (pkg_replace-20160411.tar.xz) = eef09c9f072ceb338d8a23e2a984ddac2282783a5ff72262a0af09e80bedface -SIZE (pkg_replace-20160411.tar.xz) = 16320 +TIMESTAMP = 1478997789 +SHA256 (pkg_replace-20160411.tar.xz) = 437afb1370e3ca4c7f5c4621f532070338e966e261aabc54dc172c6834c5914b +SIZE (pkg_replace-20160411.tar.xz) = 16372 diff --git a/science/afni/Makefile b/science/afni/Makefile index f9bfdb59730..cabb4159c8b 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -11,6 +11,7 @@ PORTNAME= afni PORTVERSION= 2015.11.13 +PORTREVISION= 1 CATEGORIES= science biology graphics MASTER_SITES= http://www.acadix.biz/Ports/distfiles/ @@ -19,17 +20,19 @@ COMMENT= Advanced Functional Neuro Imaging LICENSE= GPLv2 -BUILD_DEPENDS= gm4:devel/m4 -LIB_DEPENDS= libXm.so:x11-toolkits/open-motif \ - libR.so:math/R \ +BUILD_DEPENDS= gm4:devel/m4 \ + R:math/R +LIB_DEPENDS= libexpat.so:textproc/expat2 \ + libf2c.so:lang/f2c \ libgsl.so:math/gsl \ libnetcdff.so:science/netcdf-fortran \ libxml2.so:textproc/libxml2 \ - libf2c.so:lang/f2c -RUN_DEPENDS= mpeg_encode:multimedia/mpeg_encode \ + libXm.so:x11-toolkits/open-motif +RUN_DEPENDS= endian:sysutils/endian \ + mpeg_encode:multimedia/mpeg_encode \ ppmtogif:graphics/netpbm \ - endian:sysutils/endian \ - qhull:math/qhull5 + qhull:math/qhull5 \ + R:math/R CONFLICTS= im-[0-9]* \ nifticlib-[0-9]* \ @@ -47,8 +50,8 @@ USE_GNOME= glib20 BROKEN_sparc64= Does not compile: "undefined reference to '_mcount'" -USE_GL= glw glu -USE_XORG= xi +USE_GL= gl glu glw +USE_XORG= x11 xext xi xmu xp xt MAKE_ENV= CC="${CC}" R_SHARE_DIR=${LOCALBASE}/lib/R/share MAKE_JOBS_UNSAFE=yes diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile index 9a800f1b3c9..1d0c0dfc268 100644 --- a/security/chkrootkit/Makefile +++ b/security/chkrootkit/Makefile @@ -4,14 +4,7 @@ PORTNAME= chkrootkit PORTVERSION= 0.51 CATEGORIES= security -MASTER_SITES= ftp://ftp.pangeia.com.br/pub/seg/pac/ \ - ftp://gd.tuwien.ac.at/infosys/security/chkrootkit/ \ - ftp://ftp.digitalvoodoo.org/pub/mirrors/chkrootkit/ \ - http://www.spenneberg.org/chkrootkit-mirror/files/ \ - http://www.mirrors.wiretapped.net/security/host-security/chkrootkit/ \ - http://ftp.uni-stuttgart.de/pub/security/unix/forensics/chkrootkit/ \ - http://ftp.bit.nl/mirror/chkrootkit/ \ - http://chkrootkit.mirror.fr/ +MASTER_SITES= ftp://ftp.pangeia.com.br/pub/seg/pac/ MAINTAINER= lacey.leanne@gmail.com COMMENT= Tool to locally check for signs of a rootkit diff --git a/security/john/Makefile b/security/john/Makefile index c0720bf6473..cc334f2a0c6 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -71,6 +71,10 @@ post-patch: .include +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024 CFLAGS+= -flax-vector-conversions .endif diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile index 71bc43af4a8..54c4fc6c7b7 100644 --- a/security/libssh2/Makefile +++ b/security/libssh2/Makefile @@ -36,6 +36,10 @@ ZLIB_CONFIGURE_WITH= libz .include +.if empty(PORT_OPTIONS:MGCRYPT) && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + post-patch: @${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \ ${WRKSRC}/libssh2.pc.in diff --git a/security/luasec/Makefile b/security/luasec/Makefile index d1adfb7785f..2218245b81d 100644 --- a/security/luasec/Makefile +++ b/security/luasec/Makefile @@ -30,4 +30,10 @@ post-patch: .SILENT ${REINPLACE_CMD} -Ee '/^(INC|LIB)DIR/s/[^?]=/?=/' \ ${WRKSRC}/Makefile -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/openca-tools-forked/Makefile b/security/openca-tools-forked/Makefile index 2ccd149aa10..6a126f6727b 100644 --- a/security/openca-tools-forked/Makefile +++ b/security/openca-tools-forked/Makefile @@ -26,4 +26,10 @@ post-stage: @${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/openca-${f} .endfor -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/p5-Crypt-OpenSSL-CA/Makefile b/security/p5-Crypt-OpenSSL-CA/Makefile index f9a0717bd56..f9d0b61f453 100644 --- a/security/p5-Crypt-OpenSSL-CA/Makefile +++ b/security/p5-Crypt-OpenSSL-CA/Makefile @@ -30,4 +30,10 @@ USES= perl5 ssl USE_PERL5= modbuild CONFIGURE_ARGS= --openssl-cflags=-L${OPENSSLINC} --openssl-ldflags="-I${OPENSSLLIB} ${OPENSSL_LDFLAGS}" -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/p5-Crypt-OpenSSL-ECDSA/Makefile b/security/p5-Crypt-OpenSSL-ECDSA/Makefile index 1b5e87c31a8..0b52eecbabd 100644 --- a/security/p5-Crypt-OpenSSL-ECDSA/Makefile +++ b/security/p5-Crypt-OpenSSL-ECDSA/Makefile @@ -23,4 +23,10 @@ CFLAGS+= -I${OPENSSLINC} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Crypt/OpenSSL/ECDSA/ECDSA.so -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile index f53cc14ccde..687eab52fc9 100644 --- a/security/p5-Crypt-OpenSSL-RSA/Makefile +++ b/security/p5-Crypt-OpenSSL-RSA/Makefile @@ -23,4 +23,10 @@ MAKE_ARGS= PASTHRU_INC=-I${OPENSSLINC} regression-test: build cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/p5-Crypt-OpenSSL-X509/Makefile b/security/p5-Crypt-OpenSSL-X509/Makefile index 98ad2b9b433..f46f3908a5e 100644 --- a/security/p5-Crypt-OpenSSL-X509/Makefile +++ b/security/p5-Crypt-OpenSSL-X509/Makefile @@ -25,4 +25,10 @@ post-patch: post-stage: ${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Crypt/OpenSSL/X509/X509.so -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/p5-POE-Filter-SSL/Makefile b/security/p5-POE-Filter-SSL/Makefile index 55b831e0d93..c7784c740e8 100644 --- a/security/p5-POE-Filter-SSL/Makefile +++ b/security/p5-POE-Filter-SSL/Makefile @@ -29,4 +29,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/POE/Filter/SSL/SSL.so -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/pam_ssh_agent_auth/Makefile b/security/pam_ssh_agent_auth/Makefile index 4819f124f7f..5c01b73fb4b 100644 --- a/security/pam_ssh_agent_auth/Makefile +++ b/security/pam_ssh_agent_auth/Makefile @@ -22,4 +22,10 @@ PLIST_FILES= lib/pam_ssh_agent_auth.so \ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pam_ssh_agent_auth.so -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/pkcs11-helper/Makefile b/security/pkcs11-helper/Makefile index 7899636fa16..f8a960952aa 100644 --- a/security/pkcs11-helper/Makefile +++ b/security/pkcs11-helper/Makefile @@ -37,4 +37,10 @@ post-patch: @${REINPLACE_CMD} 's|install-data-am: install-apidocDATA|install-data-am:|' \ ${WRKSRC}/doc/api/Makefile.in -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile index 003825ab187..d16eb1ffc9d 100644 --- a/security/sslscan/Makefile +++ b/security/sslscan/Makefile @@ -16,4 +16,10 @@ USE_OPENSSL= yes USE_GITHUB= yes GH_ACCOUNT= rbsec -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index 8c7c917c4a2..73830fc25fa 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -134,6 +134,11 @@ PLIST_SUB+= DBTYPE=${DBTYPE} .endif .include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + .if ${readline_ARGS} == "port" readline_CONFIGURE= ${LOCALBASE} .else diff --git a/sysutils/bacula5-server/Makefile b/sysutils/bacula5-server/Makefile index b8d021f33c3..ea658a25e91 100644 --- a/sysutils/bacula5-server/Makefile +++ b/sysutils/bacula5-server/Makefile @@ -187,4 +187,10 @@ post-install: .else .include "${MASTERDIR}/Makefile.common" .endif # -client and -server are defined -.include +.include + +.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/sysutils/bareos-traymonitor/pkg-plist b/sysutils/bareos-traymonitor/pkg-plist index f1ee7a19cb8..6b010213de0 100644 --- a/sysutils/bareos-traymonitor/pkg-plist +++ b/sysutils/bareos-traymonitor/pkg-plist @@ -4,4 +4,4 @@ @sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample share/applications/bareos-tray-monitor.desktop share/pixmaps/bareos-tray-monitor.xpm -%%QT_BINDIR%%/bareos-tray-monitor +bin/bareos-tray-monitor diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile index 39dbd3f7e49..57d08c18fe4 100644 --- a/sysutils/goaccess/Makefile +++ b/sysutils/goaccess/Makefile @@ -3,6 +3,7 @@ PORTNAME= goaccess PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://tar.goaccess.io/ @@ -10,39 +11,42 @@ MAINTAINER= sbz@FreeBSD.org COMMENT= Real-time Apache web log analyzer LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes -USE_GNOME= glib20 USES= pkgconfig CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES= bin/${PORTNAME} \ - man/man1/${PORTNAME}.1.gz - -CONFIGURE_ARGS= --enable-utf8 - PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO -OPTIONS_DEFINE= DOCS GEOIP TOKYOCABINET -OPTIONS_DEFAULT= GEOIP +OPTIONS_DEFINE= DOCS DEBUG GEOIP UTF8 +OPTIONS_DEFAULT= GEOIP UTF8 +OPTIONS_RADIO= TOKYOCABINET +OPTIONS_RADIO_TOKYOCABINET= TOKYOCABINET_BTREE TOKYOCABINET_MHASH + +DEBUG_CONFIGURE_ON= --enable-debug +UTF8_CONFIGURE_ON= --enable-utf8 GEOIP_CONFIGURE_ON= --enable-geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP TOKYOCABINET_DESC= Tokyo Cabinet support -TOKYOCABINET_CONFIGURE_ON= --enable-tcb=btree +TOKYOCABINET_BTREE_DESC= Storage using on-disk B+ Tree +TOKYOCABINET_MHASH_DESC= Storage using on-memory hash database +TOKYOCABINET_BTREE_CONFIGURE_ON= --enable-tcb=btree +TOKYOCABINET_MHASH_CONFIGURE_ON= --enable-tcb=memhash TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 - do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} +post-install: + ${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample + .include diff --git a/sysutils/goaccess/pkg-plist b/sysutils/goaccess/pkg-plist new file mode 100644 index 00000000000..4278a466852 --- /dev/null +++ b/sysutils/goaccess/pkg-plist @@ -0,0 +1,11 @@ +bin/goaccess +@sample etc/goaccess.conf.sample +man/man1/goaccess.1.gz +%%PORTDOCS%%%%DOCSDIR%%/app.css +%%PORTDOCS%%%%DOCSDIR%%/app.js +%%PORTDOCS%%%%DOCSDIR%%/bootstrap.min.css +%%PORTDOCS%%%%DOCSDIR%%/charts.js +%%PORTDOCS%%%%DOCSDIR%%/d3.v3.min.js +%%PORTDOCS%%%%DOCSDIR%%/fa.min.css +%%PORTDOCS%%%%DOCSDIR%%/hogan.min.js +%%PORTDOCS%%%%DOCSDIR%%/tpls.html diff --git a/sysutils/qzeitgeist/pkg-plist b/sysutils/qzeitgeist/pkg-plist index 77ca788a58f..2de20b45a8c 100644 --- a/sysutils/qzeitgeist/pkg-plist +++ b/sysutils/qzeitgeist/pkg-plist @@ -29,6 +29,6 @@ lib/cmake/QZeitgeist/QZeitgeistExport.cmake lib/libqzeitgeist.so lib/libqzeitgeist.so.0.8.0 lib/libqzeitgeist.so.1 -%%QT_LIBDIR%%/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so -%%QT_LIBDIR%%/imports/org/gnome/zeitgeist/qmldir +lib/qt4/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so +lib/qt4/imports/org/gnome/zeitgeist/qmldir libdata/pkgconfig/QZeitgeist.pc diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile index 737949b498a..efe94bbf8f5 100644 --- a/textproc/htmldoc/Makefile +++ b/textproc/htmldoc/Makefile @@ -59,4 +59,10 @@ post-configure: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/textproc/p5-Text-Reflow/Makefile b/textproc/p5-Text-Reflow/Makefile index c52b22a8925..78b8681c9fa 100644 --- a/textproc/p5-Text-Reflow/Makefile +++ b/textproc/p5-Text-Reflow/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Text-Reflow -PORTVERSION= 1.12 +PORTVERSION= 1.15 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Text-Reflow/distinfo b/textproc/p5-Text-Reflow/distinfo index 5b770e9eb34..74b1b6177f5 100644 --- a/textproc/p5-Text-Reflow/distinfo +++ b/textproc/p5-Text-Reflow/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479797953 -SHA256 (Text-Reflow-1.12.tar.gz) = 371ee717d294f377f677f347ee6c7976a03f730c9a11472243d0f195bf53a9ec -SIZE (Text-Reflow-1.12.tar.gz) = 15705 +TIMESTAMP = 1480439298 +SHA256 (Text-Reflow-1.15.tar.gz) = 33b13ec90c9ac463492f9db7c27ce0a92dd401f1035ecf78824adc55b833e32f +SIZE (Text-Reflow-1.15.tar.gz) = 16124 diff --git a/textproc/p5-Text-Reflow/pkg-plist b/textproc/p5-Text-Reflow/pkg-plist index 0f736fc2f10..4d0018797cc 100644 --- a/textproc/p5-Text-Reflow/pkg-plist +++ b/textproc/p5-Text-Reflow/pkg-plist @@ -1,4 +1,5 @@ bin/reflow %%SITE_ARCH%%/Text/Reflow.pm %%SITE_ARCH%%/auto/Text/Reflow/Reflow.so +%%PERL5_MAN1%%/reflow.1.gz %%PERL5_MAN3%%/Text::Reflow.3.gz diff --git a/textproc/p5-Text-Table/Makefile b/textproc/p5-Text-Table/Makefile index f82f0678423..34f3b81f3e3 100644 --- a/textproc/p5-Text-Table/Makefile +++ b/textproc/p5-Text-Table/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Text-Table -PORTVERSION= 1.131 +PORTVERSION= 1.132 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,9 +13,10 @@ COMMENT= Organize Data in Tables LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= p5-Text-Aligner>=0.05:textproc/p5-Text-Aligner -RUN_DEPENDS= p5-Text-Aligner>=0.05:textproc/p5-Text-Aligner +BUILD_DEPENDS= p5-Text-Aligner>=0:textproc/p5-Text-Aligner +RUN_DEPENDS:= ${BUILD_DEPENDS} +NO_ARCH= yes USES= perl5 USE_PERL5= configure diff --git a/textproc/p5-Text-Table/distinfo b/textproc/p5-Text-Table/distinfo index 82032774274..de2a9029fd8 100644 --- a/textproc/p5-Text-Table/distinfo +++ b/textproc/p5-Text-Table/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470867247 -SHA256 (Text-Table-1.131.tar.gz) = f89391dd0e9eb2c9c105d92dbee5b764f510553fe6e0840317c7e5d2cf058e15 -SIZE (Text-Table-1.131.tar.gz) = 28481 +TIMESTAMP = 1480439306 +SHA256 (Text-Table-1.132.tar.gz) = cd601742ee526a9c54b9fe0a4c051e1b09a23b75e2c97de14305218116aba516 +SIZE (Text-Table-1.132.tar.gz) = 27238 diff --git a/textproc/p5-Text-Table/pkg-plist b/textproc/p5-Text-Table/pkg-plist index e7380791ffd..72b30dcd9e4 100644 --- a/textproc/p5-Text-Table/pkg-plist +++ b/textproc/p5-Text-Table/pkg-plist @@ -1,2 +1,2 @@ -%%PERL5_MAN3%%/Text::Table.3.gz %%SITE_PERL%%/Text/Table.pm +%%PERL5_MAN3%%/Text::Table.3.gz diff --git a/textproc/p5-XML-MyXML/Makefile b/textproc/p5-XML-MyXML/Makefile index d791c45ada0..ee56c3aa293 100644 --- a/textproc/p5-XML-MyXML/Makefile +++ b/textproc/p5-XML-MyXML/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= XML-MyXML -PORTVERSION= 0.9402 +PORTVERSION= 0.9403 PORTEPOCH= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN diff --git a/textproc/p5-XML-MyXML/distinfo b/textproc/p5-XML-MyXML/distinfo index 56180202931..fa541136a59 100644 --- a/textproc/p5-XML-MyXML/distinfo +++ b/textproc/p5-XML-MyXML/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476110530 -SHA256 (XML-MyXML-0.9402.tar.gz) = 936f05113e7ff34ff6fe5e7679b47f8e2517e537c23b0d0c831c58dd17e02166 -SIZE (XML-MyXML-0.9402.tar.gz) = 22320 +TIMESTAMP = 1480439314 +SHA256 (XML-MyXML-0.9403.tar.gz) = cadd7a9234fb7c5609040935f8d23ebdb385a59be6dc42618bae146a3cc362ff +SIZE (XML-MyXML-0.9403.tar.gz) = 22384 diff --git a/textproc/p5-XML-SAX-Simple/Makefile b/textproc/p5-XML-SAX-Simple/Makefile index f89f8c89967..2a5b39c92e0 100644 --- a/textproc/p5-XML-SAX-Simple/Makefile +++ b/textproc/p5-XML-SAX-Simple/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= XML-SAX-Simple -PORTVERSION= 0.07 +PORTVERSION= 0.08 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-XML-SAX-Simple/distinfo b/textproc/p5-XML-SAX-Simple/distinfo index 53eff6b52e6..37a9bb158bd 100644 --- a/textproc/p5-XML-SAX-Simple/distinfo +++ b/textproc/p5-XML-SAX-Simple/distinfo @@ -1,2 +1,3 @@ -SHA256 (XML-SAX-Simple-0.07.tar.gz) = 64642b5718a2b29560770253c38dcd71d6029c1dd9c78b0de83149b62c83418e -SIZE (XML-SAX-Simple-0.07.tar.gz) = 25238 +TIMESTAMP = 1480439323 +SHA256 (XML-SAX-Simple-0.08.tar.gz) = ee5fb1568a1ba37bb2c919b7e4a21f16ac60968710285dedfecbed93f12c9207 +SIZE (XML-SAX-Simple-0.08.tar.gz) = 25298 diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile index c793af476c2..9d9794aae88 100644 --- a/textproc/ppower4/Makefile +++ b/textproc/ppower4/Makefile @@ -13,12 +13,15 @@ EXTRACT_ONLY= pp4sty.zip leveldemo.zip MAINTAINER= ports@FreeBSD.org COMMENT= Post processor for PDF presentations made with (La)TeX +LICENSE= GPLv2 # version not really specified + USES= zip USE_TEX= latex USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes NO_WRKSUBDIR= yes +NO_ARCH= yes JAR_DIR= ${JAVASHAREDIR}/${PORTNAME} STY_DIR= ${PREFIX}/share/texmf/tex/latex/${PORTNAME} @@ -35,17 +38,22 @@ SUB_FILES= ppower4.sh SUB_LIST= JARFILE=${JAR_DIR}/pp4p.jar OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_SUB= yes do-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual.pdf \ - ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${EXAMPLE_FILES} ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${STY_DIR} ${INSTALL_DATA} ${STY_FILES} ${STAGEDIR}${STY_DIR} @${MKDIR} ${STAGEDIR}${JAR_DIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pp4p.jar ${STAGEDIR}${JAR_DIR} ${INSTALL_SCRIPT} ${WRKDIR}/ppower4.sh ${STAGEDIR}${PREFIX}/bin/ppower4 +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual.pdf \ + ${STAGEDIR}${DOCSDIR} + +do-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${EXAMPLE_FILES} ${STAGEDIR}${EXAMPLESDIR} + .include diff --git a/www/elixir-maru/Makefile b/www/elixir-maru/Makefile index a9543b7656b..31550e90527 100644 --- a/www/elixir-maru/Makefile +++ b/www/elixir-maru/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= maru -PORTVERSION= 0.11.1 +PORTVERSION= 0.11.2 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- diff --git a/www/elixir-maru/distinfo b/www/elixir-maru/distinfo index e0a10e30eb0..e7d37f1f1c2 100644 --- a/www/elixir-maru/distinfo +++ b/www/elixir-maru/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480279433 -SHA256 (falood-maru-v0.11.1_GH0.tar.gz) = cb74e2bb9b5e5ed4045faaeae0c7a2b9b982b8b2262e9ae1a7f1cfc73e0f4009 -SIZE (falood-maru-v0.11.1_GH0.tar.gz) = 31787 +TIMESTAMP = 1480410427 +SHA256 (falood-maru-v0.11.2_GH0.tar.gz) = be9de5d1f104c406a098d867c92610177a02253336aa63e97d9fd78069eff3d7 +SIZE (falood-maru-v0.11.2_GH0.tar.gz) = 31962 diff --git a/www/elixir-maru/files/patch-mix.exs b/www/elixir-maru/files/patch-mix.exs index 95e22aa0bc8..072672a7c4b 100644 --- a/www/elixir-maru/files/patch-mix.exs +++ b/www/elixir-maru/files/patch-mix.exs @@ -4,7 +4,7 @@ elixir: "~> 1.0", build_embedded: Mix.env == :prod, start_permanent: Mix.env == :prod, -- deps: deps, +- deps: deps(), description: "REST-like API micro-framework for elixir inspired by grape.", source_url: "https://github.com/falood/maru", package: package, diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 2cee0e7a866..e31ae404598 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -57,9 +57,6 @@ OPTIONS_DEFAULT_i386= RUST OPTIONS_SINGLE+= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 -TEST_BROKEN= No rule to make target '../../../dist/bin/libnspr4.so', needed by \ - '../../../_tests/xpcshell/modules/libmar/tests/unit/libnspr4.so' - .include "${.CURDIR}/../../www/firefox/Makefile.options" WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} diff --git a/www/firefox/files/patch-bug1320991 b/www/firefox/files/patch-bug1320991 new file mode 100644 index 00000000000..cb93f8c0d45 --- /dev/null +++ b/www/firefox/files/patch-bug1320991 @@ -0,0 +1,24 @@ +--- modules/libmar/tests/moz.build.orig 2016-10-31 20:15:26 UTC ++++ modules/libmar/tests/moz.build +@@ -9,21 +9,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh + DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] + + if CONFIG['OS_TARGET'] != 'Android': +- nss_files = ['nss3'] +- if not CONFIG['MOZ_FOLD_LIBS']: +- nss_files.extend([ +- 'nssutil3', +- 'plc4', +- 'nspr4', +- 'plds4', +- ]) +- TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted( +- ['!/dist/bin/%s%s%s' % ( +- CONFIG['DLL_PREFIX'], +- name, +- CONFIG['DLL_SUFFIX'], +- ) for name in nss_files] +- ) + TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [ + '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'], + ] diff --git a/www/kcgi/Makefile b/www/kcgi/Makefile index 88282edd3dd..7498b1ef8cc 100644 --- a/www/kcgi/Makefile +++ b/www/kcgi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kcgi -PORTVERSION= 0.9.1 +PORTVERSION= 0.9.2 CATEGORIES= www devel MASTER_SITES= http://kristaps.bsd.lv/kcgi/snapshots/ diff --git a/www/kcgi/distinfo b/www/kcgi/distinfo index 93e6f512541..b553de8c809 100644 --- a/www/kcgi/distinfo +++ b/www/kcgi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476986842 -SHA256 (kcgi-0.9.1.tgz) = 9d4eb242b95eab948069bc32fc43bd04f3bc1f21cd1f25415a6a2f6538b896b3 -SIZE (kcgi-0.9.1.tgz) = 138369 +TIMESTAMP = 1480459201 +SHA256 (kcgi-0.9.2.tgz) = 4f734bd80b7a747bc2aa53b9ba9545b3b3ea2b58866570c17b4d4a3d8aa24f52 +SIZE (kcgi-0.9.2.tgz) = 140734 diff --git a/www/links1/Makefile b/www/links1/Makefile index dc68b38ca4e..33c98731da6 100644 --- a/www/links1/Makefile +++ b/www/links1/Makefile @@ -19,4 +19,10 @@ CONFLICTS= links-2* CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.include +.include + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 11a5983fa67..11e13d3a327 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -62,4 +62,10 @@ post-install-DOCS-on: (cd ${STAGEDIR}${L_HELP} && ln -sf ../doc/lynx/${doc} .) .endfor -.include +.include + +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.include diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile index 6dbc2163682..01621ee0e05 100644 --- a/www/varnish4/Makefile +++ b/www/varnish4/Makefile @@ -2,7 +2,7 @@ PORTNAME= varnish PORTVERSION= 4.1.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ PKGNAMESUFFIX= 4 diff --git a/www/varnish4/files/varnishd.in b/www/varnish4/files/varnishd.in index 6e75a96a700..0995d76a6f3 100644 --- a/www/varnish4/files/varnishd.in +++ b/www/varnish4/files/varnishd.in @@ -32,7 +32,7 @@ # default: unset. # # varnishd_hash - hash algorithm -# default: "classic,16383" +# default: "critbit" # # varnishd_storage - storage method and parameters. # default: "file,/tmp,100M" @@ -60,7 +60,7 @@ load_rc_config ${name} : ${varnishd_admin=localhost:81} : ${varnishd_backend=localhost:8080} : ${varnishd_storage=file,/tmp,100M} -: ${varnishd_hash=classic,16383} +: ${varnishd_hash=critbit} : ${varnishd_jailuser=varnish} command="%%PREFIX%%/sbin/${name}" diff --git a/www/varnish5/Makefile b/www/varnish5/Makefile index 00ac603688b..b66ab46f7ea 100644 --- a/www/varnish5/Makefile +++ b/www/varnish5/Makefile @@ -2,7 +2,7 @@ PORTNAME= varnish PORTVERSION= 5.0.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ PKGNAMESUFFIX= 5 diff --git a/www/varnish5/files/varnishd.in b/www/varnish5/files/varnishd.in index 6e75a96a700..0995d76a6f3 100644 --- a/www/varnish5/files/varnishd.in +++ b/www/varnish5/files/varnishd.in @@ -32,7 +32,7 @@ # default: unset. # # varnishd_hash - hash algorithm -# default: "classic,16383" +# default: "critbit" # # varnishd_storage - storage method and parameters. # default: "file,/tmp,100M" @@ -60,7 +60,7 @@ load_rc_config ${name} : ${varnishd_admin=localhost:81} : ${varnishd_backend=localhost:8080} : ${varnishd_storage=file,/tmp,100M} -: ${varnishd_hash=classic,16383} +: ${varnishd_hash=critbit} : ${varnishd_jailuser=varnish} command="%%PREFIX%%/sbin/${name}" diff --git a/www/xpi-uBlock_origin/Makefile b/www/xpi-uBlock_origin/Makefile index 637f902e463..ca259d79094 100644 --- a/www/xpi-uBlock_origin/Makefile +++ b/www/xpi-uBlock_origin/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ublock_origin -PORTVERSION= 1.9.16 +PORTVERSION= 1.10.0 DISTVERSIONSUFFIX= -an+fx+sm+tb CATEGORIES= www diff --git a/www/xpi-uBlock_origin/distinfo b/www/xpi-uBlock_origin/distinfo index f6536ca41a1..9a1cf642aa9 100644 --- a/www/xpi-uBlock_origin/distinfo +++ b/www/xpi-uBlock_origin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477427224 -SHA256 (xpi/ublock_origin-1.9.16-an+fx+sm+tb.xpi) = 030500ca37fa05c0d147b8b326bfca36a0b5f6adb8a1ef924dc1dd927a0c3cfb -SIZE (xpi/ublock_origin-1.9.16-an+fx+sm+tb.xpi) = 1517755 +TIMESTAMP = 1480452125 +SHA256 (xpi/ublock_origin-1.10.0-an+fx+sm+tb.xpi) = 00970e10594a99a2fdb0f78169374ec604ec64586dd4ef4bf80199143e73f545 +SIZE (xpi/ublock_origin-1.10.0-an+fx+sm+tb.xpi) = 1548371 diff --git a/www/xpi-uBlock_origin/pkg-plist b/www/xpi-uBlock_origin/pkg-plist index a1e09e866c7..53681d95bc8 100644 --- a/www/xpi-uBlock_origin/pkg-plist +++ b/www/xpi-uBlock_origin/pkg-plist @@ -1,18 +1,18 @@ %%XPI_XPIDIR%%/1p-filters.html %%XPI_XPIDIR%%/3p-filters.html -%%XPI_XPIDIR%%/LICENSE.txt %%XPI_XPIDIR%%/about.html +%%XPI_XPIDIR%%/advanced-settings.html %%XPI_XPIDIR%%/asset-viewer.html %%XPI_XPIDIR%%/assets/checksums.txt %%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt %%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt -%%XPI_XPIDIR%%/assets/thirdparties/mirror1.malwaredomains.com/files/README.md %%XPI_XPIDIR%%/assets/thirdparties/mirror1.malwaredomains.com/files/justdomains +%%XPI_XPIDIR%%/assets/thirdparties/mirror1.malwaredomains.com/files/README.md %%XPI_XPIDIR%%/assets/thirdparties/pgl.yoyo.org/as/README.md %%XPI_XPIDIR%%/assets/thirdparties/pgl.yoyo.org/as/serverlist %%XPI_XPIDIR%%/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat -%%XPI_XPIDIR%%/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md %%XPI_XPIDIR%%/assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt +%%XPI_XPIDIR%%/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md %%XPI_XPIDIR%%/assets/ublock/badware.txt %%XPI_XPIDIR%%/assets/ublock/experimental.txt %%XPI_XPIDIR%%/assets/ublock/filter-lists.json @@ -26,13 +26,14 @@ %%XPI_XPIDIR%%/css/1p-filters.css %%XPI_XPIDIR%%/css/3p-filters.css %%XPI_XPIDIR%%/css/about.css +%%XPI_XPIDIR%%/css/advanced-settings.css %%XPI_XPIDIR%%/css/cloud-ui.css %%XPI_XPIDIR%%/css/common.css %%XPI_XPIDIR%%/css/dashboard-common.css %%XPI_XPIDIR%%/css/dashboard.css %%XPI_XPIDIR%%/css/dyna-rules.css -%%XPI_XPIDIR%%/css/fonts/OFL.txt %%XPI_XPIDIR%%/css/fonts/fontawesome-webfont.ttf +%%XPI_XPIDIR%%/css/fonts/OFL.txt %%XPI_XPIDIR%%/css/legacy-toolbar-button.css %%XPI_XPIDIR%%/css/logger-ui-inspector.css %%XPI_XPIDIR%%/css/logger-ui.css @@ -58,6 +59,7 @@ %%XPI_XPIDIR%%/js/1p-filters.js %%XPI_XPIDIR%%/js/3p-filters.js %%XPI_XPIDIR%%/js/about.js +%%XPI_XPIDIR%%/js/advanced-settings.js %%XPI_XPIDIR%%/js/asset-viewer.js %%XPI_XPIDIR%%/js/assets.js %%XPI_XPIDIR%%/js/background.js @@ -111,6 +113,7 @@ %%XPI_XPIDIR%%/lib/publicsuffixlist.js %%XPI_XPIDIR%%/lib/punycode.js %%XPI_XPIDIR%%/lib/yamd5.js +%%XPI_XPIDIR%%/LICENSE.txt %%XPI_XPIDIR%%/locale/ar/messages.properties %%XPI_XPIDIR%%/locale/bg/messages.properties %%XPI_XPIDIR%%/locale/bn/messages.properties diff --git a/x11-themes/qt5-style-plugins/pkg-plist b/x11-themes/qt5-style-plugins/pkg-plist index 54528090c70..44825186d54 100644 --- a/x11-themes/qt5-style-plugins/pkg-plist +++ b/x11-themes/qt5-style-plugins/pkg-plist @@ -1,4 +1,4 @@ -%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_.cmake +lib/cmake/Qt5Widgets/Qt5Widgets_.cmake %%QT_PLUGINDIR%%/styles/libqcleanlooksstyle.so %%QT_PLUGINDIR%%/styles/libqmotifstyle.so %%QT_PLUGINDIR%%/styles/libqplastiquestyle.so diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 379631abc4c..bd04cb7d59c 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -51,10 +51,11 @@ GDK_PIXBUF_DESC= Use gdk-pixbuf for background images NOTIFY_DESC= Freedesktop startup notification support 256_COLOR_DESC= Support for 256 colors -OPTIONS_DEFAULT=PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR \ - NEXT_SCROLLBAR XTERM_SCROLLBAR BACKSPACE_KEY DELETE_KEY \ - MOUSEWHEEL SMART_RESIZE IMLOCALE_FIX GDK_PIXBUF \ - 256_COLOR +OPTIONS_DEFAULT= PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR \ + NEXT_SCROLLBAR XTERM_SCROLLBAR BACKSPACE_KEY DELETE_KEY \ + MOUSEWHEEL SMART_RESIZE IMLOCALE_FIX GDK_PIXBUF \ + 256_COLOR +OPTIONS_EXCLUDE_armv6= IMLOCALE_FIX PORTDOCS1= Changes README.FAQ README.configure PORTDOCS= README.xvt ${PORTDOCS1} diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index 03efe92fb6e..2438632bf38 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-clipman-plugin -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -26,5 +26,6 @@ USE_XFCE= panel USE_XORG= ice sm x11 xtst xproto USES= gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3 INSTALLS_ICONS= yes +INSTALL_TARGET= install-strip .include diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo index 534370ae5c7..b0e930d5187 100644 --- a/x11/xfce4-clipman-plugin/distinfo +++ b/x11/xfce4-clipman-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473932421 -SHA256 (xfce4/xfce4-clipman-plugin-1.4.0.tar.bz2) = a97671540663df1d90503f73695ac36e16fa2c832be8845ad9402529b8148294 -SIZE (xfce4/xfce4-clipman-plugin-1.4.0.tar.bz2) = 471045 +TIMESTAMP = 1480392800 +SHA256 (xfce4/xfce4-clipman-plugin-1.4.1.tar.bz2) = 341cce9665a89e5930e754ef3e27ff97594da22b82b1403099ebcf5c18a5351f +SIZE (xfce4/xfce4-clipman-plugin-1.4.1.tar.bz2) = 484795 diff --git a/x11/xfce4-clipman-plugin/files/patch-panel-plugin_Makefile.in b/x11/xfce4-clipman-plugin/files/patch-panel-plugin_Makefile.in deleted file mode 100644 index 485f46e8c8a..00000000000 --- a/x11/xfce4-clipman-plugin/files/patch-panel-plugin_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- panel-plugin/Makefile.in.orig 2016-09-15 08:18:26 UTC -+++ panel-plugin/Makefile.in -@@ -1326,7 +1326,8 @@ uninstall-am: uninstall-actionsDATA unin - @INTLTOOL_DESKTOP_RULE@ - - install-exec-hook: -- $(LN_S) -f $(exec_prefix)/bin/xfce4-popup-clipman $(DESTDIR)$(exec_prefix)/bin/xfce4-popup-clipman-actions -+ cd $(DESTDIR)$(exec_prefix)/bin && \ -+ $(LN_S) xfce4-popup-clipman xfce4-popup-clipman-actions - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist index e0e18c6e482..b70f832c4a3 100644 --- a/x11/xfce4-clipman-plugin/pkg-plist +++ b/x11/xfce4-clipman-plugin/pkg-plist @@ -7,10 +7,12 @@ etc/xdg/xfce4/panel/xfce4-clipman-actions.xml lib/xfce4/panel/plugins/libclipman.so share/appdata/xfce4-clipman.appdata.xml share/applications/xfce4-clipman.desktop +share/icons/hicolor/16x16/apps/clipman-symbolic.svg share/icons/hicolor/16x16/apps/xfce4-clipman-plugin.png -share/icons/hicolor/22x22/apps/xfce4-clipman-plugin.png share/icons/hicolor/24x24/apps/xfce4-clipman-plugin.png share/icons/hicolor/32x32/apps/xfce4-clipman-plugin.png +share/icons/hicolor/48x48/apps/xfce4-clipman-plugin.png +share/icons/hicolor/64x64/apps/xfce4-clipman-plugin.png share/icons/hicolor/scalable/apps/xfce4-clipman-plugin.svg share/locale/ar/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/ast/LC_MESSAGES/xfce4-clipman-plugin.mo