Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed Nov 30, 2016
1 parent 82fe404 commit 2b828c8
Showing 138 changed files with 729 additions and 490 deletions.
8 changes: 7 additions & 1 deletion archivers/unrar/Makefile
Original file line number Diff line number Diff line change
@@ -38,4 +38,10 @@ do-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/

.include <bsd.port.mk>
.include <bsd.port.pre.mk>

.if ${SSL_DEFAULT:Mopenssl-devel}
BROKEN= Does not build with openssl-devel
.endif

.include <bsd.port.post.mk>
20 changes: 10 additions & 10 deletions cad/qelectrotech/pkg-plist
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion databases/p5-DBD-mysql/Makefile
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= DBD-mysql
PORTVERSION= 4.040
PORTVERSION= 4.041
CATEGORIES= databases perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
6 changes: 3 additions & 3 deletions databases/p5-DBD-mysql/distinfo
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions databases/postgresql92-server/Makefile
Original file line number Diff line number Diff line change
@@ -204,6 +204,10 @@ CONFIGURE_ARGS+=--with-krb5
# For testing files in FILESDIR
.include <bsd.port.pre.mk>

.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
2 changes: 1 addition & 1 deletion databases/py-alembic/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= alembic
PORTVERSION= 0.8.8
PORTVERSION= 0.8.9
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6 changes: 3 additions & 3 deletions databases/py-alembic/distinfo
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions deskutils/howm/Makefile
Original file line number Diff line number Diff line change
@@ -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= [email protected]
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 \
5 changes: 3 additions & 2 deletions deskutils/howm/distinfo
Original file line number Diff line number Diff line change
@@ -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
18 changes: 9 additions & 9 deletions deskutils/howm/files/patch-howm-vars.el
Original file line number Diff line number Diff line change
@@ -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"))
2 changes: 1 addition & 1 deletion devel/binutils/Makefile
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

PORTNAME= binutils
PORTVERSION= 2.27
PORTREVISION= 4
PORTREVISION= 5
PORTEPOCH?= 1
CATEGORIES?= devel
MASTER_SITES= SOURCEWARE/binutils/releases
28 changes: 28 additions & 0 deletions devel/binutils/files/patch-bfd_elfnn-aarch64.c
Original file line number Diff line number Diff line change
@@ -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:
20 changes: 13 additions & 7 deletions devel/elfkickers/Makefile
Original file line number Diff line number Diff line change
@@ -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= [email protected]
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 <bsd.port.mk>
5 changes: 3 additions & 2 deletions devel/elfkickers/distinfo
Original file line number Diff line number Diff line change
@@ -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
27 changes: 0 additions & 27 deletions devel/elfkickers/files/patch-elfrw__elfrw.h

This file was deleted.

25 changes: 0 additions & 25 deletions devel/elfkickers/files/patch-elftoc__mknames.c

This file was deleted.

13 changes: 0 additions & 13 deletions devel/elfkickers/files/patch-elftoc__outbase.h

This file was deleted.

13 changes: 0 additions & 13 deletions devel/elfkickers/files/patch-elftoc__pieces.c

This file was deleted.

15 changes: 0 additions & 15 deletions devel/elfkickers/files/patch-elftoc__readelf.h

This file was deleted.

6 changes: 3 additions & 3 deletions devel/liblxqt/pkg-plist
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions devel/libqtxdg/pkg-plist
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion devel/p5-AnyEvent-Filesys-Notify/Makefile
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 2b828c8

Please sign in to comment.