update graphics/piglit
Index: Makefile
===
RCS file: /cvs/ports/graphics/piglit/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile24 Oct 2018 14:28:06 - 1.4
+++ Makefile11 Feb 2019 02:45:51 -
@@ -3,12 +3,11 @@
COMMENT = automated OpenGL and OpenCL testsuite
ONLY_FOR_ARCHS = amd64 i386
-DISTNAME = piglit-20180108
-REVISION = 0
+DISTNAME = piglit-20190208
GH_ACCOUNT = mesa3d
GH_PROJECT = piglit
-GH_COMMIT =8eefd87ed7a7be9b181bbe7d12a6f6c54921d522
+GH_COMMIT =5d4935e2378a5f3b950bfcbcb6c396ad7e882952
CATEGORIES = graphics
Index: distinfo
===
RCS file: /cvs/ports/graphics/piglit/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo14 Jan 2018 21:49:14 - 1.1.1.1
+++ distinfo11 Feb 2019 02:46:47 -
@@ -1,2 +1,2 @@
-SHA256 (piglit-20180108-8eefd87e.tar.gz) =
Kz4FlqLeJOmY0losbbMCzM5m7S1rR07RMkeO543mcgY=
-SIZE (piglit-20180108-8eefd87e.tar.gz) = 23990930
+SHA256 (piglit-20190208-5d4935e2.tar.gz) =
sLAu4XQXw9VTYrLfOnWxW9mo07M5L+evoGM1QQY2zbI=
+SIZE (piglit-20190208-5d4935e2.tar.gz) = 24208156
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/graphics/piglit/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt14 Jan 2018 21:49:14 - 1.1.1.1
+++ patches/patch-CMakeLists_txt11 Feb 2019 02:50:01 -
@@ -6,7 +6,7 @@ include same flags for OpenBSD
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -33,7 +33,7 @@ if(X11_FOUND)
+@@ -37,7 +37,7 @@ if(X11_FOUND)
add_definitions(-DPIGLIT_HAS_X11)
endif()
@@ -15,7 +15,7 @@ Index: CMakeLists.txt
set(PIGLIT_BUILD_GLES_TESTS_DEFAULT ON)
else()
set(PIGLIT_BUILD_GLES_TESTS_DEFAULT OFF)
-@@ -49,7 +49,7 @@ if(PIGLIT_BUILD_GL_TESTS)
+@@ -53,7 +53,7 @@ if(PIGLIT_BUILD_GL_TESTS)
find_package(OpenGL REQUIRED)
endif()
@@ -24,7 +24,7 @@ Index: CMakeLists.txt
option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" ON)
else()
option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
-@@ -128,7 +128,7 @@ if(PIGLIT_BUILD_CL_TESTS)
+@@ -132,7 +132,7 @@ if(PIGLIT_BUILD_CL_TESTS)
find_package(OpenCL REQUIRED)
endif(PIGLIT_BUILD_CL_TESTS)
@@ -33,16 +33,7 @@ Index: CMakeLists.txt
if(X11_FOUND AND OPENGL_gl_LIBRARY)
# Assume the system has GLX. In the future, systems may exist
# with libGL and libX11 but no GLX, but that world hasn't
-@@ -222,8 +222,6 @@ IF(PIGLIT_BUILD_GLX_TESTS)
- pkg_check_modules(GLPROTO REQUIRED glproto)
- ENDIF()
-
--set(Python_ADDITIONAL_VERSIONS
--3.6 3.5 3.4 3.3 2.7)
- find_package(PythonInterp REQUIRED)
- find_package(PythonSix 1.5.2 REQUIRED)
- find_package(PythonNumpy 1.7.0 REQUIRED)
-@@ -382,7 +380,7 @@ endif()
+@@ -386,7 +386,7 @@ endif()
check_c_source_compiles(
"
@@ -51,7 +42,7 @@ Index: CMakeLists.txt
#include
int main() { return clock_gettime(CLOCK_MONOTONIC, NULL); }
"
-@@ -426,7 +424,7 @@ if(HAVE_LIBCACA)
+@@ -430,7 +430,7 @@ if(HAVE_LIBCACA)
endif(HAVE_LIBCACA)
endif(GBM_FOUND)
Index: patches/patch-tests_egl_CMakeLists_gl_txt
===
RCS file: /cvs/ports/graphics/piglit/patches/patch-tests_egl_CMakeLists_gl_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tests_egl_CMakeLists_gl_txt
--- patches/patch-tests_egl_CMakeLists_gl_txt 14 Jan 2018 21:49:14 -
1.1.1.1
+++ patches/patch-tests_egl_CMakeLists_gl_txt 11 Feb 2019 02:50:04 -
@@ -14,7 +14,7 @@ Index: tests/egl/CMakeLists.gl.txt
piglit_add_executable (egl-nok-swap-region egl-util.c
egl-nok-swap-region.c)
target_link_libraries(egl-nok-swap-region pthread ${X11_X11_LIB})
piglit_add_executable (egl-nok-texture-from-pixmap egl-util.c
egl-nok-texture-from-pixmap.c)
-@@ -33,6 +33,6 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+@@ -35,6 +35,6 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(egl-invalid-attr pthread)
piglit_add_executable (egl-context-priority egl-context-priority.c)
target_link_libraries(egl-context-priority pthread)
Index: patches/patch-tests_util_CMakeLists_txt
===
RCS file: /cvs/ports/graphics/piglit/patches/patch-tests_util_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tests_util_CMakeLists_txt
--- patches/patch-tests_util_CMakeLists_txt 14 Jan 2018 21:49:14 -
1.1.1.1
+++ patches/patch-tests_util_CMakeLists_txt 11 Feb 2019 02:50:08 -
@@ -5,7 +5,7 @@ account for OpenBSD
Index: tests/util/CMakeLists.txt
--- tests/util/CMakeLis
UPDATE: LLVM
Pull in 3 patches for the X86 backend..
- [X86] Add FPSW as a Def on some FP instructions that were missing it.
- [X86] Connect the default fpsr and dirflag clobbers in inline
assembly to the registers we have defined for them.
- [X86] Add FPCW as a register and start using it as an implicit use on
floating point instructions.
Resolves miscompilation of libm mentioned here..
https://marc.info/?l=openbsd-bugs&m=154896725914212&w=2
Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.212
diff -u -p -u -p -r1.212 Makefile
--- Makefile11 Feb 2019 05:33:57 - 1.212
+++ Makefile11 Feb 2019 06:42:57 -
@@ -20,7 +20,7 @@ PKGSPEC-main =llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
PKGNAME-python = py-llvm-${LLVM_V}
PKGNAME-lldb = lldb-${LLVM_V}
-REVISION-main =5
+REVISION-main =6
CATEGORIES = devel
DISTFILES =llvm-${LLVM_V}.src${EXTRACT_SUFX} \
cfe-${LLVM_V}.src${EXTRACT_SUFX} \
Index: patches/patch-lib_Target_X86_X86ISelLowering_cpp
===
RCS file: patches/patch-lib_Target_X86_X86ISelLowering_cpp
diff -N patches/patch-lib_Target_X86_X86ISelLowering_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Target_X86_X86ISelLowering_cpp11 Feb 2019 06:19:24
-
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+[X86] Connect the default fpsr and dirflag clobbers in inline
+assembly to the registers we have defined for them.
+
+Index: lib/Target/X86/X86ISelLowering.cpp
+--- lib/Target/X86/X86ISelLowering.cpp.orig
lib/Target/X86/X86ISelLowering.cpp
+@@ -40619,6 +40619,20 @@ X86TargetLowering::getRegForInlineAsmConstraint(const
+ return Res;
+ }
+
++// dirflag -> DF
++if (StringRef("{dirflag}").equals_lower(Constraint)) {
++ Res.first = X86::DF;
++ Res.second = &X86::DFCCRRegClass;
++ return Res;
++}
++
++// fpsr -> FPSW
++if (StringRef("{fpsr}").equals_lower(Constraint)) {
++ Res.first = X86::FPSW;
++ Res.second = &X86::FPCCRRegClass;
++ return Res;
++}
++
+ // 'A' means [ER]AX + [ER]DX.
+ if (Constraint == "A") {
+ if (Subtarget.is64Bit()) {
Index: patches/patch-lib_Target_X86_X86InstrFPStack_td
===
RCS file: patches/patch-lib_Target_X86_X86InstrFPStack_td
diff -N patches/patch-lib_Target_X86_X86InstrFPStack_td
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Target_X86_X86InstrFPStack_td 11 Feb 2019 06:38:04
-
@@ -0,0 +1,186 @@
+$OpenBSD$
+
+- [X86] Add FPSW as a Def on some FP instructions that were missing it.
+- [X86] Add FPCW as a register and start using it as an implicit use on
floating
+ point instructions.
+
+Index: lib/Target/X86/X86InstrFPStack.td
+--- lib/Target/X86/X86InstrFPStack.td.orig
lib/Target/X86/X86InstrFPStack.td
+@@ -230,7 +230,7 @@ def _FI32m : FPI<0xDA, fp, (outs), (ins i32mem:$src),
+ } // mayLoad = 1, hasSideEffects = 1
+ }
+
+-let Defs = [FPSW] in {
++let Defs = [FPSW], Uses = [FPCW] in {
+ // FPBinary_rr just defines pseudo-instructions, no need to set a scheduling
+ // resources.
+ let hasNoSchedulingInfo = 1 in {
+@@ -267,7 +267,7 @@ class FPrST0PInst
+ // NOTE: GAS and apparently all other AT&T style assemblers have a broken
notion
+ // of some of the 'reverse' forms of the fsub and fdiv instructions. As such,
+ // we have to put some 'r's in and take them out of weird places.
+-let SchedRW = [WriteFAdd] in {
++let SchedRW = [WriteFAdd], Defs = [FPSW], Uses = [FPCW] in {
+ def ADD_FST0r : FPST0rInst ;
+ def ADD_FrST0 : FPrST0Inst ;
+ def ADD_FPrST0 : FPrST0PInst;
+@@ -278,16 +278,16 @@ def SUB_FST0r : FPST0rInst ;
+ def SUBR_FrST0 : FPrST0Inst ;
+ def SUBR_FPrST0 : FPrST0PInst;
+ } // SchedRW
+-let SchedRW = [WriteFCom] in {
++let SchedRW = [WriteFCom], Defs = [FPSW], Uses = [FPCW] in {
+ def COM_FST0r : FPST0rInst ;
+ def COMP_FST0r : FPST0rInst ;
+ } // SchedRW
+-let SchedRW = [WriteFMul] in {
++let SchedRW = [WriteFMul], Defs = [FPSW], Uses = [FPCW] in {
+ def MUL_FST0r : FPST0rInst ;
+ def MUL_FrST0 : FPrST0Inst ;
+ def MUL_FPrST0 : FPrST0PInst;
+ } // SchedRW
+-let SchedRW = [WriteFDiv] in {
++let SchedRW = [WriteFDiv], Defs = [FPSW], Uses = [FPCW] in {
+ def DIVR_FST0r : FPST0rInst ;
+ def DIV_FrST0 : FPrST0Inst ;
+ def DIV_FPrST0 : FPrST0PInst;
+@@ -307,7 +307,7 @@ def _Fp80 : FpI_<(outs RFP80:$dst), (ins RFP80:$src),
+ def _F : FPI<0xD9, fp, (outs), (ins), asmstring>;
+ }
+
+-let Defs = [FPSW] in {
++let Defs = [FPSW], Uses = [FPCW] in {
+
+ let SchedRW = [WriteFSign] in {
+ defm CHS : FPUnary;
+@@ -335,7 +335,7 @@ def TST_F : FPI<0xD9, MRM_E4, (outs), (ins), "ftst">;
+
+ // Versions of FP instructions that take a single memory operand. Added for
the
+ // disassembler; remove as they are included with patterns elsewhere.
+-le
Re: UPDATE: LLVM
On Fri, Feb 08, 2019 at 06:31:41PM -0500, Brad Smith wrote:
> On Mon, Feb 04, 2019 at 08:04:02PM -0500, Brad Smith wrote:
> > Re-merge the -msave-args diff plus fix and add a diff to make use
> > of pthread_get_name_np.
>
> Comment tweak with the pthread_get_name_np patch being commited upstream.
And merge in the PowerPC long double fix from George now that it has been
commited upstream.
Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.210
diff -u -p -u -p -r1.210 Makefile
--- Makefile3 Feb 2019 18:29:48 - 1.210
+++ Makefile4 Feb 2019 22:22:21 -
@@ -20,7 +20,7 @@ PKGSPEC-main =llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
PKGNAME-python = py-llvm-${LLVM_V}
PKGNAME-lldb = lldb-${LLVM_V}
-REVISION-main =3
+REVISION-main =4
CATEGORIES = devel
DISTFILES =llvm-${LLVM_V}.src${EXTRACT_SUFX} \
cfe-${LLVM_V}.src${EXTRACT_SUFX} \
Index: patches/patch-include_llvm_BinaryFormat_Dwarf_def
===
RCS file: patches/patch-include_llvm_BinaryFormat_Dwarf_def
diff -N patches/patch-include_llvm_BinaryFormat_Dwarf_def
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-include_llvm_BinaryFormat_Dwarf_def 5 Feb 2019 00:34:58
-
@@ -0,0 +1,16 @@
+$OpenBSD: patch-include_llvm_BinaryFormat_Dwarf_def,v 1.1 2019/01/31 13:40:22
jca Exp $
+
+implement -msave-args in clang/llvm, like the sun did for gcc
+
+Index: include/llvm/BinaryFormat/Dwarf.def
+--- include/llvm/BinaryFormat/Dwarf.def.orig
include/llvm/BinaryFormat/Dwarf.def
+@@ -355,6 +355,8 @@ HANDLE_DW_AT(0x2133, GNU_addr_base, 0, GNU)
+ HANDLE_DW_AT(0x2134, GNU_pubnames, 0, GNU)
+ HANDLE_DW_AT(0x2135, GNU_pubtypes, 0, GNU)
+ HANDLE_DW_AT(0x2136, GNU_discriminator, 0, GNU)
++// Sun Extension
++HANDLE_DW_AT(0x2224, SUN_amd64_parmdump, 0, GNU)
+ // Borland extensions.
+ HANDLE_DW_AT(0x3b11, BORLAND_property_read, 0, BORLAND)
+ HANDLE_DW_AT(0x3b12, BORLAND_property_write, 0, BORLAND)
Index: patches/patch-lib_Support_Unix_Threading_inc
===
RCS file: patches/patch-lib_Support_Unix_Threading_inc
diff -N patches/patch-lib_Support_Unix_Threading_inc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Support_Unix_Threading_inc7 Feb 2019 02:06:21
-
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Add OpenBSD support to be able to get the thread name
+
+Index: lib/Support/Unix/Threading.inc
+--- lib/Support/Unix/Threading.inc.orig
lib/Support/Unix/Threading.inc
+@@ -203,6 +203,12 @@ void llvm::get_thread_name(SmallVectorImpl &Name
+ ::pthread_getname_np(::pthread_self(), buf, len);
+
+ Name.append(buf, buf + strlen(buf));
++#elif defined(__OpenBSD__)
++ constexpr uint32_t len = get_max_thread_name_length_impl();
++ char buf[len];
++ ::pthread_get_name_np(::pthread_self(), buf, len);
++
++ Name.append(buf, buf + strlen(buf));
+ #elif defined(__linux__)
+ #if HAVE_PTHREAD_GETNAME_NP
+ constexpr uint32_t len = get_max_thread_name_length_impl();
Index: patches/patch-lib_Target_X86_X86FrameLowering_cpp
===
RCS file:
/home/cvs/ports/devel/llvm/patches/patch-lib_Target_X86_X86FrameLowering_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-lib_Target_X86_X86FrameLowering_cpp
--- patches/patch-lib_Target_X86_X86FrameLowering_cpp 3 Feb 2019 18:29:48
- 1.5
+++ patches/patch-lib_Target_X86_X86FrameLowering_cpp 5 Feb 2019 03:05:20
-
@@ -1,4 +1,4 @@
-$OpenBSD: patch-lib_Target_X86_X86FrameLowering_cpp,v 1.5 2019/02/03 18:29:48
jca Exp $
+$OpenBSD: patch-lib_Target_X86_X86FrameLowering_cpp,v 1.4 2019/01/31 13:40:22
jca Exp $
- Add RETGUARD to clang for amd64. This security mechanism uses per-function
random cookies to protect access to function return instructions, with the
@@ -18,6 +18,7 @@ $OpenBSD: patch-lib_Target_X86_X86FrameL
jumping into the instruction stream partway through other instructions. Work
to
remove these gadgets will continue through other mechanisms.
- Refactor retguard to make adding additional arches easier.
+- implement -msave-args in clang/llvm, like the sun did for gcc
Index: lib/Target/X86/X86FrameLowering.cpp
--- lib/Target/X86/X86FrameLowering.cpp.orig
@@ -39,7 +40,153 @@ Index: lib/Target/X86/X86FrameLowering.c
// Cache a bunch of frame-related predicates for this subtarget.
SlotSize = TRI->getSlotSize();
Is64Bit = STI.is64Bit();
-@@ -3153,4 +3154,8 @@ void X86FrameLowering::processFunctionBeforeFrameFinal
+@@ -47,6 +48,7 @@ X86FrameLowering::X86FrameLowering(const X86Subtarget
+ // standard x86_64 and NaCl use 64-bit frame/stack pointers, x32 - 32-bit.
+ Uses64BitFramePtr = STI.isTarget64BitLP64() || STI.isTargetNaCl64();
+ StackPtr = TRI->getStackRegister();
++ SaveArgs = Is64Bit ? STI.getS
[UPDATE] net/gpodder-3.10.5 -> 3.10.7
trondd wrote:
> Update gPodder to the latest, mostly bugfix release.
>
> New features
>
> #243 add sync command to gpo
>
> Improvements
>
> MPRIS Listener compatible with other players than VLC, marks episode
> finished after stream completion
> #374 Export to Local Folder has customizable filename again but checkbox
> to export all files with default name in same folder
> #563 Export to Local Folder confirmation if file already exists
> #526 Convert Audio Files now converts from mp3 and to opus, don't block
> if file already exists
> #577 added appstream metadata
>
> Bug fixes
>
> #556 fix Tag Download file using Mutagen coverart issue
> #545 gtk status icon works again
> fix default extensions disabled when (de)activating any other extension
> fix cancel and download buttons enable/disable on tab switch
> #559 error in some cases for context-menu
> #566 Minimize on Startup works again
> orphan downloaded youtube episodes are found on startup (see #555)
> #550 gPodder stops responding when downloading in some cases
> #571 fix unable to subscribe to authenticated podcast after redirect,
> download episodes requiring authentication, gpo subscribe to authenticated
> feed
> #562 Tooltips flicker when mouseover on podcast image or in new episode
> window
>
> Tim.
>
They snuck in another release
New features
#590 ability to style podcast and episode trees content using gtk3 css
#360 resume downloads for gpo
Bug fixes
#580 lost translation id
#583 remove python2 leftovers in sonos extension
#586 remove debug print
gpo: fix warning deprecated inspect.getargspec since python 3.0
#591 invalid local filename when content-disposition has invalid extension
#584 gPodder 3.10.6 macOS Text too large bug
Tim.
Index: Makefile
===
RCS file: /cvs/ports/net/gpodder/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile23 Sep 2018 20:48:36 - 1.17
+++ Makefile11 Feb 2019 01:58:46 -
@@ -2,7 +2,7 @@
COMMENT= media aggregator and podcast client
-MODPY_EGG_VERSION= 3.10.5
+MODPY_EGG_VERSION= 3.10.7
GH_ACCOUNT=gpodder
GH_PROJECT=gpodder
Index: distinfo
===
RCS file: /cvs/ports/net/gpodder/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo23 Sep 2018 20:48:36 - 1.7
+++ distinfo11 Feb 2019 01:58:46 -
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.10.5.tar.gz) = m2WVbYpVkXsZ6gn2MbLN9gCjsH8Au7OKiMFlG6cdboo=
-SIZE (gpodder-3.10.5.tar.gz) = 1000492
+SHA256 (gpodder-3.10.7.tar.gz) = hae+7D9jxnaMgRSCrW6TSwUnwp8D6QPKD4LS52TNrXY=
+SIZE (gpodder-3.10.7.tar.gz) = 1021701
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gpodder/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 9 Jul 2018 12:47:04 - 1.8
+++ pkg/PLIST 11 Feb 2019 01:58:46 -
@@ -22,6 +22,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}dbsqlite.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}dbusproxy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}dbusproxy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}deviceplaylist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}deviceplaylist.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}directory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}directory.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}download.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -56,6 +58,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}services.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}syncui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}syncui.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}unittests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}unittests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gpodder/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${M
Update: net/p5-Net-Amazon-0.62
Small update to net/p5-Net-Amazon to 0.62.
- Maintainer dropped per email conversation with him. CC for
verification. This may also need extended to other ports depending on
his feedback.
- All tests pass [1]
- Builds fine on amd64
- No consumers, or WANTLIB changes
Thank you
[1]
===> Regression tests for p5-Net-Amazon-0.62
PERL_DL_NONLAZY=1 "/usr/bin/perl" "-MExtUtils::Command::MM"
"-MTest::Harness" "-e" "undef *Test::Harness::Switches; test_harness(0,
'blib/lib', 'blib/arch')" t/*.t
t/001ASIN.t .. ok
t/003UPC.t ... ok
t/004Reviews.t ... ok
t/005Power.t . ok
t/006Browse.t ok
t/007Manufacturer.t .. ok
t/008Textstream.t ok
t/009Blended.t ... ok
t/010Artist.t ok
t/011Locale.t ok
t/012Keyword.t ... ok
t/013Seller.t ok
t/014Constructors.t .. ok
t/015Exchange.t .. ok
t/016Publisher.t . ok
t/017Author.t ok
t/018Actor.t . ok
t/019MusicLabel.t ok
t/020ISBN.t .. ok
t/021EAN.t ... ok
t/022Director.t .. ok
t/023Title.t . ok
t/024signature.t . ok
t/025cache.t . ok
t/026All.t ... ok
t/027MP3Downloads.t .. ok
All tests successful.
Files=26, Tests=358, 7 wallclock secs ( 0.17 usr 0.18 sys + 4.64 cusr
1.45 csys = 6.44 CPU)
Result: PASS
--
Edward Lopez-Acosta
diff --git Makefile Makefile
index ff7811c79ec..c34e656b902 100644
--- Makefile
+++ Makefile
@@ -4,12 +4,9 @@ COMMENT= Perl Interface to Amazon.{co.uk,com} Web Services
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Net-Amazon-0.59
-REVISION= 0
+DISTNAME= Net-Amazon-0.62
CATEGORIES= net
-MAINTAINER= Sam Smith
-
# perl
PERMIT_PACKAGE_CDROM= Yes
diff --git distinfo distinfo
index 791c083b601..873ef53f3d3 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (Net-Amazon-0.59.tar.gz) = rgNzi8zXLMbzQh6jSbvH8xGdNulPFZ7wK7b7Oio/ZWU=
-SIZE (Net-Amazon-0.59.tar.gz) = 193534
+SHA256 (Net-Amazon-0.62.tar.gz) = 4mreaELwcOMH6yvxMECnUFD6xpr49+yjIvdaZLRFXAY=
+SIZE (Net-Amazon-0.62.tar.gz) = 219344
diff --git pkg/PLIST pkg/PLIST
index 58d474ad1aa..b1bfb47ce56 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -38,7 +38,6 @@ ${P5SITE}/Net/Amazon/Request/Sort.pm
${P5SITE}/Net/Amazon/Request/TextStream.pm
${P5SITE}/Net/Amazon/Request/Title.pm
${P5SITE}/Net/Amazon/Request/UPC.pm
-${P5SITE}/Net/Amazon/Request/Wishlist.pm
${P5SITE}/Net/Amazon/Response/
${P5SITE}/Net/Amazon/Response.pm
${P5SITE}/Net/Amazon/Response/ASIN.pm
@@ -63,7 +62,6 @@ ${P5SITE}/Net/Amazon/Response/Similar.pm
${P5SITE}/Net/Amazon/Response/TextStream.pm
${P5SITE}/Net/Amazon/Response/Title.pm
${P5SITE}/Net/Amazon/Response/UPC.pm
-${P5SITE}/Net/Amazon/Response/Wishlist.pm
${P5SITE}/Net/Amazon/Result/
${P5SITE}/Net/Amazon/Result/Seller/
${P5SITE}/Net/Amazon/Result/Seller.pm
@@ -172,6 +170,20 @@ ${P5SITE}/Net/Amazon/Validate/ItemSearch/de/VHS.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/de/Video.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/de/VideoGames.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/de/Watches.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Books.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/DVD.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/EAN.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Electronics.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/ForeignBooks.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Keywords.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/KindleStore.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Kitchen.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Music.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Software.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Toys.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/VideoGames.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/es/Watches.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/fr/
${P5SITE}/Net/Amazon/Validate/ItemSearch/fr/Actor.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/fr/Artist.pm
@@ -226,6 +238,23 @@ ${P5SITE}/Net/Amazon/Validate/ItemSearch/fr/VHS.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/fr/Video.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/fr/VideoGames.pm
${P5SITE}/Net/Amazon/Validate/ItemSearch/fr/Watches.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Baby.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Books.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/DVD.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/EAN.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Electronics.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/ForeignBooks.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Keywords.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/KindleStore.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Kitchen.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Lighting.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Music.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Shoes.pm
+${P5SITE}/Net/Amazon/Validate/ItemSearch/it/Software.pm
+${P5SITE}/Net/Amazon
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Thu Feb 7 04:19:43 MST 2019 finished at Sun Feb 10 14:30:29 MST 2019 lasted 04D03h10m done with kern.version=OpenBSD 6.4-current (GENERIC.MP) #2: Thu Feb 7 04:09:13 MST 2019 built packages:9553 Feb 7:2917 Feb 8:1647 Feb 9:1518 Feb 10:3470 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2019-02-07/summary.log build failures: 58 http://build-failures.rhaalovely.net/aarch64/2019-02-07/audio/chromaprint.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/comms/gnuradio.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/comms/lcdproc.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/databases/sqlite3-odbc.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/devel/avr/gdb.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/devel/avr/libc.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/devel/beediff.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/devel/libcoap.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/editors/xwpe.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/emulators/dynamips.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/emulators/vbam.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/emulators/vice.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/chroma.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/dungeon-crawl.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/frozen-bubble,-main.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/gzdoom.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/openclonk.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/spacehulk.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/stepmania.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/games/vacuum.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/geo/qlandkartegt.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/graphics/darktable.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/graphics/freeimage.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/graphics/gthumb.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/graphics/openimageio.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/graphics/openscenegraph.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/graphics/ufraw.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/japanese/mecab,-ipadic.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/lang/erlang/21.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/lang/gcc/4.9,-c++.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/lang/pfe.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/mail/kopano/core.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/math/R.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/math/arpack.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/math/cblas.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/math/z3.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/misc/openbabel.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/misc/rocrail,-gui.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/multimedia/dav1d.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/net/castget.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/productivity/aqbanking.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/security/libnipper.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/security/softhsm.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/sysutils/sleuthkit.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/textproc/link-grammar,-main.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/www/chromium.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/www/kwebapp.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/www/mozilla-firefox.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/e17/e.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/gnome/gjs.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/kde-applications/libkcddb.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/kde4/kmousetool.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/kde4/kopete.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/kde4/zeroconf-ioslave.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/qt5/qt3d.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/qt5/qtgraphicaleffects.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/qt5/qtquickcontrols.log http://build-failures.rhaalovely.net/aarch64/2019-02-07/x11/qt5/qtquickcontrols2.log recurrent failures failures/audio/chromaprint.log failures/devel/avr/gdb.log failures/devel/libcoap.log failur
Re: UPDATE: net/snort 2.9.12
On 2019/02/10 20:29, Markus Lude wrote:
> Hello,
>
> attached is an update to snort-2.9.12.
>
> Tested on amd64.
>
> Please test, comment and eventually commit.
>
> Regards
> Markus
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/snort/Makefile,v
> retrieving revision 1.100
> diff -u -p -u -p -r1.100 Makefile
> --- Makefile 4 Sep 2018 12:46:18 - 1.100
> +++ Makefile 10 Feb 2019 19:24:33 -
> @@ -2,8 +2,8 @@
>
> COMMENT =highly flexible sniffer/NIDS
>
> -VERSION =2.9.11.1
> -DISTNAME = snort-${VERSION}
> +VERSION =2.9.12.0
> +DISTNAME = snort-${VERSION:S/.0$//g}
that seems a bit of a fiddly way to deal with this - how about this
to make it cleaner and a bit more self-documenting?
DISTNAME = snort-2.9.12
RULESV =29120
SUBST_VARS =RULESV
(and change README to match, and remove the V lower down which is also
confusing portbump - hence REVISION being in the wrong place :-)
>
> CATEGORIES = net security
>
> @@ -25,6 +25,7 @@ CONFIGURE_ARGS += --disable-static-daq \
>
> LIB_DEPENDS =archivers/xz \
> devel/pcre \
> + lang/luajit \
Note this:
$ make package
===> Building package for snort-2.9.12
Create /usr/ports/packages/amd64/all/snort-2.9.12.tgz
LIB_DEPENDS lang/luajit not needed for net/snort ?
Creating package snort-2.9.12
Link to /usr/ports/packages/amd64/ftp/snort-2.9.12.tgz
Link to /usr/ports/packages/amd64/cdrom/snort-2.9.12.tgz
see "man bsd.port.mk | less +/not.needed.for" and port-lib-depends-check
(in this case it's a missing addition to WANTLIB).
[Perl 5.28] Fix ports builds using autoconf-2.5{4,6,7}
The following ports can't be built with autoconf-2.5{4,6,7} and Perl
5.28 due to the removal of '.' in @INC:
- games/zangband
- security/steghide
- x11/xtraceroute
What that diff is doing is simply bringing back '.' in @INC in
autoconf-2.5{4,6,7} .
These 3 ports have been tested with Perl 5.24 and 5.28 - they build
without issues. We have no ports depending on autoconf-2.56, so i've
build games/zangband with it.
Any comment or feedback welcome :)
Charlène.
Index: 2.54/Makefile
===
RCS file: /cvs/ports/devel/autoconf/2.54/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- 2.54/Makefile 29 Jun 2016 16:14:39 - 1.14
+++ 2.54/Makefile 10 Feb 2019 21:21:08 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.14 2016/06/29 16:14:39 espie Exp $
VERSION = 2.54
-REVISION = 5
+REVISION = 6
BUILD_DEPENDS =devel/help2man
Index: 2.54/patches/patch-bin_autom4te_in
===
RCS file: /cvs/ports/devel/autoconf/2.54/patches/patch-bin_autom4te_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-bin_autom4te_in
--- 2.54/patches/patch-bin_autom4te_in 22 Jul 2004 05:50:07 - 1.2
+++ 2.54/patches/patch-bin_autom4te_in 10 Feb 2019 21:21:08 -
@@ -1,7 +1,16 @@
$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $
bin/autom4te.in.orig Mon Sep 2 14:59:43 2002
-+++ bin/autom4te.inThu Jul 22 07:19:02 2004
-@@ -277,16 +277,8 @@ my $freeze = 0;
+Index: bin/autom4te.in
+--- bin/autom4te.in.orig
bin/autom4te.in
+@@ -28,6 +28,7 @@ BEGIN
+ {
+ my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@');
+ unshift @INC, "$datadir";
++ push @INC, '.';
+ }
+
+ ## - ##
+@@ -277,16 +278,8 @@ my $freeze = 0;
# $M4.
my $m4 = $ENV{"M4"} || '@M4@';
@@ -19,7 +28,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
# @M4_BUILTIN -- M4 builtins and a useful comment.
my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
map { s/:.*//;s/\W// } @m4_builtin;
-@@ -605,11 +597,11 @@ sub handle_m4 ($@)
+@@ -605,11 +598,11 @@ sub handle_m4 ($@)
# We don't output directly to the cache files, to avoid problems
# when we are interrupted (that leaves corrupted files).
xsystem ("$m4"
@@ -36,7 +45,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " @ARGV"
. ' $ocache" . $req->id . "t");
-@@ -1048,8 +1040,7 @@ sub freeze ($)
+@@ -1048,8 +1041,7 @@ sub freeze ($)
# When processing the file with diversion disabled, there must be no
# output but comments and empty lines.
my $result = xqx ("$m4"
@@ -46,7 +55,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. ' --define=divert'
. " @ARGV"
. ' &1 >/dev/null`;
map { s/:.*//;s/\W// } @m4_builtin;
-@@ -660,12 +652,11 @@ sub handle_m4 ($@)
+@@ -660,12 +653,11 @@ sub handle_m4 ($@)
# We don't output directly to the cache files, to avoid problems
# when we are interrupted (that leaves corrupted files).
xsystem ("$m4"
@@ -37,7 +46,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " " . files_to_options (@ARGV)
. ' $ocache" . $req->id . "t");
-@@ -1116,8 +1107,7 @@ sub freeze ($)
+@@ -1116,8 +1108,7 @@ sub freeze ($)
# When processing the file with diversion disabled, there must be no
# output but comments and empty lines.
my $result = xqx ("$m4"
@@ -47,7 +56,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. ' --define=divert'
. " " . files_to_options (@ARGV)
. ' &1 >/dev/null`;
map { s/:.*//;s/\W// } @m4_builtin;
-@@ -660,12 +652,11 @@ sub handle_m4 ($@)
+@@ -660,12 +653,11 @@ sub handle_m4 ($@)
# We don't output directly to the cache files, to avoid problems
# when we are interrupted (that leaves corrupted files).
xsystem ("$m4"
@@ -37,7 +46,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " " . files_to_options (@ARGV)
. ' $ocache" . $req->id . "t");
-@@ -1117,8 +1108,7 @@ sub freeze ($)
+@@ -1117,8 +1109,7 @@ sub freeze ($)
# When processing the file with diversion disabled, there must be no
# output but comments and empty lines.
my $result = xqx ("$m4"
@@ -47,7 +56,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. ' --define=divert'
. " " . files_to_options (@ARGV)
. '
Re: x11/freerdp: update to 2.0.0-rc4
On Sun, Feb 10, 2019 at 08:58:34PM +, Stuart Henderson wrote: > On 2019/02/10 16:21, Denis Fondras wrote: > > On Sun, Feb 10, 2019 at 02:43:37PM +, Stuart Henderson wrote: > > > that should be > > > > > > +-#if defined(__NetBSD__) || defined(__FreeBSD__) || > > > defined(__DragonFly__) > > > ++#if defined(__NetBSD__) || defined(__FreeBSD__) || > > > defined(__DragonFly__) || defined(__OpenBSD__) > > > > > > > Yes, I will send a PR upstream. > > hmm, that might give them the false impression that the timers thing is > no longer a problem ;) https://github.com/FreeRDP/FreeRDP/issues/4592 fwiw
Re: x11/freerdp: update to 2.0.0-rc4
On 2019/02/10 16:21, Denis Fondras wrote: > On Sun, Feb 10, 2019 at 02:43:37PM +, Stuart Henderson wrote: > > that should be > > > > +-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) > > ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) > > || defined(__OpenBSD__) > > > > Yes, I will send a PR upstream. hmm, that might give them the false impression that the timers thing is no longer a problem ;) > I would replace TSE with RDP here :) done.
Re: UPDATE: x11/st
On Sun, Feb 10, 2019 at 09:17:27AM +0100, Ingo Feinerer wrote:
> Hi,
>
> update x11/st to 0.8.2.
>
> - patches/patch-st_1 and patches/patch-st_c are now upstream
> - patches/patch-config_mk is simpler as upstream has now an OpenBSD
> section which just needs to be uncommented
> - patches/patch-config_def_h is also shorter as iso14755 is gone
> upstream as well
>
> Works fine for me on amd64.
>
> OK?
ok jung@
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 2 Nov 2018 07:32:13 - 1.18
> +++ Makefile 10 Feb 2019 08:05:48 -
> @@ -2,9 +2,8 @@
>
> COMMENT= simple X terminal
>
> -V= 0.8.1
> +V= 0.8.2
> DISTNAME=st-${V}
> -REVISION=0
>
> CATEGORIES= x11
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 29 Mar 2018 21:09:09 - 1.11
> +++ distinfo 10 Feb 2019 08:05:48 -
> @@ -1,2 +1,2 @@
> -SHA256 (st-0.8.1.tar.gz) = xPsP4rjS071ecnY+gKiuBbfUTbrI+OO7GO8BYccmaSY=
> -SIZE (st-0.8.1.tar.gz) = 45423
> +SHA256 (st-0.8.2.tar.gz) = rrdOEKoR7TZOG8xjWoGlIxGQk+Y779LyMfiwcFsVvzU=
> +SIZE (st-0.8.2.tar.gz) = 44788
> Index: patches/patch-config_def_h
> ===
> RCS file: /cvs/ports/x11/st/patches/patch-config_def_h,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-config_def_h
> --- patches/patch-config_def_h2 Nov 2018 07:32:13 - 1.10
> +++ patches/patch-config_def_h10 Feb 2019 08:05:48 -
> @@ -11,11 +11,3 @@ Index: config.def.h
>
> /* 8 bright colors */
> "gray50",
> -@@ -177,7 +177,6 @@ static Shortcut shortcuts[] = {
> - { TERMMOD, XK_V, clippaste, {.i = 0} },
> - { TERMMOD, XK_Y, selpaste, {.i = 0} },
> - { TERMMOD, XK_Num_Lock,numlock,{.i = 0} },
> --{ TERMMOD, XK_I, iso14755, {.i = 0} },
> - };
> -
> - /*
> Index: patches/patch-config_mk
> ===
> RCS file: /cvs/ports/x11/st/patches/patch-config_mk,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-config_mk
> --- patches/patch-config_mk 17 Mar 2018 13:28:39 - 1.10
> +++ patches/patch-config_mk 10 Feb 2019 08:05:48 -
> @@ -2,27 +2,18 @@ $OpenBSD: patch-config_mk,v 1.10 2018/03
> Index: config.mk
> --- config.mk.orig
> +++ config.mk
> -@@ -11,17 +11,14 @@ X11INC = /usr/X11R6/include
> - X11LIB = /usr/X11R6/lib
> +@@ -26,10 +26,10 @@ STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
> + STLDFLAGS = $(LIBS) $(LDFLAGS)
>
> - # includes and libs
> --INCS = -I$(X11INC) \
> -- `pkg-config --cflags fontconfig` \
> -- `pkg-config --cflags freetype2`
> --LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
> -- `pkg-config --libs fontconfig` \
> -- `pkg-config --libs freetype2`
> -+INCS != pkg-config --cflags fontconfig
> -+LIBS = -lm -lX11 -lutil -lXft
> -+LIBS +!= pkg-config --libs fontconfig
> -
> - # flags
> --CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
> --STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
> --STLDFLAGS = $(LIBS) $(LDFLAGS)
> -+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> -+STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS} ${CFLAGS}
> -+STLDFLAGS += ${LIBS} ${LDFLAGS}
> + # OpenBSD:
> +-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> +-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
> +-# `pkg-config --libs fontconfig` \
> +-# `pkg-config --libs freetype2`
> ++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> ++LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
> ++ `pkg-config --libs fontconfig` \
> ++ `pkg-config --libs freetype2`
>
> # compiler and linker
> # CC = c99
> Index: patches/patch-st_1
> ===
> RCS file: patches/patch-st_1
> diff -N patches/patch-st_1
> --- patches/patch-st_12 Nov 2018 07:32:13 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-st_1,v 1.1 2018/11/02 07:32:13 mestre Exp $
> -
> -Index: st.1
> st.1.orig
> -+++ st.1
> -@@ -159,10 +159,6 @@ Copy the selected text to the clipboard selection.
> - .TP
> - .B Ctrl-Shift-v
> - Paste from the clipboard selection.
> --.TP
> --.B Ctrl-Shift-i
> --Launch dmenu to enter a unicode codepoint and send the corresponding glyph
> --to st.
> - .SH CUSTOMIZATION
> - .B st
> - can be customized by creating a custom config.h and (re)compiling the source
> Index: patches/patch-st_c
>
Re: install(1) broken
Marc Espie wrote: > Something similar to this perhaps ? > Not fully tested yet, but it should avoid the race of trying to > unlink tempfile several times, and also fix the file name in error messages. That's probably better.
UPDATE: net/snort 2.9.12
Hello,
attached is an update to snort-2.9.12.
Tested on amd64.
Please test, comment and eventually commit.
Regards
Markus
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.100
diff -u -p -u -p -r1.100 Makefile
--- Makefile4 Sep 2018 12:46:18 - 1.100
+++ Makefile10 Feb 2019 19:24:33 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.11.1
-DISTNAME = snort-${VERSION}
+VERSION = 2.9.12.0
+DISTNAME = snort-${VERSION:S/.0$//g}
CATEGORIES = net security
@@ -25,6 +25,7 @@ CONFIGURE_ARGS += --disable-static-daq \
LIB_DEPENDS = archivers/xz \
devel/pcre \
+ lang/luajit \
net/daq \
net/libdnet \
www/nghttp2
@@ -39,7 +40,6 @@ DOCS =AUTHORS CREDITS README README.*
V =${VERSION:S/.//g}
SUBST_VARS += V
-REVISION = 0
pre-configure:
@${SUBST_CMD} ${WRKSRC}/etc/snort.conf
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo28 Jan 2018 03:09:12 - 1.37
+++ distinfo10 Feb 2019 19:24:33 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.11.1.tar.gz) = n2s66sWhCfVVBL03BWSsQxyxdzUHkp3EYWJomPM/Rs0=
-SIZE (snort-2.9.11.1.tar.gz) = 6442755
+SHA256 (snort-2.9.12.tar.gz) = ewLhGYfGy09tedcnmcqa0rS9Wcwdlrt9bJFUn5kNmdA=
+SIZE (snort-2.9.12.tar.gz) = 6456877
Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
===
RCS file: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
diff -N patches/patch-src_dynamic-preprocessors_appid_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 10 Feb 2019
19:24:33 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/dynamic-preprocessors/appid/Makefile.in
+--- src/dynamic-preprocessors/appid/Makefile.in.orig
src/dynamic-preprocessors/appid/Makefile.in
+@@ -583,7 +583,7 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
+ $(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
+-libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
++libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
+ @SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
+ @SO_WITH_STATIC_LIB_TRUE@libsf_appid_preproc_la_LIBADD =
../libsf_dynamic_preproc.la ../libsf_dynamic_utils.la $(LUA_LIBS)
+ @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_appid_preproc_la_SOURCES = \
Index: patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 28 Jan 2018
03:09:12 - 1.5
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 10 Feb 2019
19:24:33 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_preprocessors_Stream
Index: src/preprocessors/Stream6/snort_stream_tcp.c
--- src/preprocessors/Stream6/snort_stream_tcp.c.orig
+++ src/preprocessors/Stream6/snort_stream_tcp.c
-@@ -8504,7 +8504,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
+@@ -8530,7 +8530,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
char src_addr[17];
char dst_addr[17];
memset((char *)timestamp, 0, TIMEBUF_SIZE);
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:18 - 1.31
+++ pkg/PLIST 10 Feb 2019 19:24:33 -
@@ -2,15 +2,21 @@
@pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
+bin/appid_detector_builder.sh
@bin bin/snort
@bin bin/u2boat
+@bin bin/u2openappid
@bin bin/u2spewfoo
+@bin bin/u2streamer
lib/pkgconfig/snort.pc
lib/snort_dynamicengine/
lib/snort_dynamicengine/libsf_engine.a
@comment lib/snort_dynamicengine/libsf_engine.la
lib/snort_dynamicengine/libsf_engine.so
lib/snort_dynamicpreprocessor/
+lib/snort_dynamicpreprocessor/libsf_appid_preproc.a
+lib/snort_dynamicpreprocessor/libsf_appid_preproc.la
+lib/snort_dynamicpreprocessor
Re: x11/freerdp: update to 2.0.0-rc4
On Sun, Feb 10, 2019 at 02:43:37PM +, Stuart Henderson wrote:
> that should be
>
> +-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
> ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
> || defined(__OpenBSD__)
>
Yes, I will send a PR upstream.
> the old one was outdated but this doesn't flow so nicely .. how about
> the diff below to enable tests and tweak DESCR?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/freerdp/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile 11 Dec 2018 11:12:22 - 1.35
> +++ Makefile 10 Feb 2019 14:36:02 -
> @@ -6,7 +6,7 @@ BROKEN-hppa = undefined reference to __
> COMMENT =open source client for Windows Terminal Server
I would replace TSE with RDP here :)
> DISTNAME = freerdp-2.0.0-rc1
> PKGNAME =freerdp-2.0.0rc1
> -REVISION = 2
> +REVISION = 3
> CATEGORIES = x11 net
>
> SHARED_LIBS += freerdp-client2 0.0 # 2.0
> @@ -37,7 +37,8 @@ LIB_DEPENDS = devel/libexecinfo \
> print/cups,-libs \
> graphics/ffmpeg
>
> -CONFIGURE_ARGS +=-DWITH_CUPS=ON \
> +CONFIGURE_ARGS +=-DBUILD_TESTING=ON \
> + -DWITH_CUPS=ON \
> -DWITH_DIRECTFB=OFF \
> -DWITH_GSTREAMER_0_10=OFF \
> -DWITH_GSTREAMER_1_0=OFF \
> @@ -45,8 +46,6 @@ CONFIGURE_ARGS += -DWITH_CUPS=ON \
> -DWITH_PCSC=ON \
> -DWITH_LIBSYSTEMD=OFF \
> -DWITH_OSS=OFF
> -
> -NO_TEST =Yes
>
> pre-configure:
> ${SUBST_CMD}${WRKSRC}/winpr/libwinpr/CMakeLists.txt
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/x11/freerdp/pkg/DESCR,v
> retrieving revision 1.3
> diff -u -p -r1.3 DESCR
> --- pkg/DESCR 4 Aug 2012 14:47:00 - 1.3
> +++ pkg/DESCR 10 Feb 2019 14:36:02 -
> @@ -1,4 +1,5 @@
> -freerdp is a fork of the rdesktop project and is an open source client
> -for Windows NT and 2000 Terminal Server, capable of natively speaking
> -the Remote Desktop Protocol (RDP) in order to present the user's Windows
> -desktop.
> +FreeRDP is a free implementation of RDP, Microsoft's Remote Desktop Protocol.
> +It provides a library and client software to provide a user with a graphical
> +interface to connect to another computer over a network connection.
> +
> +It includes features like clipboard sharing, device and folder redirection.
>
OK denis@
Re: install(1) broken
Something similar to this perhaps ?
Not fully tested yet, but it should avoid the race of trying to
unlink tempfile several times, and also fix the file name in error messages.
Index: xinstall.c
===
RCS file: /cvs/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.68
diff -u -p -r1.68 xinstall.c
--- xinstall.c 8 Feb 2019 12:53:44 - 1.68
+++ xinstall.c 10 Feb 2019 14:53:49 -
@@ -222,6 +222,7 @@ install(char *from_name, char *to_name,
struct timespec ts[2];
int devnull, from_fd, to_fd, serrno, files_match = 0;
char *p;
+ char *target_name = tempfile;
(void)memset((void *)&from_sb, 0, sizeof(from_sb));
(void)memset((void *)&to_sb, 0, sizeof(to_sb));
@@ -311,10 +312,14 @@ install(char *from_name, char *to_name,
} else {
files_match = 1;
(void)unlink(tempfile);
+ target_name = to_name;
+ (void)close(temp_fd);
}
}
- (void)close(to_fd);
- to_fd = temp_fd;
+ if (!files_match) {
+ (void)close(to_fd);
+ to_fd = temp_fd;
+ }
}
/*
@@ -333,13 +338,15 @@ install(char *from_name, char *to_name,
if ((gid != (gid_t)-1 || uid != (uid_t)-1) &&
fchown(to_fd, uid, gid)) {
serrno = errno;
- (void)unlink(tempfile);
- errx(1, "%s: chown/chgrp: %s", tempfile, strerror(serrno));
+ if (target_name == tempfile)
+ (void)unlink(tempfile);
+ errx(1, "%s: chown/chgrp: %s", target_name, strerror(serrno));
}
if (fchmod(to_fd, mode)) {
serrno = errno;
- (void)unlink(tempfile);
- errx(1, "%s: chmod: %s", tempfile, strerror(serrno));
+ if (target_name == tempfile)
+ (void)unlink(tempfile);
+ errx(1, "%s: chmod: %s", target_name, strerror(serrno));
}
/*
@@ -349,7 +356,7 @@ install(char *from_name, char *to_name,
if (fchflags(to_fd,
flags & SETFLAGS ? fset : from_sb.st_flags & ~UF_NODUMP)) {
if (errno != EOPNOTSUPP || (from_sb.st_flags & ~UF_NODUMP) != 0)
- warnx("%s: chflags: %s", tempfile, strerror(errno));
+ warnx("%s: chflags: %s", target_name, strerror(errno));
}
if (flags & USEFSYNC)
Re: x11/freerdp: update to 2.0.0-rc4
On 2019/02/09 16:48, Denis Fondras wrote:
> Can anyone give it a try ? The patch to overcome timerfd_create() is a bit
> naive.
Looking again I see it doesn't actually need the linux-specific timerfd_*
functions but it *does* need the posix timer functions that are normally
in librt (timer_create, timer_delete, timer_settime, timer_gettime) or
a whole alternative implementation (as freerdp has for OSX).
Basic runtime works for me with your diff but I don't see how it can be
a correct fix so I wouldn't be too happy about committing it.. And freerdp's
test suite fails.
> winpr/libwinpr/utils/trio/triodef.h.orig Thu Oct 29 07:05:37 2015
> -+++ winpr/libwinpr/utils/trio/triodef.h Thu Oct 29 07:05:59 2015
> -@@ -88,7 +88,7 @@
> - # endif
> - #endif
> -
> --#if defined(__NetBSD__)
> -+#if defined(__NetBSD__) || defined(__OpenBSD__)
> - # define TRIO_PLATFORM_UNIX
> - #endif
> -
that should be
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) ||
defined(__OpenBSD__)
> retrieving revision 1.3
> diff -u -p -r1.3 DESCR
> --- pkg/DESCR 4 Aug 2012 14:47:00 - 1.3
> +++ pkg/DESCR 9 Feb 2019 14:58:50 -
> @@ -1,4 +1,3 @@
> -freerdp is a fork of the rdesktop project and is an open source client
> -for Windows NT and 2000 Terminal Server, capable of natively speaking
> -the Remote Desktop Protocol (RDP) in order to present the user's Windows
> -desktop.
> +FreeRDP is a free library and clients of the Remote Desktop Protocol (RDP), a
> +proprietary protocol developed by Microsoft, which provides a user with a
> +graphical interface to connect to another computer over a network connection.
>
the old one was outdated but this doesn't flow so nicely .. how about
the diff below to enable tests and tweak DESCR?
Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile11 Dec 2018 11:12:22 - 1.35
+++ Makefile10 Feb 2019 14:36:02 -
@@ -6,7 +6,7 @@ BROKEN-hppa = undefined reference to __
COMMENT = open source client for Windows Terminal Server
DISTNAME = freerdp-2.0.0-rc1
PKGNAME = freerdp-2.0.0rc1
-REVISION = 2
+REVISION = 3
CATEGORIES = x11 net
SHARED_LIBS += freerdp-client2 0.0 # 2.0
@@ -37,7 +37,8 @@ LIB_DEPENDS = devel/libexecinfo \
print/cups,-libs \
graphics/ffmpeg
-CONFIGURE_ARGS += -DWITH_CUPS=ON \
+CONFIGURE_ARGS += -DBUILD_TESTING=ON \
+ -DWITH_CUPS=ON \
-DWITH_DIRECTFB=OFF \
-DWITH_GSTREAMER_0_10=OFF \
-DWITH_GSTREAMER_1_0=OFF \
@@ -45,8 +46,6 @@ CONFIGURE_ARGS += -DWITH_CUPS=ON \
-DWITH_PCSC=ON \
-DWITH_LIBSYSTEMD=OFF \
-DWITH_OSS=OFF
-
-NO_TEST = Yes
pre-configure:
${SUBST_CMD}${WRKSRC}/winpr/libwinpr/CMakeLists.txt
Index: pkg/DESCR
===
RCS file: /cvs/ports/x11/freerdp/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR
--- pkg/DESCR 4 Aug 2012 14:47:00 - 1.3
+++ pkg/DESCR 10 Feb 2019 14:36:02 -
@@ -1,4 +1,5 @@
-freerdp is a fork of the rdesktop project and is an open source client
-for Windows NT and 2000 Terminal Server, capable of natively speaking
-the Remote Desktop Protocol (RDP) in order to present the user's Windows
-desktop.
+FreeRDP is a free implementation of RDP, Microsoft's Remote Desktop Protocol.
+It provides a library and client software to provide a user with a graphical
+interface to connect to another computer over a network connection.
+
+It includes features like clipboard sharing, device and folder redirection.
update: weboob 1.4
Hi,
Here an update for weboob to 1.4.
While here, taking maintainership.
Comments or OK ?
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/www/weboob/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile29 Jun 2018 22:16:22 - 1.9
+++ Makefile10 Feb 2019 14:15:55 -
@@ -2,16 +2,18 @@
COMMENT = web out of browsers
-MODPY_EGG_VERSION =1.3
+MODPY_EGG_VERSION =1.4
DISTNAME = weboob-${MODPY_EGG_VERSION}
CATEGORIES = www
-HOMEPAGE = http://weboob.org
+HOMEPAGE = https://weboob.org
+
+MAINTAINER = Sebastien Marie
# AGPLv3+
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = https://symlink.me/attachments/download/356/
+MASTER_SITES =
https://git.weboob.org/weboob/weboob/-/archive/${MODPY_EGG_VERSION}/
MODULES = lang/python
@@ -28,7 +30,6 @@ RUN_DEPENDS +=devel/desktop-file-utils
x11/gtk+3,-guic \
converters/py-html2text${MODPY_FLAVOR} \
devel/py-dateutil${MODPY_FLAVOR} \
- devel/py-html5lib${MODPY_FLAVOR} \
devel/py-simplejson${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
graphics/py-Pillow${MODPY_FLAVOR} \
@@ -39,6 +40,7 @@ RUN_DEPENDS +=devel/desktop-file-utils
textproc/py-prettytable${MODPY_FLAVOR} \
textproc/py-yaml${MODPY_FLAVOR} \
textproc/py-cssselect${MODPY_FLAVOR} \
+ textproc/py-unidecode${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR}
@@ -50,17 +52,17 @@ TEST_DEPENDS += ${RUN_DEPENDS} \
.if ${FLAVOR:Mpython3}
PKGNAME = weboob${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
.else
-RUN_DEPENDS += devel/py-futures \
- www/py-mechanize
+RUN_DEPENDS += devel/py-futures
.endif
-REVISION = 1
MAKE_ENV +=PYUIC5_EXECUTABLE=${LOCALBASE}/bin/pyuic5${MODPY_BIN_SUFFIX}
WEBOOB_BINARIES = boobank boobathon boobcoming boobill booblyrics boobmsg \
+ boomoney \
boobooks boobsize boobtracker cineoob comparoob cookboob \
flatboob galleroob geolooc handjoob havedate monboob \
- parceloob pastoob qbooblyrics qboobmsg qcineoob qcookboob \
+ parceloob pastoob qbooblyrics qboobmsg \
+ qgalleroob qboobtracker qcineoob qcookboob \
qflatboob qhandjoob qhavedate qvideoob qwebcontentedit \
radioob shopoob suboob translaboob traveloob videoob \
webcontentedit weboob weboob-cli weboob-config \
@@ -101,6 +103,7 @@ do-test:
cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} \
LC_CTYPE=C.UTF-8 \
WEBOOB_WORKDIR="${WRKDIR}/weboob-workdir" \
- ./tools/run_tests.sh ${MODPY_BIN_SUFFIX}
+ PYTHON="${MODPY_BIN}" \
+ ./tools/run_tests.sh --no-modules
.include
Index: distinfo
===
RCS file: /cvs/ports/www/weboob/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo20 May 2018 07:17:34 - 1.2
+++ distinfo10 Feb 2019 14:15:55 -
@@ -1,2 +1,2 @@
-SHA256 (weboob-1.3.tar.gz) = yZF4XIiYd8dvGNGeNy7Urgw/i4Gf0ejaKWvTSxOBvlQ=
-SIZE (weboob-1.3.tar.gz) = 2688899
+SHA256 (weboob-1.4.tar.gz) = EPsp1gnbHXJ0fQOu6Tlpkwfxu1dsiE6tOyabbUj+PXU=
+SIZE (weboob-1.4.tar.gz) = 2790295
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/www/weboob/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 20 May 2018 07:17:34 - 1.2
+++ patches/patch-setup_py 10 Feb 2019 14:15:55 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-setup_py,v 1.2 2018/05/2
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -117,7 +117,7 @@ def install_weboob():
+@@ -133,7 +133,7 @@ def install_weboob(qt, xdg):
packages = packages - qt_packages
data_files = [
-('share/man/man1', glob.glob('man/*')),
+('man/man1', glob.glob('man/*')),
]
- if options.xdg:
+ if xdg:
data_files.extend([
Index: patches/patch-tools_run_tests_sh
===
RCS file: patches/patch-tools_run_tests_sh
diff -N patches/patch-tools_run_tests_sh
--- patches/patch-tools_run_tests_sh20 May 2018 07:17:34 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-tools_run_tests_sh,v 1.1 2018/05/20 07:17:34 landry Exp $
-search bash in PATH:
https://git.weboob.org/weboob/devel/commit/1fb226ada13d499751549dd05f052ddfec294ddf
-mktemp wants at least 6 'X':
https://git.weboob.org/weboob/devel/commit/05f173f520f9edc498f502c67f798c2d86002873
-Index: tools/run_tests.sh
tools/ru
Re: texlive & evince
On Sat, Feb 09, 2019 at 07:54:37PM +, Edd Barrett wrote: > Hi, > > On Thu, Feb 07, 2019 at 05:34:35PM +0100, Jeremie Courreges-Anglas wrote: > > > Index: pkg/PLIST-synctex > > > === > > > RCS file: pkg/PLIST-synctex > > > diff -N pkg/PLIST-synctex > > > --- /dev/null 1 Jan 1970 00:00:00 - > > > +++ pkg/PLIST-synctex 4 Feb 2019 17:39:55 - > > > @@ -0,0 +1,15 @@ > > > +@comment $OpenBSD$ > > > +@conflict teTeX_base-* > > > +@conflict pdfjam-* > > > +@conflict ht-<2 > > > +@conflict texlive_texmf-buildset-<2018 > > > +@conflict texlive_base-<2018p1 > > > > The last line looks fine but I doubt that you need to copy the other > > @conflict lines. Were the -synctex files once provided by one of those > > packages? > > I looked at what espie@ did with the mktexlsr subpackage. > > The only conflict that might have conceivably included synctex was > teTeX_base, but the synctex source code has copyright starting 2008, and > teTeX died in 2006. So, I guess not. > > > As already discussed, I don't understand how it helps for those depends > > to be that strict. Aren't files more commonly moved between > > texlive/texmf subpackages, rather than from texlive/base to > > texlive/texmf? Unless I'm missing something, we may easily avoid the > > problem by only stating minimal versions: less chances for errors and less > > churn for pkg_add -u. Please find a diff below. > > Yep, sounds good. Diff also looks good. > > So are we saying that, with that change, the diff I posted to move > synctex into it's own sub-package would then be good to go (once we fix > the merge conflicts that will be caused by your change)? > > > Well, as mentioned by kili there's also the option to force evince to > > always use its internal copy. This means one more copy of synctex to > > watch for security/portability issues, but on the other hand this would > > decouple evince and texlive updates. Not a bad idea given the recent, > > undocumented API/ABI break in libsynctex... > > > > https://github.com/jlaurens/synctex/issues/23 > > My gut feeling says we should use the one from TeX live, but I think we > should hear from jasper@ and/or aja@, since they are the ones who > maintain evince. > > Guys, what would you prefer? I agree, we should use the one from TeX live. That's also what major Linux distros do as well. -- Antoine
Re: UPDATE: x11/st
OK kn
Re: [WIP/NEW] 1oom - Master of Orion 1 engine
On 2/9/19 5:36 PM, Thomas Frohwein wrote: [...] Ping? It would be nice to get this in. Tarball reattached for convenience. ~Brian Portswise looks fine to me. I tested running with and without the fixbug file - both started up fine. Haven't tested any other startup options. The main menu plays music, but after starting a game music seems to be missing - there is no difference between "FX only" and "Music" in the game's options menu. I don't know if the original does have music there or not. Since I don't know if this is a bug or not and it otherwise seems to work fine (on only a few minutes of testing), ok thfr@. This is actually correct. The game just doesn't have much in terms of music once you get past the main menu. Thanks. ~Brian
Re: UPDATE: maven 3.6.0
ping. Any issues with the patch? Thanks! Karel On Sun, 3 Feb 2019 21:05:48 +0100 Karel Gardas wrote: > > Hello, > > patch below updates maven to 3.6.0. > > Thanks, > Karel
[UPDATE] devel/p5-MooseX-Params-Validate 0.19 -> 0.21
Here is an update for MooseX::Params::Validate.
The sole upstream change [1] is backward incompatible: errors
thrown by this module when a type constraint fails have changed.
What's new in the port:
- Cleaned TEST_DEPENDS. Author and release tests have not been enabled,
we have too many missing modules for that.
- Fixed a spacing inconsistency
- New PLIST
Testing:
- 'make test' passes
- There are 3 consumers, they all passes tests [2]
Comments and feedback are welcome.
Charlène.
[1]
https://metacpan.org/source/DROLSKY/MooseX-Params-Validate-0.21/Changes
[2] https://transfer.sh/6A7ti/p5-MooseX-Params-Validate.tgz
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-MooseX-Params-Validate/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile20 Mar 2016 19:56:29 - 1.8
+++ Makefile10 Feb 2019 11:57:12 -
@@ -4,18 +4,17 @@ COMMENT = extension of Params::Validate
MODULES = cpan
PKG_ARCH = *
-DISTNAME = MooseX-Params-Validate-0.19
+DISTNAME = MooseX-Params-Validate-0.21
CATEGORIES = devel
# Perl
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_CDROM = Yes
RUN_DEPENDS = devel/p5-Devel-Caller \
devel/p5-Moose \
devel/p5-Params-Validate \
devel/p5-Sub-Exporter
-TEST_DEPENDS = devel/p5-Test-Exception \
- devel/p5-Test-Fatal
+TEST_DEPENDS = devel/p5-Test-Fatal
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-MooseX-Params-Validate/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo20 Jan 2015 09:55:23 - 1.3
+++ distinfo10 Feb 2019 11:57:12 -
@@ -1,2 +1,2 @@
-SHA256 (MooseX-Params-Validate-0.19.tar.gz) =
k7deCYz5zKvNVr82+vOpZmkFSQJWc5YyHuZ+q53fOpo=
-SIZE (MooseX-Params-Validate-0.19.tar.gz) = 30285
+SHA256 (MooseX-Params-Validate-0.21.tar.gz) =
iClURqupmcu4+ZjX+5onAdZhc5SlHW1yTHdObZ/xOdk=
+SIZE (MooseX-Params-Validate-0.21.tar.gz) = 34300
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-MooseX-Params-Validate/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 27 Oct 2009 00:33:37 - 1.1.1.1
+++ pkg/PLIST 10 Feb 2019 11:57:12 -
@@ -1,5 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/10/27 00:33:37 jim Exp $
${P5SITE}/MooseX/
${P5SITE}/MooseX/Params/
+${P5SITE}/MooseX/Params/Validate/
${P5SITE}/MooseX/Params/Validate.pm
+${P5SITE}/MooseX/Params/Validate/Exception/
+${P5SITE}/MooseX/Params/Validate/Exception/ValidationFailedForTypeConstraint.pm
@man man/man3p/MooseX::Params::Validate.3p
+@man
man/man3p/MooseX::Params::Validate::Exception::ValidationFailedForTypeConstraint.3p
Re: nedit receives SIGABRT when an item from Help menu is selected
Hello Laurence,
thanks for your feedback.
On 2/10/19 11:01 AM, Laurence Tratt wrote:
On Sat, Feb 09, 2019 at 10:50:31AM +0100, Alessandro DE LAURENZIS wrote:
Hello Alessandro,
all in the subject... This is a gdb backtrace after e.g "Getting Started"
(but the same thing happens whichever item I select from Help menu):
The version of Nedit in ports is 5.5, which is about 15 years old [1]. It has
bitrotted badly since and, personally, I abandoned Nedit 5 years ago due to
the increasing number of visible bugs (the one you mention is one I vaguely
remember; but there were several others).
I see from Wikipedia that there is now a 5.6 and maybe a 5.7 release (is [2]
the definitive site? I'm unsure). Maybe the new releases fix some of the
issues, although if ever a project has felt abandoned, it is Nedit :/
Laurie
[1] https://marc.info/?l=openbsd-ports&m=109791544315146&w=2
[2] https://sourceforge.net/p/nedit/git/ci/master/tree/
Yes, I was aware. I discussed privately with Stuart, who suggested to
update the port. I made a first attempt (unified diff in the
attachment), and verified that this bug at least has gone. But it surely
requires deeper review and testing, considering also that I'm not a
nedit user...
--
Alessandro DE LAURENZIS
[mailto:jus...@atlantide.t28.net]
Web: http://www.atlantide.t28.net
LinkedIn: https://www.linkedin.com/in/delaurenzis/
Index: Makefile
===
RCS file: /cvs/ports/editors/nedit/Makefile,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 Makefile
--- Makefile 4 Sep 2018 12:46:11 - 1.78
+++ Makefile 9 Feb 2019 13:36:31 -
@@ -1,42 +1,42 @@
# $OpenBSD: Makefile,v 1.78 2018/09/04 12:46:11 espie Exp $
-COMMENT= X11/Motif GUI text editor
+COMMENT = a fast, compact Motif/X11 plain text editor
-DISTNAME= nedit-5.5
-P_V= 0.5
-REVISION= 23
-EPOCH= 0
-DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \
+DISTNAME = nedit-5.7
+P_V = 0.5
+DISTFILES = ${DISTNAME}-src${EXTRACT_SUFX} \
nedit_patterns-${P_V}.tgz:0
-PATCHFILES= wrapmark.diff:0
-CATEGORIES= editors x11
+CATEGORIES = editors x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nedit/}
-MASTER_SITES0= http://distfiles.nl/
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nedit/}
+MASTER_SITES0 = http://distfiles.nl/
-DIST_SUBDIR= nedit
+DIST_SUBDIR = nedit
# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xmu Xpm Xrender Xt
WANTLIB += c expat fontconfig freetype iconv m z Xm
-LIB_DEPENDS+= converters/libiconv \
+LIB_DEPENDS += converters/libiconv \
x11/motif
-ALL_TARGET= openbsd
+ALL_TARGET = openbsd
-NO_TEST= Yes
+NO_TEST = Yes
-CFLAGS+= -DBUILD_UNTESTED_NEDIT
-MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
+MAKE_ENV += MOTIFLIB='-L${LOCALBASE}/lib -lXm'
+
+post-build:
+ mv ${WRKBUILD}/doc/nc.pod ${WRKBUILD}/doc/ncl.pod
+ @cd ${WRKBUILD} && ${MAKE} docs
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/source/nedit ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKBUILD}/source/nc ${PREFIX}/bin/ncl
${INSTALL_MAN} ${WRKSRC}/doc/nedit.man ${PREFIX}/man/man1/nedit.1
- ${INSTALL_MAN} ${WRKSRC}/doc/nc.man ${PREFIX}/man/man1/ncl.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/ncl.man ${PREFIX}/man/man1/ncl.1
${INSTALL_DATA} ${WRKSRC}/doc/NEdit.ad \
${PREFIX}/lib/X11/app-defaults/NEdit
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit
Index: distinfo
===
RCS file: /cvs/ports/editors/nedit/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo 18 Jan 2015 03:13:50 - 1.18
+++ distinfo 9 Feb 2019 13:36:31 -
@@ -1,6 +1,4 @@
-SHA256 (nedit/nedit-5.5-src.tar.gz) = fNa7yd8VQhzM6Zj0xqzZZuCmRTxV6JegMN4TLggkP1I=
+SHA256 (nedit/nedit-5.7-src.tar.gz) = rdmsef+XNSitNshoWCOLrE9ZiWwn2/KFy+ak1CX8oXo=
SHA256 (nedit/nedit_patterns-0.5.tgz) = 7qnt2CG5d9xtvfYGk7nAOlSeuNrba+d++GO5y58bpdA=
-SHA256 (nedit/wrapmark.diff) = zVi6lmNskZwQ4zfIedeKFD//kbECfO/Hq8uocohGqO0=
-SIZE (nedit/nedit-5.5-src.tar.gz) = 1503942
+SIZE (nedit/nedit-5.7-src.tar.gz) = 1344754
SIZE (nedit/nedit_patterns-0.5.tgz) = 9245
-SIZE (nedit/wrapmark.diff) = 50327
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 9 Feb 2019 13:36:31 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -32,7 +32,6 @@ all:
+ (cd Xlt;$(MAKE) -f Makefile.$@ libXlt.a)
+ (cd Microline/XmL;$(MAKE) -f Makefile.$@ libXmL.a)
+ (cd source; $(MAKE) -f Makefile.$@ nedit nc)
+- @source/nedit -V
+
+ # This should not be in the default build, as users may not have Perl
+ # installed. This is only interesting to developers.
Index: patches/patch-doc_Makefile
===
RCS file: patches/patch-doc
Re: nedit receives SIGABRT when an item from Help menu is selected
On Sat, Feb 09, 2019 at 10:50:31AM +0100, Alessandro DE LAURENZIS wrote: Hello Alessandro, > all in the subject... This is a gdb backtrace after e.g "Getting Started" > (but the same thing happens whichever item I select from Help menu): The version of Nedit in ports is 5.5, which is about 15 years old [1]. It has bitrotted badly since and, personally, I abandoned Nedit 5 years ago due to the increasing number of visible bugs (the one you mention is one I vaguely remember; but there were several others). I see from Wikipedia that there is now a 5.6 and maybe a 5.7 release (is [2] the definitive site? I'm unsure). Maybe the new releases fix some of the issues, although if ever a project has felt abandoned, it is Nedit :/ Laurie [1] https://marc.info/?l=openbsd-ports&m=109791544315146&w=2 [2] https://sourceforge.net/p/nedit/git/ci/master/tree/ -- Personal http://tratt.net/laurie/ Software Development Teamhttp://soft-dev.org/ https://github.com/ltratt http://twitter.com/laurencetratt
davical 1.1.8
Hi,
here's an update to davical 1.1.8 (&awl 0.60), seems to work fine for me
with php 7.0 on 6.4 & android via davdroid.
Please test & report.
Landry
Index: productivity/davical/Makefile
===
RCS file: /cvs/ports/productivity/davical/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- productivity/davical/Makefile 17 Oct 2018 14:15:56 - 1.23
+++ productivity/davical/Makefile 10 Feb 2019 11:09:39 -
@@ -2,11 +2,10 @@
COMMENT = CalDAV/CardDav calendar/contacts server
-DISTNAME = davical_1.1.7.orig
-PKGNAME = davical-1.1.7
+DISTNAME = davical_1.1.8.orig
+PKGNAME = davical-1.1.8
EXTRACT_SUFX = .tar.xz
CATEGORIES = productivity net
-REVISION = 1
HOMEPAGE = https://www.davical.org/
MASTER_SITES = https://www.davical.org/downloads/
Index: productivity/davical/distinfo
===
RCS file: /cvs/ports/productivity/davical/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- productivity/davical/distinfo 28 May 2018 20:20:46 - 1.4
+++ productivity/davical/distinfo 10 Feb 2019 11:09:39 -
@@ -1,2 +1,2 @@
-SHA256 (davical_1.1.7.orig.tar.xz) =
6Uq5XeQ+7csiOTfMApcUf6ccx/gotskJEEuk3JuoJas=
-SIZE (davical_1.1.7.orig.tar.xz) = 1347368
+SHA256 (davical_1.1.8.orig.tar.xz) =
akcc6+0TlxEEHAXklIDL5eyS+XmnRgHjQh3fALErYbk=
+SIZE (davical_1.1.8.orig.tar.xz) = 1358060
Index: productivity/davical/pkg/PLIST
===
RCS file: /cvs/ports/productivity/davical/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- productivity/davical/pkg/PLIST 4 Sep 2018 12:46:20 - 1.7
+++ productivity/davical/pkg/PLIST 10 Feb 2019 11:09:39 -
@@ -10,8 +10,8 @@
@sample davical/config/config.php
davical/config/other-config.php
davical/davical.conf
-@sample ${PREFIX}/conf/modules.sample/
-@sample ${PREFIX}/conf/modules.sample/davical.conf
+@sample conf/modules.sample/
+@sample conf/modules.sample/davical.conf
davical/dba/
davical/dba/appuser_permissions.txt
davical/dba/base-data.sql
@@ -51,6 +51,7 @@
davical/dba/patches/1.2.9.sql
davical/dba/patches/1.3.1.sql
davical/dba/patches/1.3.2.sql
+davical/dba/patches/1.3.3.sql
davical/dba/rrule_functions-8.1.sql
davical/dba/rrule_functions.sql
davical/dba/rrule_tests.sql
@@ -142,6 +143,7 @@
davical/inc/freebusy-functions.php
davical/inc/iSchedule-POST.php
davical/inc/iSchedule.php
+davical/inc/instance_range.php
davical/inc/interactive-page.php
davical/inc/log_caldav_action.php
davical/inc/other_translated_strings.php
Index: www/awl/Makefile
===
RCS file: /cvs/ports/www/awl/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- www/awl/Makefile17 Oct 2018 14:15:56 - 1.14
+++ www/awl/Makefile10 Feb 2019 11:09:39 -
@@ -2,12 +2,11 @@
COMMENT = Andrews web libraries for PHP
-DISTNAME = awl_0.59.orig
-PKGNAME = php-awl-0.59
+DISTNAME = awl_0.60.orig
+PKGNAME = php-awl-0.60
EXTRACT_SUFX = .tar.xz
CATEGORIES = www
PKG_ARCH = *
-REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
Index: www/awl/distinfo
===
RCS file: /cvs/ports/www/awl/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- www/awl/distinfo28 May 2018 20:19:41 - 1.4
+++ www/awl/distinfo10 Feb 2019 11:09:39 -
@@ -1,2 +1,2 @@
-SHA256 (awl_0.59.orig.tar.xz) = V9qta18cjtV8HOkL6spgZb4fbSlsdoXuXe8N9U6dZwU=
-SIZE (awl_0.59.orig.tar.xz) = 124652
+SHA256 (awl_0.60.orig.tar.xz) = GP1MR9RUIq6PS4TRlKKPtw+h1LDJ/FncgAz2ATCnReM=
+SIZE (awl_0.60.orig.tar.xz) = 124772
Re: install(1) broken
On Sat, Feb 09, 2019 at 05:23:09PM -0500, Ted Unangst wrote:
> Marc Espie wrote:
> > hey, your commit to install(1) broke something.
> >
> > Specifically lang/go-boostrap now produces a broken package which can't
> > be used to build go.
> >
> > All the go/bootstrap/pkg/tool/openbsd_amd64/*
> > have lost their x bit
> >
> > Relevant fake install information, it definitely looks like the last line
> > is now a no-op.
>
> > # These get installed via `find' however we need them to be executable
> > /pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
> > /pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64
> > /pobj/go-bootstrap-1.4.20171003/bin/install -c -m 755 -p
> > /pobj/go-bootstrap-1.4.20171003/go/pkg/tool//openbsd_amd64/*
> > /pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64
>
> Yes. This is a weird way to invoke chmod, but that's what it wants.
>
> I think this was a long standing bug in install? If the files match, we need
> to continue on with to_fd == existing file so that metadata updates work.
>
>
> Index: xinstall.c
> ===
> RCS file: /cvs/src/usr.bin/xinstall/xinstall.c,v
> retrieving revision 1.68
> diff -u -p -r1.68 xinstall.c
> --- xinstall.c8 Feb 2019 12:53:44 - 1.68
> +++ xinstall.c9 Feb 2019 22:21:03 -
> @@ -313,8 +313,12 @@ install(char *from_name, char *to_name,
> (void)unlink(tempfile);
> }
> }
> - (void)close(to_fd);
> - to_fd = temp_fd;
> + if (!files_match) {
> + (void)close(to_fd);
> + to_fd = temp_fd;
> + } else {
> + close(temp_fd);
> + }
> }
>
> /*
I'm afraid this needs to be slightly more complex, probably to put the
remaining code in its own function, or something.
Specifically, the error paths for the fchown and fchmod will be all bogus
in that case, referring to a tempfile that's already been removed, and
is not even the target...
[UPDATE] devel/p5-Getargs-Long 1.1007 -> 1.1012
Here is an update for Getargs::Long.
What's new upstream [1]:
- Test and distribution fixes
- Unbreak the build with Perl 5.26+ :)
Port-wise it's a simple version bump, i've enabled tests as well.
Testing:
- 'make test' passes with Perl 5.24 and 5.28
- The sole consumer is devel/p5-Carp Datum, it passes [2] with the fixes
to it i proposed earlier [3].
Comments/feedback are welcome!
Charlène.
[1] https://metacpan.org/changes/distribution/Getargs-Long
[2] https://transfer.sh/fQ4yg/p5-Getargs-Long.tgz
[3] https://marc.info/?l=openbsd-ports&m=154979530418954&w=2
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Getargs-Long/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile20 Mar 2016 19:56:24 - 1.16
+++ Makefile10 Feb 2019 10:55:48 -
@@ -4,7 +4,7 @@ COMMENT=parses long function arguments
MODULES= cpan
PKG_ARCH= *
-DISTNAME = Getargs-Long-1.1007
+DISTNAME = Getargs-Long-1.1012
CATEGORIES=devel
# perl
@@ -13,5 +13,12 @@ PERMIT_PACKAGE_CDROM=Yes
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/p5-Log-Agent>=0.105 \
www/p5-URI
+
+TEST_DEPENDS= devel/p5-Perl-Critic \
+ devel/p5-Test-Compile \
+ devel/p5-Test-Perl-Critic
+
+MAKE_ENV +=TEST_POD=Yes \
+ TEST_AUTHOR=Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Getargs-Long/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo11 Jun 2015 09:16:17 - 1.6
+++ distinfo10 Feb 2019 10:55:48 -
@@ -1,2 +1,2 @@
-SHA256 (Getargs-Long-1.1007.tar.gz) =
vKi33PhA1unlSOvv6H/a9dEHcy28M8SyzsWiubzr1fQ=
-SIZE (Getargs-Long-1.1007.tar.gz) = 41435
+SHA256 (Getargs-Long-1.1012.tar.gz) =
U9DvYjkLXJziydo9ae+XT03GIxozhbuV1AcV99qQxw4=
+SIZE (Getargs-Long-1.1012.tar.gz) = 44080
Re: x11/freerdp: update to 2.0.0-rc4
On Sun, Feb 10, 2019 at 09:59:19AM +0100, Landry Breuil wrote: > Well if it works that's good, but yeah i doubt replacing > timerfd_create() by kqueue() will work when those codepaths are > reached... have you checked that was the case ? If so that's great. > The specific timerfd_* are #ifdef'd and never reached. timer->fd is then used by poll() so a dummy valid fd is "safe". But I'd like another eye on it as it looks like all callbacks are NULL so I don't understand what this timer is used for.
[FIX] devel/p5-Carp-Datum runtime fails
Hi ports!
While working on an update for devel/p5-Getargs-Long, i've found out
that Carp::Datum is broken at runtime: 'defined %hash' is a fatal error
since Perl 5.22 [1].
The following diff, coming from Debian [2], fixes that. 'make test'
passes. I've also removed a spacing inconsistency while here.
Any comment?
Charlène.
[1]
https://perldoc.perl.org/5.22.0/perldelta.html#defined(%40array)-and-defined(%25hash)-are-now-fatal-errors
[2] https://rt.cpan.org/Public/Bug/Display.html?id=105296
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Carp-Datum/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile5 Dec 2017 16:25:45 - 1.15
+++ Makefile10 Feb 2019 10:18:37 -
@@ -5,9 +5,9 @@ COMMENT=debugging and tracing ultimate
MODULES= cpan
PKG_ARCH= *
DISTNAME= Carp-Datum-0.1.3
-REVISION= 3
+REVISION= 4
CATEGORIES=devel perl5
-FIX_EXTRACT_PERMISSIONS=Yes
+FIX_EXTRACT_PERMISSIONS= Yes
# Artistic License
PERMIT_PACKAGE_CDROM= Yes
Index: patches/patch-Datum_Parser_pm
===
RCS file: patches/patch-Datum_Parser_pm
diff -N patches/patch-Datum_Parser_pm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Datum_Parser_pm 10 Feb 2019 10:18:37 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+"defined %hash" is an error in perl 5.22+
+Index: Datum/Parser.pm
+--- Datum/Parser.pm.orig
Datum/Parser.pm
+@@ -1102,7 +1102,7 @@ sub yy_keyword {
+ 'usr2' => $USR2,
+ 'warning' => $WARNING,
+ 'yes' => $YES
+- ) unless defined %Keyword;
++ ) unless %Keyword;
+ return undef unless /^(\w+)/ && exists $Keyword{$1};
+ my $word = $1;
+ s/^\w+//;
Index: patches/patch-Datum_Parser_y
===
RCS file: patches/patch-Datum_Parser_y
diff -N patches/patch-Datum_Parser_y
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Datum_Parser_y10 Feb 2019 10:18:37 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+"defined %hash" is an error in perl 5.22+
+Index: Datum/Parser.y
+--- Datum/Parser.y.orig
Datum/Parser.y
+@@ -581,7 +581,7 @@ sub yy_keyword {
+ 'usr2' => $USR2,
+ 'warning' => $WARNING,
+ 'yes' => $YES
+- ) unless defined %Keyword;
++ ) unless %Keyword;
+ return undef unless /^(\w+)/ && exists $Keyword{$1};
+ my $word = $1;
+ s/^\w+//;
Index: patches/patch-Datum_pm
===
RCS file: patches/patch-Datum_pm
diff -N patches/patch-Datum_pm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Datum_pm 10 Feb 2019 10:18:37 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+"defined %hash" is an error in perl 5.22+
+Index: Datum.pm
+--- Datum.pm.orig
Datum.pm
+@@ -315,7 +315,7 @@ sub DTRACE {
+ TRC_NOTICE()=> [\&logsay, undef],
+ TRC_INFO() => [\&logtrc, 'info'],
+ TRC_DEBUG() => [\&logtrc, 'debug'],
+- ) unless defined %Carp::Datum::logmap;
++ ) unless %Carp::Datum::logmap;
+
+ my $entry = $Carp::Datum::logmap{$level};
+
buildbot 2.0.1
Hi,
here's an update to buildbot 2.0.1, despite the major number change no
huge changes, mostly api breaks from cleanup/python2 code deprecation.
cf
https://docs.buildbot.net/current/relnotes/index.html#buildbot-2-0-1-2019-02-06
doas -u _buildbot buildbot upgrade-master /where/you/master/is required.
will probably commmit it in the coming days unless it breaks someones'
setup..
? py-buildslave/pkg/PLIST.py2
Index: py-buildslave/Makefile
===
RCS file: /cvs/ports/devel/py-buildslave/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- py-buildslave/Makefile 24 Jan 2019 09:50:50 - 1.36
+++ py-buildslave/Makefile 10 Feb 2019 10:34:46 -
@@ -2,7 +2,7 @@
COMMENT= buildworker for the buildbot CI system
-MODPY_EGG_VERSION= 1.8.0
+MODPY_EGG_VERSION= 2.0.1
DISTNAME= buildbot-worker-${MODPY_EGG_VERSION}
CATEGORIES=devel
Index: py-buildslave/distinfo
===
RCS file: /cvs/ports/devel/py-buildslave/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- py-buildslave/distinfo 24 Jan 2019 09:50:51 - 1.21
+++ py-buildslave/distinfo 10 Feb 2019 10:34:46 -
@@ -1,2 +1,2 @@
-SHA256 (buildbot-worker-1.8.0.tar.gz) =
g7FIzxZdsRJVmccvoYIvWehNOQ9wWkx0mdMyAm6s/LU=
-SIZE (buildbot-worker-1.8.0.tar.gz) = 107763
+SHA256 (buildbot-worker-2.0.1.tar.gz) =
gbg0N7u3lIJh5wLs6OS8HFkll3HUy1SjJfU74tgZpKg=
+SIZE (buildbot-worker-2.0.1.tar.gz) = 108575
Index: py-buildbot/Makefile.inc
===
RCS file: /cvs/ports/devel/py-buildbot/Makefile.inc,v
retrieving revision 1.13
diff -u -r1.13 Makefile.inc
--- py-buildbot/Makefile.inc24 Jan 2019 09:50:51 - 1.13
+++ py-buildbot/Makefile.inc10 Feb 2019 10:34:46 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.13 2019/01/24 09:50:51 landry Exp $
-MODPY_EGG_VERSION ?= 1.8.0
+MODPY_EGG_VERSION ?= 2.0.1
DISTNAME ?=buildbot-${PART}-${MODPY_EGG_VERSION}
PKGNAME ?= py-${DISTNAME:S/post/pl/}
Index: py-buildbot/buildbot/distinfo
===
RCS file: /cvs/ports/devel/py-buildbot/buildbot/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- py-buildbot/buildbot/distinfo 24 Jan 2019 09:50:51 - 1.13
+++ py-buildbot/buildbot/distinfo 10 Feb 2019 10:34:46 -
@@ -1,2 +1,2 @@
-SHA256 (buildbot-1.8.0.tar.gz) = CuDNMF6vPgwGVeG9KqxYolhxjaNMDRr8J9Rl3VWoEuw=
-SIZE (buildbot-1.8.0.tar.gz) = 3149048
+SHA256 (buildbot-2.0.1.tar.gz) = IkS1YkasBbOGdZUzAX6MgReQ9QcaDBj/TFNBJSKXzMg=
+SIZE (buildbot-2.0.1.tar.gz) = 3105557
Index: py-buildbot/buildbot/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildbot/buildbot/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- py-buildbot/buildbot/pkg/PLIST 24 Jan 2019 09:50:51 - 1.8
+++ py-buildbot/buildbot/pkg/PLIST 10 Feb 2019 10:34:47 -
@@ -27,7 +27,6 @@
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}buildbot_net_usage_data.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}buildrequest.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
@@ -39,19 +38,8 @@
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}revlinks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}scheduler.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/buildbot/${MODPY_PYCACHE}worker_transition.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/buildbot/buildbot.png
lib/python${MODPY_VERSION}/site-packages/buildbot/buildbot_net_usage_data.py
lib/python${MODPY_VERSION}/site-packages/buildbot/buildrequest.py
-lib/python${MODPY_VERSION}/site-packages/buildbot/buildslave/
-lib/python${MODPY_VERSION}/site-packages/buildbot/buildslave/__init__.py
-lib/python${MODPY_VERSION}/site-packages/buildbot/buildslave/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/buildbot/buildslave/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/buildbot/buildslave/${MODPY_PYCACHE}ec2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/buildbot/buildslave/${MODPY_PYCACHE}libvirt.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bui
[UPDATE] audio/openal 1.19.1
Hi!
Full changelog can be found here:
https://github.com/kcat/openal-soft/blob/master/ChangeLog
The most notable one is this release brings sndio input support,
thanks to work done by Alexandre Ratchov.
I raise minor number because my checks show that only new functions
were added.
So far the dependent programs I use keep working.
Index: Makefile
===
RCS file: /cvs/ports/audio/openal/Makefile,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 Makefile
--- Makefile9 Aug 2018 20:50:47 - 1.51
+++ Makefile10 Feb 2019 08:51:28 -
@@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s
COMMENT = cross-platform 3D audio API
-V =1.17.2
+V =1.19.1
EPOCH =0
DISTNAME = openal-soft-$V
PKGNAME = openal-$V
CATEGORIES = audio
-SHARED_LIBS = openal 3.0
-REVISION = 1
+SHARED_LIBS = openal 3.1
HOMEPAGE = http://kcat.strangesoft.net/openal.html
@@ -19,7 +18,7 @@ MAINTAINER = David Carlier
Index: distinfo
===
RCS file: /cvs/ports/audio/openal/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo15 Nov 2017 13:02:42 - 1.10
+++ distinfo10 Feb 2019 08:51:28 -
@@ -1,2 +1,2 @@
-SHA256 (openal-soft-1.17.2.tar.bz2) =
o0H4VC8fC4xlJBoX2hPQc/GOwGZY4aFgao7Mi7wrMxQ=
-SIZE (openal-soft-1.17.2.tar.bz2) = 486934
+SHA256 (openal-soft-1.19.1.tar.bz2) =
XC+H/1GIuV4NxHaXGanYnOQ1uDIrRHi5XdS0J/6Esuk=
+SIZE (openal-soft-1.19.1.tar.bz2) = 577310
Index: patches/patch-Alc_ALc_c
===
RCS file: patches/patch-Alc_ALc_c
diff -N patches/patch-Alc_ALc_c
--- patches/patch-Alc_ALc_c 31 Dec 2017 18:46:26 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-$OpenBSD: patch-Alc_ALc_c,v 1.1 2017/12/31 18:46:26 jca Exp $
-
-commit d1e98c36d375433cb11a7a74ce20c968491773aa
-Author: Chris Robinson
-Date: Sat Apr 30 17:14:55 2016 -0700
-
-Don't crash when there's no backend to probe
-
-Index: Alc/ALc.c
Alc/ALc.c.orig
-+++ Alc/ALc.c
-@@ -1117,6 +1117,11 @@ static void alc_initconfig(void)
- V0(factory,init)();
- }
-
-+if(!PlaybackBackend.name)
-+WARN("No playback backend available!\n");
-+if(!CaptureBackend.name)
-+WARN("No capture backend available!\n");
-+
- if(ConfigValueStr(NULL, NULL, "excludefx", &str))
- {
- size_t len;
-@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct Backe
- LockLists();
- al_string_clear(list);
-
--if(!backendinfo->getFactory)
-+if(backendinfo->Probe)
- backendinfo->Probe(type);
--else
-+else if(backendinfo->getFactory)
- {
- ALCbackendFactory *factory = backendinfo->getFactory();
- V(factory,probe)(type);
Index: patches/patch-Alc_alcConfig_c
===
RCS file: patches/patch-Alc_alcConfig_c
diff -N patches/patch-Alc_alcConfig_c
--- patches/patch-Alc_alcConfig_c 15 Nov 2017 13:02:42 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Alc_alcConfig_c,v 1.4 2017/11/15 13:02:42 sthen Exp $
-Index: Alc/alcConfig.c
Alc/alcConfig.c.orig
-+++ Alc/alcConfig.c
-@@ -353,7 +353,7 @@ void ReadALConfig(void)
- const char *str;
- FILE *f;
-
--str = "/etc/openal/alsoft.conf";
-+str = "${SYSCONFDIR}/openal/alsoft.conf";
-
- TRACE("Loading config %s...\n", str);
- f = al_fopen(str, "r");
Index: patches/patch-Alc_alconfig_c
===
RCS file: patches/patch-Alc_alconfig_c
diff -N patches/patch-Alc_alconfig_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Alc_alconfig_c10 Feb 2019 08:51:28 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Alc/alconfig.c
+--- Alc/alconfig.c.orig
Alc/alconfig.c
+@@ -428,7 +428,7 @@ void ReadALConfig(void)
+ const char *str;
+ FILE *f;
+
+-str = "/etc/openal/alsoft.conf";
++str = "${SYSCONFDIR}/openal/alsoft.conf";
+
+ TRACE("Loading config %s...\n", str);
+ f = al_fopen(str, "r");
Index: patches/patch-Alc_backends_sndio_c
===
RCS file: patches/patch-Alc_backends_sndio_c
diff -N patches/patch-Alc_backends_sndio_c
--- patches/patch-Alc_backends_sndio_c 9 Aug 2018 20:50:47 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,404 +0,0 @@
-$OpenBSD: patch-Alc_backends_sndio_c,v 1.1 2018/08/09 20:50:47 ratchov Exp $
-
-Index: Alc/backends/sndio.c
Alc/backends/sndio.c.orig
-+++ Alc/backends/sndio.c
-@@ -42,16 +42,18 @@ static ALCboolean sndio_load(void)
-
- typedef struct {
- struct sio_hdl *sndHandle;
-+int mode, started;
-
- ALvoid *mix_data;
- ALsizei data_size;
-
-+ll_ringbuffer_t *rin
Re: x11/freerdp: update to 2.0.0-rc4
On Sat, Feb 09, 2019 at 04:48:07PM +0100, Denis Fondras wrote: > Can anyone give it a try ? The patch to overcome timerfd_create() is a bit > naive. > > My usage (connecting to Windows 10, Windows 2012 & Windows 2016 with > drive redirection) did not show any problem. > xfreerdp /v:windowscomputer /u:denis /clipboard > /drive:openbsd,/home/denis/documents Well if it works that's good, but yeah i doubt replacing timerfd_create() by kqueue() will work when those codepaths are reached... have you checked that was the case ? If so that's great.
UPDATE: x11/st
Hi,
update x11/st to 0.8.2.
- patches/patch-st_1 and patches/patch-st_c are now upstream
- patches/patch-config_mk is simpler as upstream has now an OpenBSD
section which just needs to be uncommented
- patches/patch-config_def_h is also shorter as iso14755 is gone
upstream as well
Works fine for me on amd64.
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/st/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile2 Nov 2018 07:32:13 - 1.18
+++ Makefile10 Feb 2019 08:05:48 -
@@ -2,9 +2,8 @@
COMMENT= simple X terminal
-V= 0.8.1
+V= 0.8.2
DISTNAME= st-${V}
-REVISION= 0
CATEGORIES=x11
Index: distinfo
===
RCS file: /cvs/ports/x11/st/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo29 Mar 2018 21:09:09 - 1.11
+++ distinfo10 Feb 2019 08:05:48 -
@@ -1,2 +1,2 @@
-SHA256 (st-0.8.1.tar.gz) = xPsP4rjS071ecnY+gKiuBbfUTbrI+OO7GO8BYccmaSY=
-SIZE (st-0.8.1.tar.gz) = 45423
+SHA256 (st-0.8.2.tar.gz) = rrdOEKoR7TZOG8xjWoGlIxGQk+Y779LyMfiwcFsVvzU=
+SIZE (st-0.8.2.tar.gz) = 44788
Index: patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/st/patches/patch-config_def_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_def_h
--- patches/patch-config_def_h 2 Nov 2018 07:32:13 - 1.10
+++ patches/patch-config_def_h 10 Feb 2019 08:05:48 -
@@ -11,11 +11,3 @@ Index: config.def.h
/* 8 bright colors */
"gray50",
-@@ -177,7 +177,6 @@ static Shortcut shortcuts[] = {
- { TERMMOD, XK_V, clippaste, {.i = 0} },
- { TERMMOD, XK_Y, selpaste, {.i = 0} },
- { TERMMOD, XK_Num_Lock,numlock,{.i = 0} },
-- { TERMMOD, XK_I, iso14755, {.i = 0} },
- };
-
- /*
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/st/patches/patch-config_mk,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_mk
--- patches/patch-config_mk 17 Mar 2018 13:28:39 - 1.10
+++ patches/patch-config_mk 10 Feb 2019 08:05:48 -
@@ -2,27 +2,18 @@ $OpenBSD: patch-config_mk,v 1.10 2018/03
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -11,17 +11,14 @@ X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
+@@ -26,10 +26,10 @@ STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
+ STLDFLAGS = $(LIBS) $(LDFLAGS)
- # includes and libs
--INCS = -I$(X11INC) \
-- `pkg-config --cflags fontconfig` \
-- `pkg-config --cflags freetype2`
--LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-- `pkg-config --libs fontconfig` \
-- `pkg-config --libs freetype2`
-+INCS != pkg-config --cflags fontconfig
-+LIBS = -lm -lX11 -lutil -lXft
-+LIBS +!= pkg-config --libs fontconfig
-
- # flags
--CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
--STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
--STLDFLAGS = $(LIBS) $(LDFLAGS)
-+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-+STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS} ${CFLAGS}
-+STLDFLAGS += ${LIBS} ${LDFLAGS}
+ # OpenBSD:
+-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
+-# `pkg-config --libs fontconfig` \
+-# `pkg-config --libs freetype2`
++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
++LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
++ `pkg-config --libs fontconfig` \
++ `pkg-config --libs freetype2`
# compiler and linker
# CC = c99
Index: patches/patch-st_1
===
RCS file: patches/patch-st_1
diff -N patches/patch-st_1
--- patches/patch-st_1 2 Nov 2018 07:32:13 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-st_1,v 1.1 2018/11/02 07:32:13 mestre Exp $
-
-Index: st.1
st.1.orig
-+++ st.1
-@@ -159,10 +159,6 @@ Copy the selected text to the clipboard selection.
- .TP
- .B Ctrl-Shift-v
- Paste from the clipboard selection.
--.TP
--.B Ctrl-Shift-i
--Launch dmenu to enter a unicode codepoint and send the corresponding glyph
--to st.
- .SH CUSTOMIZATION
- .B st
- can be customized by creating a custom config.h and (re)compiling the source
Index: patches/patch-st_c
===
RCS file: patches/patch-st_c
diff -N patches/patch-st_c
--- patches/patch-st_c 29 Mar 2018 21:09:09 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-st_c,v 1.6 2018/03/29 21:09:09 kn Exp $
-Index: st.c
st.c.orig
-+++ st.c
-@@ -805,9 +805,13 @@
