Re: [update] lang/rust 1.17.0
On Fri, Apr 28, 2017 at 05:01:34PM +0100, Edd Barrett wrote: > On Fri, Apr 28, 2017 at 12:16:09PM +0200, Sebastien Marie wrote: > > Thanks for catching it edd@ ! > > No worries! > > I've now managed to update rust and cargo. I think I've found a > regression in cargo here: > > ---8<--- > wilfred> rm -rf ~/.cargo > wilfred> cargo install --verbose rustfmt > [...] > error: failed to compile `rustfmt v0.8.3`, intermediate artifacts can be > found at `/tmp/cargo-install.Z19N6YGnaln6` > > Caused by: > couldn't get the path to cargo executable > > Caused by: > no current exe available (short) it seems cargo start to use env::current_exe() function. It is unsupported under OpenBSD (specially when argv[0] contains just "cargo" and not a full path). So I replaced the inconditional use of env::current_exe() with a fallback to ${LOCALBASE}/bin/cargo. We already have similar workaround inside rustc. FYI, there is also an issue with cargo 0.18.0 and firefox 53. See https://bugzilla.mozilla.org/show_bug.cgi?id=1360521. The behaviour of cargo changed regarding 'build.rs' execution (build-time configuration program). Thanks for the deeper checks. -- Sebastien Marie Index: Makefile === RCS file: /cvs/ports/devel/cargo/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile15 Feb 2017 12:49:42 - 1.11 +++ Makefile29 Apr 2017 04:45:31 - @@ -4,27 +4,24 @@ COMMENT = package manager for Rust langu ONLY_FOR_ARCHS = amd64 i386 # cargo version -CARGO_VERSION =0.16.0 +CARGO_VERSION =0.18.0 +RUSTC_VERSION =1.17.0 # cargo version used for bootstrapping -BV-amd64 = 0.16.0-20170213 -BV-i386 = 0.16.0-20170213 +BV-amd64 = 0.18.0-20170426 +BV-i386 = 0.18.0-20170426 BOOTSTRAP_VERSION =${BV-${MACHINE_ARCH}} -# rust-install submodule version in cargo/src/rust-installer -# see https://github.com/rust-lang/cargo/tree/${CARGO_VERSION}/src -RUSTINSTALL_INDEX =4f994850808a572e2cc8d43f968893c8e942e9bf - - -DISTNAME = cargo-${CARGO_VERSION} +PKGNAME = cargo-${CARGO_VERSION} +DISTNAME = rustc-${RUSTC_VERSION}-src CATEGORIES = devel HOMEPAGE = https://doc.crates.io/ MAINTAINER = Sebastien Marie -DIST_SUBDIR = cargo -MODCARGO_DIST_SUBDIR = +DIST_SUBDIR = rust +MODCARGO_DIST_SUBDIR = ../cargo # cargo is dual licensed MIT/Apache-2.0 # third-parties (detail below): @@ -36,85 +33,103 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB = c crypto curl git2 m pthread ssh2 ssl z -MASTER_SITES = https://github.com/rust-lang/ -DISTFILES += cargo-${CARGO_VERSION}.tar.gz{cargo/archive/${CARGO_VERSION}.tar.gz} -DISTFILES += rust-installer-${RUSTINSTALL_INDEX}.tar.gz{rust-installer/archive/${RUSTINSTALL_INDEX}.tar.gz} - MODCARGO_CRATES += advapi32-sys-0.2.0 # MIT MODCARGO_CRATES += aho-corasick-0.5.3 # Unlicense/MIT +MODCARGO_CRATES += aho-corasick-0.6.3 # Unlicense/MIT MODCARGO_CRATES += bitflags-0.7.0 # MIT/Apache-2.0 MODCARGO_CRATES += bufstream-0.1.2 # MIT/Apache-2.0 MODCARGO_CRATES += cfg-if-0.1.0# MIT/Apache-2.0 -MODCARGO_CRATES += cmake-0.1.19# MIT/Apache-2.0 +MODCARGO_CRATES += chrono-0.2.25 # MIT/Apache-2.0 +MODCARGO_CRATES += cmake-0.1.22# MIT/Apache-2.0 MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT -MODCARGO_CRATES += curl-0.4.1 # MIT -MODCARGO_CRATES += curl-sys-0.3.6 # MIT -MODCARGO_CRATES += docopt-0.6.86 # Unlicense/MIT -MODCARGO_CRATES += env_logger-0.3.5# MIT/Apache-2.0 +MODCARGO_CRATES += curl-0.4.6 # MIT +MODCARGO_CRATES += curl-sys-0.3.11 # MIT +MODCARGO_CRATES += docopt-0.7.0# Unlicense/MIT +MODCARGO_CRATES += dtoa-0.4.1 # MIT/Apache-2.0 +MODCARGO_CRATES += env_logger-0.4.2# MIT/Apache-2.0 MODCARGO_CRATES += filetime-0.1.10 # MIT/Apache-2.0 -MODCARGO_CRATES += flate2-0.2.14 # MIT/Apache-2.0 -MODCARGO_CRATES += fs2-0.3.0 # MIT/Apache-2.0 -MODCARGO_CRATES += gcc-0.3.39 # MIT/Apache-2.0 +MODCARGO_CRATES += flate2-0.2.17 # MIT/Apache-2.0 +MODCARGO_CRATES += foreign-types-0.2.0 # MIT/Apache-2.0 +MODCARGO_CRATES += fs2-0.4.1 # MIT/Apache-2.0 +MODCARGO_CRATES += gcc-0.3.45 # MIT/Apache-2.0 MODCARGO_CRATES += gdi32-sys-0.2.0 # MIT -MODCARGO_CRATES += git2-0.6.3 # MIT/Apache-2.0 +MODCARGO_CRATES += git2-0.6.4 # MIT/Apache-2.0 MODCARGO_CRATES += git2-curl-0.7.0 # MIT/Apache-2.0 MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0 MODCARGO_CRATES += hamcrest-0.1.1 # MIT/Apache-2.0 MODCARGO_CRATES += idna-0.1.0 # MIT/Apache-2.0 +MODCARGO_CRATES += itoa-0.3.1 # MIT/Apache-2.0 MODCARGO_CRATES += kernel32-sys-0.2.2 # MIT -MODCARGO_CRATES += lazy_static-0.2.2 # MIT -MODCARGO_CRATES +=
UPDATE: sqlite3-tcl
Update to same version as sqlite3. This is a loadable lib; don't treat it as a linkable lib. I can take maintainership. Stu Index: Makefile === RCS file: /cvs/ports/databases/sqlite3-tcl/Makefile,v retrieving revision 1.1 diff -u -p -u -p -r1.1 Makefile --- Makefile23 Sep 2016 09:14:53 - 1.1 +++ Makefile29 Apr 2017 02:18:49 - @@ -2,13 +2,11 @@ COMMENT= Tcl bindings for sqlite3 (embedded SQL implementation) -DISTNAME= sqlite-autoconf-3140200 -PKGNAME= sqlite3-tcl-3.14.2 +DISTNAME= sqlite-autoconf-317 +PKGNAME= sqlite3-tcl-3.17.0 WRKSRC=${WRKDIST}/tea -SHARED_LIBS += sqlite31420.0 # 1.0 - CATEGORIES=databases HOMEPAGE= http://www.sqlite.org/ @@ -16,22 +14,21 @@ HOMEPAGE= http://www.sqlite.org/ # PD PERMIT_PACKAGE_CDROM= Yes -WANTLIB += pthread sqlite3 +WANTLIB += pthread -MASTER_SITES= ${HOMEPAGE}2016/ +MASTER_SITES= ${HOMEPAGE}2017/ +SEPARATE_BUILD=Yes CONFIGURE_STYLE= gnu MODULES+= lang/tcl BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} RUN_DEPENDS= ${MODTCL_RUN_DEPENDS} -LIB_DEPENDS= databases/sqlite3 FAKE_FLAGS= PKG_DIR=sqlite3 CONFIGURE_ARGS=--with-tcl=${MODTCL_LIBDIR} \ - --libdir=${MODTCL_TCLDIR} \ - SHLIB_VERSION=${LIBsqlite3142_VERSION} + --libdir=${MODTCL_TCLDIR} # for mozilla CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY Index: distinfo === RCS file: /cvs/ports/databases/sqlite3-tcl/distinfo,v retrieving revision 1.1 diff -u -p -u -p -r1.1 distinfo --- distinfo23 Sep 2016 09:14:53 - 1.1 +++ distinfo29 Apr 2017 02:18:49 - @@ -1,2 +1,2 @@ -SHA256 (sqlite-autoconf-3140200.tar.gz) = ZE8MEn99DL6HZbm7357QnWovK537pI3f2MoKQv21s/w= -SIZE (sqlite-autoconf-3140200.tar.gz) = 2472940 +SHA256 (sqlite-autoconf-317.tar.gz) = pOSFrToW4FR2W69jcYJrUAC+7QfmJlEIlgacC/ATh0w= +SIZE (sqlite-autoconf-317.tar.gz) = 2515143 Index: patches/patch-tea_configure === RCS file: patches/patch-tea_configure diff -N patches/patch-tea_configure --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-tea_configure 29 Apr 2017 02:18:49 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tea/configure.orig Wed Apr 26 16:58:46 2017 tea/configure Wed Apr 26 16:59:16 2017 +@@ -7237,7 +7237,7 @@ fi + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + fi + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' + LDFLAGS="-Wl,-export-dynamic" + ;; + esac Index: pkg/PLIST === RCS file: /cvs/ports/databases/sqlite3-tcl/pkg/PLIST,v retrieving revision 1.1 diff -u -p -u -p -r1.1 PLIST --- pkg/PLIST 23 Sep 2016 09:14:53 - 1.1 +++ pkg/PLIST 29 Apr 2017 02:18:49 - @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST,v 1.1 2016/09/23 09:14:53 sthen Exp $ @pkgpath databases/sqlite3,-tcl lib/tcl/sqlite3/ -@lib lib/tcl/sqlite3/libsqlite3142.so.${LIBsqlite3142_VERSION} +lib/tcl/sqlite3/libsqlite3170.so lib/tcl/sqlite3/pkgIndex.tcl @man man/mann/sqlite3.n
UPDATE: cad/klogic
Hi ports@, please find below a diff to update klogic. That means one KDE3 port less in our tree. *hooray* Comments? Ok? Yes, it is KDE so be brave! Best regards Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/cad/klogic/Makefile,v retrieving revision 1.36 diff -u -p -u -p -r1.36 Makefile --- Makefile10 Apr 2017 11:45:24 - 1.36 +++ Makefile28 Apr 2017 19:30:11 - @@ -1,45 +1,31 @@ # $OpenBSD: Makefile,v 1.36 2017/04/10 11:45:24 sthen Exp $ -COMMENT= logic circuit simulator for KDE +COMMENT = logic circuit simulator for KDE -DISTNAME= klogic-1.6 -REVISION= 12 -CATEGORIES=cad education x11 x11/kde - -MASTER_SITES= https://distfiles.nl/ - -# GPL -PERMIT_PACKAGE_CDROM= Yes - -WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu -WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient -WANTLIB += GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama Xmu -WANTLIB += Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm expat fontconfig -WANTLIB += freetype idn jpeg lcms m mng png pthread ${LIBCXX} util xcb -WANTLIB += xcb-glx z X11-xcb Xau Xdmcp fam glapi pthread-stubs xcb-dri2 - -LIB_DEPENDS= x11/kde/libs3 - -MODULES= x11/kde devel/gettext -MODKDE_VERSION=3.1 -MODKDE_FIXUP_DATADIR= Yes - -PORTHOME= ${WRKDIR} - -MAKE_ENV= KDEDIR="${LOCALBASE}" -MAKE_FLAGS=${MODKDE_MAKE_FLAGS} - -USE_GMAKE= Yes -CONFIGURE_STYLE= autoconf -MODGNU_CONFIG_GUESS_DIRS= ${MODKDE_CONFIG_GUESS_DIRS} -CONFIGURE_ARGS=${MODKDE_CONFIGURE_ARGS} -CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV} -AUTOCONF_VERSION= 2.57 - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps - mv ${PREFIX}/share/icons/klogic/*.xpm ${PREFIX}/share/pixmaps/ - rmdir ${PREFIX}/share/icons/klogic - rmdir ${PREFIX}/share/icons +DISTNAME = klogic-4.0.2 + +CATEGORIES = cad education x11 + +HOMEPAGE = http://www.a-rostin.de + +MASTER_SITES = ${HOMEPAGE}/klogic/releases/ +EXTRACT_SUFX = .tar.gz + +WANTLIB += QtDBus QtGui QtNetwork QtSvg QtXml c +WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio m pthread + +# License information from homepage +# GPLv3 +PERMIT_PACKAGE_CDROM = Yes + +MODULES = x11/kde4 \ + devel/cmake + +RUN_DEPENDS = devel/desktop-file-utils \ + x11/gtk+3,-guic + +BUILD_DEPENDS =devel/gettext-tools + +NO_TEST = Yes .include Index: distinfo === RCS file: /cvs/ports/cad/klogic/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo18 Jan 2015 03:12:54 - 1.6 +++ distinfo28 Apr 2017 19:30:11 - @@ -1,2 +1,2 @@ -SHA256 (klogic-1.6.tar.gz) = pHRXim+xeOJKqYS7iEl+u8NB1s6LxMOzh3cYKmUqBH4= -SIZE (klogic-1.6.tar.gz) = 973713 +SHA256 (klogic-4.0.2.tar.gz) = gyDh7pAz8OvD61gmBrWh0JDdmBDbZ5qJFPiWojNPPCk= +SIZE (klogic-4.0.2.tar.gz) = 294804 Index: patches/patch-klogic_klogic_h === RCS file: /cvs/ports/cad/klogic/patches/patch-klogic_klogic_h,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-klogic_klogic_h --- patches/patch-klogic_klogic_h 23 May 2010 09:13:15 - 1.1 +++ patches/patch-klogic_klogic_h 28 Apr 2017 19:30:11 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-klogic_klogic_h,v 1.1 2010/05/23 09:13:15 espie Exp $ klogic/klogic.h.orig Sat May 22 12:48:04 2010 -+++ klogic/klogic.hSat May 22 12:48:10 2010 -@@ -57,7 +57,7 @@ namespace Global - static QString comment; - }; - --}; -+} - - class uniqueID - { Index: patches/patch-klogic_mainw_cpp === RCS file: /cvs/ports/cad/klogic/patches/patch-klogic_mainw_cpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-klogic_mainw_cpp --- patches/patch-klogic_mainw_cpp 23 May 2010 09:13:15 - 1.2 +++ patches/patch-klogic_mainw_cpp 28 Apr 2017 19:30:11 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-klogic_mainw_cpp,v 1.2 2010/05/23 09:13:15 espie Exp $ klogic/mainw.cpp.orig Sat Nov 15 02:21:33 2003 -+++ klogic/mainw.cpp Sat May 22 12:04:04 2010 -@@ -82,7 +82,7 @@ void MainWidget::setPATH(KApplication *app) - /* methods of class MainWidget */ - /***/ - MainWidget::MainWidget(KApplication *_app, const char *file) -- :KMainWindow(NULL) -+ :KMainWindow(NULL, file) - { - app = _app; - setPATH(app); Index: pkg/DESCR === RCS file: /cvs/ports/cad/klogic/pkg/DESCR,v retrieving revision 1.3 diff -u -p -u -p -r1.3 DESCR --- pkg/DESCR 15 Mar 2005 01:57:02 - 1.3 +++ pkg/DESCR 28 Apr 2017 19:30:11 - @@ -1,8 +1,9 @@ Application for building and simulating digital circuits easily. Provides an easy way for bui
Re: graphics/digikam-kde4: remove doxygen as BUILD_DEPENDS
Rafael Sadowski writes: > Hi ports@, > > please find below a simple diff to remove doxygen as BUILD_DEPENDS. No > changes in plist because digikam only creates a CMake target which is > never called. > > Comments? Ok? If it builds, ship it. :) > Best regards, > > Rafael Sadowski > > Index: Makefile > === > RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v > retrieving revision 1.23 > diff -u -p -u -p -r1.23 Makefile > --- Makefile 2 Feb 2017 12:57:28 - 1.23 > +++ Makefile 28 Apr 2017 05:46:34 - > @@ -94,7 +94,6 @@ WANTLIB-mediawiki += ${KDE4LIB}/kio > > BUILD_DEPENDS = devel/bison \ > devel/boost \ > - devel/doxygen \ > math/eigen3 \ > misc/shared-desktop-ontologies > > @@ -166,6 +165,7 @@ CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PA > -DCMAKE_DISABLE_FIND_PACKAGE_QtSoap:Bool=Yes \ > -DENABLE_INTERNALMYSQL:Bool=No \ > -DENABLE_KDEPIMLIBSSUPPORT:Bool=Yes \ > + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes \ > -DENABLE_LCMS2:Bool=Yes > > # no official release yet > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
graphics/digikam-kde4: remove doxygen as BUILD_DEPENDS
Hi ports@, please find below a simple diff to remove doxygen as BUILD_DEPENDS. No changes in plist because digikam only creates a CMake target which is never called. Comments? Ok? Best regards, Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v retrieving revision 1.23 diff -u -p -u -p -r1.23 Makefile --- Makefile2 Feb 2017 12:57:28 - 1.23 +++ Makefile28 Apr 2017 05:46:34 - @@ -94,7 +94,6 @@ WANTLIB-mediawiki += ${KDE4LIB}/kio BUILD_DEPENDS =devel/bison \ devel/boost \ - devel/doxygen \ math/eigen3 \ misc/shared-desktop-ontologies @@ -166,6 +165,7 @@ CONFIGURE_ARGS =-DCMAKE_DISABLE_FIND_PA -DCMAKE_DISABLE_FIND_PACKAGE_QtSoap:Bool=Yes \ -DENABLE_INTERNALMYSQL:Bool=No \ -DENABLE_KDEPIMLIBSSUPPORT:Bool=Yes \ + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes \ -DENABLE_LCMS2:Bool=Yes # no official release yet
Re: [update] lang/rust 1.17.0
On Fri, Apr 28, 2017 at 12:16:09PM +0200, Sebastien Marie wrote: > Thanks for catching it edd@ ! No worries! I've now managed to update rust and cargo. I think I've found a regression in cargo here: ---8<--- wilfred> rm -rf ~/.cargo wilfred> cargo install --verbose rustfmt Updating registry `https://github.com/rust-lang/crates.io-index` Downloading rustfmt v0.8.3 Installing rustfmt v0.8.3 Downloading diff v0.1.10 Downloading multimap v0.3.0 Downloading toml v0.2.1 Downloading rustc-serialize v0.3.24 Downloading syntex_syntax v0.58.1 Downloading unicode-segmentation v1.1.0 Downloading log v0.3.7 Downloading env_logger v0.4.2 Downloading getopts v0.2.14 Downloading term v0.4.5 Downloading strings v0.0.1 Downloading syntex_errors v0.58.1 Downloading regex v0.2.1 Downloading itertools v0.5.10 Downloading syntex_pos v0.58.1 Downloading bitflags v0.8.2 Downloading unicode-xid v0.0.4 Downloading libc v0.2.22 Downloading regex-syntax v0.4.0 Downloading thread_local v0.3.3 Downloading utf8-ranges v1.0.0 Downloading memchr v1.0.1 Downloading aho-corasick v0.6.3 Downloading unreachable v0.1.1 Downloading void v1.0.2 Downloading either v1.1.0 Downloading walkdir v1.0.7 Downloading same-file v0.1.3 Downloading thread-id v3.0.0 error: failed to compile `rustfmt v0.8.3`, intermediate artifacts can be found at `/tmp/cargo-install.Z19N6YGnaln6` Caused by: couldn't get the path to cargo executable Caused by: no current exe available (short) wilfred> which cargo /usr/local/bin/cargo wilfred> cargo -V cargo 0.18.0 wilfred> rustc -V rustc 1.17.0 --->8--- Something to do with the wrapper changes? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: [UPDATE] Tor Browser 6.5.2
On Thu, Apr 27, 2017 at 09:59:32AM -0500, attila wrote: > Hi ports@, > > Attached is an update to Tor Broweer 6.5.2. Lightly tested on amd64. > Would appreciate more testing and, as always, any other feedback most > welcome. My build crashed out. I'll try again tomorrow on a new snap: ---8<--- ... cc -o /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil -fPIC -DPIC -ansi -Wall -Wno-switch -pipe -DOPENBSD -DXP_UNIX -DNSPR20 -UDEBUG -DNDEBUG -pthread -DUSE_UTIL_DIRECTLY -DNO_NSPR_10_SUPPORT -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -I/usr/local/include/nspr -I/usr/local/include/nspr -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/include/nss -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/private/nss -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/include/dbm -I/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/include/seccmd -I/usr/X11R6/include /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certext.o /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil.o /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/keystuff.o /usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib/libsectool.a -L/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib -lssl3 -lsmime3 -lnss3 -L/usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib -lnssutil3 -L/usr/local/lib -lplc4 -lplds4 -lnspr4 clang-4.0: warning: argument unused during compilation: '-ansi' [-Wunused-command-line-argument] /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certext.o: In function `AddCertPolicies': certext.c:(.text+0x2660): warning: warning: strcpy() is almost always misused, please use strlcpy() /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil.o: In function `getObjectClass': certutil.c:(.text+0x88): warning: warning: sprintf() is often misused, please use snprintf() /usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/lib/libsectool.a(secutil.o): In function `printflags': secutil.c:(.text+0x46aa): warning: warning: strcat() is almost always misused, please use strlcat() /usr/local/pobj/tb-browser-6.5.2/build-amd64/config/nsinstall -R -m 775 /usr/local/pobj/tb-browser-6.5.2/build-amd64/security//usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil/certutil /usr/local/pobj/tb-browser-6.5.2/build-amd64/dist/bin gmake[4]: Leaving directory '/usr/local/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/security/nss/cmd/certutil' gmake[3]: Leaving directory '/usr/local/pobj/tb-browser-6.5.2/build-amd64/config/external/nss' gmake[3]: Entering directory '/usr/local/pobj/tb-browser-6.5.2/build-amd64/config/external/nss/crmf' gmake[3]: *** No rule to make target '../../../../security/nss/lib/crmf/libcrmf.a', needed by 'libcrmf.a.desc'. Stop. gmake[3]: Leaving directory '/usr/local/pobj/tb-browser-6.5.2/build-amd64/config/external/nss/crmf' gmake[2]: *** [/usr/ports/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/config/recurse.mk:71: config/external/nss/crmf/target] Error 2 gmake[2]: Leaving directory '/usr/local/pobj/tb-browser-6.5.2/build-amd64' gmake[1]: *** [/usr/ports/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/config/recurse.mk:33: compile] Error 2 gmake[1]: Leaving directory '/usr/local/pobj/tb-browser-6.5.2/build-amd64' gmake: *** [/usr/ports/pobj/tb-browser-6.5.2/torb-6.5.2-esr45.9.0/config/rules.mk:547: all] Error 2 *** Error 2 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:2666 '/usr/ports/pobj/tb-browser-6.5.2/build-amd64/.build_done') *** Error 1 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:1889 '/usr/ports/packages/amd64/all/tb-browser-6.5.2.tgz') *** Error 1 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:2388 '_internal-package') *** Error 1 in browser (/usr/ports/infrastructure/mk/bsd.port.mk:2367 'package') ===> Exiting www/tor-browser/browser with an error *** Error 1 in /usr/ports/www/tor-browser (/usr/ports/infrastructure/mk/bsd.port.subdir.mk:147 'package') --->8--- -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: devel/intellij 2017.1.2
On Thu, Apr 27, 2017 at 09:40:50PM +0100, Stuart Henderson wrote: > On 2017/04/27 21:14, Caspar Schutijser wrote: > > Below is a new diff that updates devel/intellij to 2017.1.2. In addition > > to the update, I modified the startup script (files/idea) to increase > > datasize-cur, similar to what the chromium port is doing. This was > > prompted by an email from gpdsb at mailbox dot org on misc@. > > > > On amd64, I tried out different values for datasize-cur. I settled > > on 2048000; 1536000 was not enough on amd64. On i386, where I also did > > some testing this time, 1536000 seems to be enough but I don't think > > making it dependent on the architecture is the way to go here. > > Comments/input welcome. > > They are specifically using different max heap size and other JVM > options on different arches (see idea.vmoptions, idea64.vmoptions), > so it might actually make sense to make this arch-dependent. Ah, that's right. Thanks! Diff below sets a lower value for i386. Thanks, Caspar Schutijser Index: Makefile === RCS file: /cvs/ports/devel/intellij/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- Makefile9 Mar 2017 06:28:48 - 1.42 +++ Makefile28 Apr 2017 13:18:27 - @@ -2,7 +2,7 @@ COMMENT= IntelliJ IDEA Java IDE -V= 2016.3.5 +V= 2017.1.2 DISTNAME= ideaIC-${V} PKGNAME= intellij-${V} CATEGORIES=devel @@ -26,7 +26,7 @@ NO_TEST= Yes SUBST_VARS+= JAVA_HOME -WRKDIST= ${WRKDIR}/idea-IC-163.13906.18 +WRKDIST= ${WRKDIR}/idea-IC-171.4249.39 IJ=${PREFIX}/intellij # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do @@ -38,6 +38,7 @@ do-install: ${INSTALL_DATA_DIR} ${IJ} @tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ} @rm -rf ${IJ}/jre + @rm -rf ${IJ}/jre64 @rm -rf ${IJ}/plugins/android @rm -rf ${IJ}/plugins/gradle/lib/native-platform-{freebsd,linux,osx,windows}*.jar @${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea Index: distinfo === RCS file: /cvs/ports/devel/intellij/distinfo,v retrieving revision 1.23 diff -u -p -r1.23 distinfo --- distinfo9 Mar 2017 06:28:48 - 1.23 +++ distinfo28 Apr 2017 13:18:27 - @@ -1,2 +1,2 @@ -SHA256 (ideaIC-2016.3.5.tar.gz) = hdoegQNpaMJytm9uTWLBF0VTUuvHaWknQqar/JfsvGw= -SIZE (ideaIC-2016.3.5.tar.gz) = 410605527 +SHA256 (ideaIC-2017.1.2.tar.gz) = CiJ5Snx9ipfgsXmSO/+lMRBGvA2yvDMOI6veJLY0D4s= +SIZE (ideaIC-2017.1.2.tar.gz) = 427932328 Index: files/idea === RCS file: /cvs/ports/devel/intellij/files/idea,v retrieving revision 1.2 diff -u -p -r1.2 idea --- files/idea 30 Apr 2010 19:02:17 - 1.2 +++ files/idea 28 Apr 2017 13:18:27 - @@ -5,6 +5,10 @@ # OpenBSD-specific startup script for IntelliJ IDE IDEA_HOME=${TRUEPREFIX}/intellij +DATASIZE="2048000" +if arch -s | grep i386 >/dev/null ; then + DATASIZE="1536000" +fi #- # Determine configuration settings @@ -23,6 +27,18 @@ if [ ! -x "${IDEA_HOME}/bin/idea.sh" ]; echo "Error: IDEA_HOME may not be defined correctly: ${IDEA_HOME}" echo " Unable to find launcher binary: ${IDEA_HOME}/bin/idea.sh" exit 1 +fi + +xm_log() { + echo -n "$@\nDo you want to run IntelliJ IDEA anyway?\n\ +(If you don't increase these limits, IntelliJ IDEA might fail to work properly.)" | \ + ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1 -default no +} + +if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then + ulimit -Sd ${DATASIZE} || \ + xm_log "Cannot increase datasize-cur to at least ${DATASIZE}" + [ $? -eq 0 ] || exit fi PATH=${IDEA_JDK}/bin:$PATH exec "${IDEA_HOME}/bin/idea.sh" $@ Index: pkg/PLIST === RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v retrieving revision 1.25 diff -u -p -r1.25 PLIST --- pkg/PLIST 7 Feb 2017 09:36:22 - 1.25 +++ pkg/PLIST 28 Apr 2017 13:18:27 - @@ -17,8 +17,6 @@ intellij/bin/idea.sh intellij/bin/idea.vmoptions intellij/bin/idea64.vmoptions intellij/bin/inspect.sh -intellij/bin/libbreakgen.so -intellij/bin/libbreakgen64.so intellij/bin/log.xml intellij/bin/printenv.py intellij/bin/restart.py @@ -126,6 +124,7 @@ intellij/lib/jayatana-1.2.4.jar intellij/lib/jcip-annotations.jar intellij/lib/jdkAnnotations.jar intellij/lib/jdom.jar +intellij/lib/jediterm-pty-2.5.jar intellij/lib/jgoodies-common-1.2.1.jar intellij/lib/jgoodies-forms.jar intellij/lib/jgoodies-looks-2.4.2.jar @@ -134,6 +133,7 @@ intellij/lib/jimfs-1.1.jar intellij/lib/jing.jar intellij/lib/j
Re: Kill math/logic2cnf?
On Wed, Apr 19, 2017 at 04:00:43PM +0100, Edd Barrett wrote: > Hi, > > Can I kill math/logic2nf? Anyone using it? Well, I didn't receive any correspondence on this, so let's go ahead. Diffs to kill the port and add quirks attached. OK? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk Index: Makefile === RCS file: /home/edd/cvsync/ports/math/Makefile,v retrieving revision 1.138 diff -u -p -r1.138 Makefile --- Makefile23 Apr 2017 17:50:01 - 1.138 +++ Makefile28 Apr 2017 11:16:18 - @@ -42,7 +42,6 @@ SUBDIR += lapack SUBDIR += libqalculate SUBDIR += libtommath - SUBDIR += logic2cnf SUBDIR += lpsolve SUBDIR += lrs SUBDIR += mathomatic Index: logic2cnf/Makefile === RCS file: logic2cnf/Makefile diff -N logic2cnf/Makefile --- logic2cnf/Makefile 10 Apr 2017 11:46:22 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,20 +0,0 @@ -# $OpenBSD: Makefile,v 1.3 2017/04/10 11:46:22 sthen Exp $ -COMMENT = easy to use propositional logic solver based on MiniSAT - -DISTNAME = logic2cnf-0.7.2 - -CATEGORIES = math lang - -HOMEPAGE = http://projects.cs.kent.ac.uk/projects/logic2cnf/trac/ -MAINTAINER = Edd Barrett - -# ISC -PERMIT_PACKAGE_CDROM = Yes - -WANTLIB += c m ${LIBCXX} - -MASTER_SITES = ${HOMEPAGE}/raw-attachment/wiki/releases/ - -CONFIGURE_STYLE = gnu - -.include Index: logic2cnf/distinfo === RCS file: logic2cnf/distinfo diff -N logic2cnf/distinfo --- logic2cnf/distinfo 18 Jan 2015 03:14:27 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,2 +0,0 @@ -SHA256 (logic2cnf-0.7.2.tar.gz) = l2DMnjfaOhlfj597ARmSCNcYrp49ZdZcj+hDszJewyY= -SIZE (logic2cnf-0.7.2.tar.gz) = 207595 Index: logic2cnf/pkg/DESCR === RCS file: logic2cnf/pkg/DESCR diff -N logic2cnf/pkg/DESCR --- logic2cnf/pkg/DESCR 24 Oct 2010 13:55:41 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,4 +0,0 @@ -Logic2CNF is an easy to use propositional logic solver based upon -MiniSAT (http://minisat.se). Logic is programmed using a simple grammar -(instead of having to convert logic to DIMACS) and all CNF conversion is -automatic. Index: logic2cnf/pkg/PLIST === RCS file: logic2cnf/pkg/PLIST diff -N logic2cnf/pkg/PLIST --- logic2cnf/pkg/PLIST 24 Oct 2010 13:55:41 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,8 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/10/24 13:55:41 edd Exp $ -@bin bin/logic2cnf -@man man/man1/logic2cnf.1 -share/l2cstd/ -share/l2cstd/l2c_arith.m4 -share/l2cstd/l2c_bitwise.m4 -share/l2cstd/l2c_sparc64.m4 -share/l2cstd/l2c_util.m4 Index: Makefile === RCS file: /home/edd/cvsync/ports/devel/quirks/Makefile,v retrieving revision 1.471 diff -u -p -r1.471 Makefile --- Makefile27 Apr 2017 09:20:23 - 1.471 +++ Makefile28 Apr 2017 11:20:16 - @@ -5,7 +5,7 @@ CATEGORIES =devel databases DISTFILES = # API.rev -PKGNAME = quirks-2.316 +PKGNAME = quirks-2.317 PKG_ARCH = * MAINTAINER = Marc Espie Index: files/Quirks.pm === RCS file: /home/edd/cvsync/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.483 diff -u -p -r1.483 Quirks.pm --- files/Quirks.pm 27 Apr 2017 09:20:23 - 1.483 +++ files/Quirks.pm 28 Apr 2017 11:21:33 - @@ -960,6 +960,7 @@ my $obsolete_reason = { 'teknap' => 6, 'trafd' => 4, 'topbeat' => 3, + 'logic2cnf' => 3, }; # reasons for obsolete packages
Re: UPDATE: TeX Live 2016
Hi, On Sat, Apr 22, 2017 at 02:48:23PM +0100, Edd Barrett wrote: > I think this can go in. TeX Live 2016. Re-tested on a partial bulk from > a snap a few days ago. Has anyone had a chance to test this? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: [update] lang/rust 1.17.0
On Fri, Apr 28, 2017 at 10:57:33AM +0100, Edd Barrett wrote: > Hi Sebastien, > > I got the sources fine, but I'm unable to get the cargo bootstrap: > > >> Fetch > >> http://kapouay.odns.fr/pub/rust/cargo-bootstrap-amd64-0.18.0-20170426.tar.gz > ftp: Error retrieving file: 404 Not Found > hep, cargo bootstrap doesn't live in /pub/rust/ but in /pub/cargo/. Below a new diff. Thanks for catching it edd@ ! -- Sebastien Marie Index: Makefile === RCS file: /cvs/ports/lang/rust/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile15 Apr 2017 19:41:36 - 1.41 +++ Makefile28 Apr 2017 10:14:39 - @@ -8,17 +8,17 @@ DPB_PROPERTIES = parallel COMMENT-main = compiler for Rust Language COMMENT-doc = html documentation for rustc -V =1.16.0 +V =1.17.0 DISTNAME = rustc-${V}-src # rustc bootstrap version -RBV-amd64 =1.16.0-20160315 -RBV-i386 = 1.16.0-20170312 +RBV-amd64 =1.17.0-20170426 +RBV-i386 = 1.17.0-20170426 RBV = ${RBV-${MACHINE_ARCH}} # cargo bootstrap version -CBV-amd64 =0.16.0-20170213 -CBV-i386 = 0.16.0-20170213 +CBV-amd64 =0.18.0-20170426 +CBV-i386 = 0.18.0-20170426 CBV = ${CBV-${MACHINE_ARCH}} PKGNAME = rust-${V} @@ -41,6 +41,7 @@ WANTLIB-doc = MASTER_SITES = https://static.rust-lang.org/dist/ MASTER_SITES0 =http://kapouay.odns.fr/pub/rust/ +MASTER_SITES1 =http://kapouay.odns.fr/pub/cargo/ DIST_SUBDIR = rust DISTFILES =${DISTNAME}${EXTRACT_SUFX} \ @@ -51,7 +52,7 @@ RBOOTSTRAP = ${RBOOTSTRAP-${MACHINE_ARC CBOOTSTRAP = ${CBOOTSTRAP-${MACHINE_ARCH}} .for m in ${ONLY_FOR_ARCHS} RBOOTSTRAP-$m =rustc-bootstrap-${m}-${RBV-$m}.tar.gz:0 -CBOOTSTRAP-$m =../cargo/cargo-bootstrap-${m}-${CBV-$m}.tar.gz:0 +CBOOTSTRAP-$m =cargo-bootstrap-${m}-${CBV-$m}.tar.gz:1 SUPDISTFILES +=${RBOOTSTRAP-$m} \ ${CBOOTSTRAP-$m} .endfor @@ -69,18 +70,12 @@ MODULES += gcc4 \ lang/python MODPY_RUNDEP = No -# use embedded or ports version of LLVM -PORTS_LLVM ?= No -.if ${PORTS_LLVM:L:Myes} -BUILD_DEPENDS += devel/llvm<4 -.else -BUILD_DEPENDS += devel/cmake \ - devel/ninja -.endif +BUILD_DEPENDS += devel/llvm \ + devel/cmake # rustllvm need c++11 MODGCC4_LANGS =c++ -MODGCC4_ARCHS =* +MODGCC4_ARCHS =* # patches required for base clang # need to be keep in sync LIBESTDC_VERSION = 17.0 @@ -140,15 +135,9 @@ do-configure: echo '[dist]' >>${WRKBUILD}/config.toml echo 'src-tarball = false' >>${WRKBUILD}/config.toml -.if ${PORTS_LLVM:L:Myes} echo '[target.${TRIPLE_ARCH}]' >>${WRKBUILD}/config.toml echo 'llvm-config = "${LOCALBASE}/bin/llvm-config"' \ >>${WRKBUILD}/config.toml -.else - echo '[llvm]' >>${WRKBUILD}/config.toml - echo 'static-libstdcpp = false' >>${WRKBUILD}/config.toml - echo 'ninja = true' >>${WRKBUILD}/config.toml -.endif rm -rf ${WRKDIR}/modgcc-libs mkdir -p ${WRKDIR}/modgcc-libs @@ -158,8 +147,10 @@ do-configure: # hack to build doc using generated stage2 instead of with stage0 # (rustdoc isn't included in our bootstrap) post-configure: - ln -fs ${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/bin/rustdoc \ - ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc + echo '#!/bin/sh' > ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc + echo 'LD_LIBRARY_PATH="${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/lib" exec "${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/bin/rustdoc" "$$@"' \ + >> ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc + chmod 755 ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc BUILD_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \ ${MODPY_BIN} ${WRKSRC}/src/bootstrap/bootstrap.py Index: distinfo === RCS file: /cvs/ports/lang/rust/distinfo,v retrieving revision 1.23 diff -u -p -r1.23 distinfo --- distinfo27 Mar 2017 12:35:31 - 1.23 +++ distinfo28 Apr 2017 10:14:39 - @@ -1,10 +1,10 @@ -SHA256 (rust/../cargo/cargo-bootstrap-amd64-0.16.0-20170213.tar.gz) = lmzvwW5K+GVu+HHcB1Y54RrVbWDrqi/XucuMJO0jQws= -SHA256 (rust/../cargo/cargo-bootstrap-i386-0.16.0-20170213.tar.gz) = BM+GckVYHmVQQkL4W02lZjUJtQyh1LbbataTVJ90Kzk= -SHA256 (rust/rustc-1.16.0-src.tar.gz) = +WazHrHNm9LfgXw5GjOO61uSU64KGb+KEZYMVg+W6LQ= -SHA256 (rust/rustc-bootstrap-amd64-1.16.0-20160315.tar.gz) = HC1aV8Oc81uiDta
Re: [update] lang/rust 1.17.0
Hi Sebastien, Again, thanks for working on Rust. On Thu, Apr 27, 2017 at 08:49:03AM +0200, Sebastien Marie wrote: > > Please note that as the release isn't officially published at time of > writing, MASTER_SITES should point to > https://dev-static.rust-lang.org/dist/ to grab the tarball. Maybe we > could add it as fallback to MASTER_SITES ? > > MASTER_SITES =https://static.rust-lang.org/dist/ \ > https://dev-static.rust-lang.org/dist/ I got the sources fine, but I'm unable to get the cargo bootstrap: >> Fetch >> http://kapouay.odns.fr/pub/rust/cargo-bootstrap-amd64-0.18.0-20170426.tar.gz ftp: Error retrieving file: 404 Not Found Cheers -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
NEW: texproc/p5-LaTeXML
Hi, Here is a new port for generating HTML/XML output from TeX files. %--- In brief, latexml is a program, written in Perl, that attempts to faithfully mimic TeX’s behavior, but produces XML instead of dvi. The document model of the target XML makes explicit the model implied by LaTeX. The processing and model are both extensible; you can define the mapping between TeX constructs and the XML fragments to be created. A postprocessor, latexmlpost converts this XML into other formats such as HTML or XHTML, with options to convert the math into MathML (currently only presentation) or images. %--- I use it to generate epub files together with calibre: latexml --dest=${NAME}.xml ${NAME}.tex \ --includestyles --preload=LaTeX.pool latexmlpost -dest=${NAME}.html ${NAME}.xml ebook-convert ${NAME}.html ${NAME}.epub \ --language en --no-default-epub-cover Also available on github for review. OK? Thanks, Paul p5-LaTeXML.tgz Description: application/tar-gz
Re: NEW: sysutils/p5-UUID-Tiny
Please ignore this. Forgot that make search name= is case sensitive. On Fri, Apr 28, 2017 at 11:10:17AM +0300, Paul Irofti wrote: > Hi, > > Here is a port for UUID-Tiny that I need as runtime dependency for > another future port. > > %--- > UUID::Tiny is a lightweight, low dependency Pure Perl module for UUID creation > and testing. This module provides the creation of version 1 time based UUIDs > (using random multicast MAC addresses), version 3 MD5 based UUIDs, > version 4 random UUIDs, and version 5 SHA-1 based UUIDs. > > ATTENTION! UUID::Tiny uses Perl's rand() to create the basic random numbers, > so the created v4 UUIDs are not cryptographically strong! > %--- > > The port is also available for review on github. > > OK? > > Paul
NEW: sysutils/p5-UUID-Tiny
Hi, Here is a port for UUID-Tiny that I need as runtime dependency for another future port. %--- UUID::Tiny is a lightweight, low dependency Pure Perl module for UUID creation and testing. This module provides the creation of version 1 time based UUIDs (using random multicast MAC addresses), version 3 MD5 based UUIDs, version 4 random UUIDs, and version 5 SHA-1 based UUIDs. ATTENTION! UUID::Tiny uses Perl's rand() to create the basic random numbers, so the created v4 UUIDs are not cryptographically strong! %--- The port is also available for review on github. OK? Paul p5-UUID-Tiny.tgz Description: application/tar-gz
Re: [PATCH] graphics/sxiv: install .desktop file
On Fri, April 28, 2017 10:43, Frederic Cambus wrote: > Hi ports@, > > Here is a diff to install the .desktop file. This allows using sxiv with > xdg-open. > > While there, remove unneeded WRKDIST variable and do some minor > reformatting. > > Comments? OK? Hi! You're missing icons for desktop file. This diff was sitting in my tree for ages: Index: Makefile === RCS file: /cvs/ports/graphics/sxiv/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile6 Jan 2016 20:02:19 - 1.9 +++ Makefile2 Aug 2016 09:37:55 - @@ -5,6 +5,7 @@ COMMENT = simple (or small or suckless) GH_PROJECT=sxiv GH_ACCOUNT=muennich GH_TAGNAME=v1.3.2 +REVISION = 0 CATEGORIES = graphics x11 @@ -17,6 +18,8 @@ WANTLIB +=Imlib2 exif gif X11 c LIB_DEPENDS = graphics/imlib2 \ graphics/libexif +RUN_DEPENDS = devel/desktop-file-utils\ + x11/gtk+3,-guic MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \ CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \ @@ -25,5 +28,10 @@ MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX NO_TEST = Yes WRKDIST= ${WRKDIR}/${PKGNAME} + +post-install: + cd ${WRKSRC}/icon/ && make install + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/sxiv.desktop ${PREFIX}/share/applications/ .include Index: patches/patch-icon_Makefile === RCS file: patches/patch-icon_Makefile diff -N patches/patch-icon_Makefile --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-icon_Makefile 2 Aug 2016 09:37:55 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- icon/Makefile.orig Sat Sep 5 14:20:51 2015 icon/Makefile Sat Sep 5 14:21:04 2015 +@@ -5,7 +5,7 @@ all: + + install: + for f in $(ICONS); do \ +- dir="$(DESTDIR)$(PREFIX)/share/icons/hicolor/$${f%.png}/apps"; \ ++ dir="$(PREFIX)/share/icons/hicolor/$${f%.png}/apps"; \ + mkdir -p "$$dir"; \ + cp "$$f" "$$dir/sxiv.png"; \ + chmod 644 "$$dir/sxiv.png"; \ Index: pkg/PLIST === RCS file: /cvs/ports/graphics/sxiv/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 16 Apr 2015 10:27:26 - 1.3 +++ pkg/PLIST 2 Aug 2016 09:37:55 - @@ -1,6 +1,16 @@ @comment $OpenBSD: PLIST,v 1.3 2015/04/16 10:27:26 jung Exp $ @bin bin/sxiv @man man/man1/sxiv.1 +share/applications/sxiv.desktop share/examples/sxiv/ share/examples/sxiv/image-info share/examples/sxiv/key-handler +share/icons/hicolor/128x128/apps/sxiv.png +share/icons/hicolor/16x16/apps/sxiv.png +share/icons/hicolor/32x32/apps/sxiv.png +share/icons/hicolor/48x48/apps/sxiv.png +share/icons/hicolor/64x64/apps/sxiv.png +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor OK kirby@ for merged diff. > > Index: Makefile > === > RCS file: /cvs/ports/graphics/sxiv/Makefile,v > retrieving revision 1.9 > diff -u -p -r1.9 Makefile > --- Makefile 6 Jan 2016 20:02:19 - 1.9 > +++ Makefile 28 Apr 2017 07:42:01 - > @@ -2,9 +2,10 @@ > > COMMENT =simple (or small or suckless) X Image Viewer > > -GH_PROJECT= sxiv > -GH_ACCOUNT= muennich > -GH_TAGNAME= v1.3.2 > +GH_PROJECT = sxiv > +GH_ACCOUNT = muennich > +GH_TAGNAME = v1.3.2 > +REVISION = 0 > > CATEGORIES = graphics x11 > > @@ -15,6 +16,8 @@ PERMIT_PACKAGE_CDROM = Yes > > WANTLIB += Imlib2 exif gif X11 c > > +RUN_DEPENDS =devel/desktop-file-utils > + > LIB_DEPENDS =graphics/imlib2 \ > graphics/libexif > > @@ -24,6 +27,8 @@ MAKE_FLAGS =CC=${CC} MANPREFIX=${PREFIX > > NO_TEST =Yes > > -WRKDIST= ${WRKDIR}/${PKGNAME} > +post-install: > + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications > + ${INSTALL_DATA} ${WRKSRC}/sxiv.desktop ${PREFIX}/share/applications > > .include > Index: pkg/PLIST > === > RCS file: /cvs/ports/graphics/sxiv/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -r1.3 PLIST > --- pkg/PLIST 16 Apr 2015 10:27:26 - 1.3 > +++ pkg/PLIST 28 Apr 2017 07:42:01 - > @@ -1,6 +1,9 @@ > @comment $OpenBSD: PLIST,v 1.3 2015/04/16 10:27:26 jung Exp $ > @bin bin/sxiv > @man man/man1/sxiv.1 > +share/applications/sxiv.desktop > share/examples/sxiv/ > share/examples/sxiv/image-info > share/examples/sxiv/key-handler > +@exec %D/bin/update-desktop-database > +@unexec-delete %D/bin/update-desktop-database > >
[PATCH] graphics/sxiv: install .desktop file
Hi ports@, Here is a diff to install the .desktop file. This allows using sxiv with xdg-open. While there, remove unneeded WRKDIST variable and do some minor reformatting. Comments? OK? Index: Makefile === RCS file: /cvs/ports/graphics/sxiv/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile6 Jan 2016 20:02:19 - 1.9 +++ Makefile28 Apr 2017 07:42:01 - @@ -2,9 +2,10 @@ COMMENT = simple (or small or suckless) X Image Viewer -GH_PROJECT=sxiv -GH_ACCOUNT=muennich -GH_TAGNAME=v1.3.2 +GH_PROJECT = sxiv +GH_ACCOUNT = muennich +GH_TAGNAME = v1.3.2 +REVISION = 0 CATEGORIES = graphics x11 @@ -15,6 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes WANTLIB += Imlib2 exif gif X11 c +RUN_DEPENDS = devel/desktop-file-utils + LIB_DEPENDS = graphics/imlib2 \ graphics/libexif @@ -24,6 +27,8 @@ MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX NO_TEST = Yes -WRKDIST= ${WRKDIR}/${PKGNAME} +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/sxiv.desktop ${PREFIX}/share/applications .include Index: pkg/PLIST === RCS file: /cvs/ports/graphics/sxiv/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 16 Apr 2015 10:27:26 - 1.3 +++ pkg/PLIST 28 Apr 2017 07:42:01 - @@ -1,6 +1,9 @@ @comment $OpenBSD: PLIST,v 1.3 2015/04/16 10:27:26 jung Exp $ @bin bin/sxiv @man man/man1/sxiv.1 +share/applications/sxiv.desktop share/examples/sxiv/ share/examples/sxiv/image-info share/examples/sxiv/key-handler +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database