Skip to content

Commit

Permalink
devel/pmdk: Update version 1.6.1=>1.13.1
Browse files Browse the repository at this point in the history
- Unbreaks with llvm15
- Pet portclippy
- Adopt port
- Mark DEPRECATED as support for FreeBSD is deprecated since 1.13.0 and
  will dropped on 1.14.0
- Set EXPIRATION_DATE to 2023-12-31

Changelog: https://github.com/pmem/pmdk/releases/tag/1.13.1
  • Loading branch information
5u623l20 committed Jun 8, 2023
1 parent 8e36d95 commit 581e63a
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 80 deletions.
19 changes: 16 additions & 3 deletions devel/pmdk/Makefile
@@ -1,8 +1,8 @@
PORTNAME= pmdk
DISTVERSION= 1.6.1
DISTVERSION= 1.13.1
CATEGORIES= devel

MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= Libraries and tools to manage and access persistent memory devices
WWW= https://pmem.io

Expand All @@ -11,16 +11,29 @@ WWW= https://pmem.io
LICENSE= BSD3CLAUSE BSD2CLAUSE BSD4CLAUSE
LICENSE_COMB= multi

DEPRECATED= FreeBSD has been deprecated since 1.13.X and support will be dropped from 1.14 onwards
EXPIRATION_DATE= 2023-12-31
ONLY_FOR_ARCHS= aarch64 amd64

BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid

USES= autoreconf:build gmake pkgconfig
USES= autoreconf:build gmake ncurses:port pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= pmem
USE_LDCONFIG= yes

OPTIONS_DEFINE= DOCS

DOCS_BUILD_DEPENDS= pandoc:textproc/hs-pandoc
DOCS_MAKE_ARGS_OFF= DOC=n

.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-FreeBSD_14
.endif

post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/pmreorder
${RM} ${STAGEDIR}${PREFIX}/man/man1/pmreorder.1.gz
Expand Down
6 changes: 3 additions & 3 deletions devel/pmdk/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1567183026
SHA256 (pmem-pmdk-1.6.1_GH0.tar.gz) = f263c8301f86ddf8bc5e020909ac52350baedba5c169a1a3a7786df64f129446
SIZE (pmem-pmdk-1.6.1_GH0.tar.gz) = 2499478
TIMESTAMP = 1686239280
SHA256 (pmem-pmdk-1.13.1_GH0.tar.gz) = 960a3d7ad83ff267e832586c34a88ced7915059a064a77e5984fcd4d4a235c6e
SIZE (pmem-pmdk-1.13.1_GH0.tar.gz) = 2172336
23 changes: 23 additions & 0 deletions devel/pmdk/files/extra-patch-FreeBSD_14
@@ -0,0 +1,23 @@
--- src/core/os_posix.c.orig 2023-06-08 22:36:04 UTC
+++ src/core/os_posix.c
@@ -317,20 +317,6 @@ os_setenv(const char *name, const char *value, int ove
}

/*
- * secure_getenv -- provide GNU secure_getenv for FreeBSD
- */
-#if defined(__FreeBSD__)
-static char *
-secure_getenv(const char *name)
-{
- if (issetugid() != 0)
- return NULL;
-
- return getenv(name);
-}
-#endif
-
-/*
* os_getenv -- getenv abstraction layer
*/
char *
20 changes: 0 additions & 20 deletions devel/pmdk/files/patch-src_Makefile

This file was deleted.

4 changes: 2 additions & 2 deletions devel/pmdk/files/patch-src_Makefile.inc
@@ -1,6 +1,6 @@
--- src/Makefile.inc.orig 2019-08-27 15:43:26 UTC
--- src/Makefile.inc.orig 2023-05-31 11:28:01 UTC
+++ src/Makefile.inc
@@ -300,7 +300,7 @@ install: all
@@ -268,7 +268,7 @@ install: all
ifneq ($(LIBRARY_NAME),)
$(INSTALL) -d $(LIBS_DESTDIR)
$(INSTALL) -p -m 0755 $(TARGET_LIBS) $(LIBS_DESTDIR)
Expand Down
8 changes: 4 additions & 4 deletions devel/pmdk/files/patch-src_common.inc
@@ -1,7 +1,7 @@
--- src/common.inc.orig 2019-08-27 15:43:26 UTC
--- src/common.inc.orig 2023-05-31 11:28:01 UTC
+++ src/common.inc
@@ -193,9 +193,9 @@ else
export WSTRINGOP_TRUNCATION_AVAILABLE
@@ -179,9 +179,9 @@ else
export OG_AVAILABLE
endif

-install_recursive = $(shell cd $(1) && find . -type f -exec install -m $(2) -D {} $(3)/{} \;)
Expand All @@ -12,7 +12,7 @@

define create-deps
@cp $(objdir)/$*.d $(objdir)/.deps/$*.P; \
@@ -216,7 +216,7 @@ export prefix = /usr/local
@@ -202,7 +202,7 @@ export prefix = /usr/local
export exec_prefix := $(prefix)
export sysconfdir := $(prefix)/etc
export datarootdir := $(prefix)/share
Expand Down
18 changes: 0 additions & 18 deletions devel/pmdk/files/patch-src_jemalloc_configure.ac

This file was deleted.

116 changes: 86 additions & 30 deletions devel/pmdk/pkg-plist
@@ -1,6 +1,9 @@
bin/pmempool
etc/bash_completion.d/pmempool
include/libpmem.h
include/libpmem2.h
include/libpmem2/async.h
include/libpmem2/base.h
include/libpmemblk.h
include/libpmemlog.h
include/libpmemobj.h
Expand All @@ -21,12 +24,14 @@ include/libpmemobj/tx.h
include/libpmemobj/tx_base.h
include/libpmemobj/types.h
include/libpmempool.h
include/libvmem.h
include/libvmmalloc.h
lib/libpmem.a
lib/libpmem.so
lib/libpmem.so.1
lib/libpmem.so.1.0.0
lib/libpmem2.a
lib/libpmem2.so
lib/libpmem2.so.1
lib/libpmem2.so.1.0.0
lib/libpmemblk.a
lib/libpmemblk.so
lib/libpmemblk.so.1
Expand All @@ -43,21 +48,12 @@ lib/libpmempool.a
lib/libpmempool.so
lib/libpmempool.so.1
lib/libpmempool.so.1.0.0
lib/libvmem.a
lib/libvmem.so
lib/libvmem.so.1
lib/libvmem.so.1.0.0
lib/libvmmalloc.a
lib/libvmmalloc.so
lib/libvmmalloc.so.1
lib/libvmmalloc.so.1.0.0
libdata/pkgconfig/libpmem.pc
libdata/pkgconfig/libpmem2.pc
libdata/pkgconfig/libpmemblk.pc
libdata/pkgconfig/libpmemlog.pc
libdata/pkgconfig/libpmemobj.pc
libdata/pkgconfig/libpmempool.pc
libdata/pkgconfig/libvmem.pc
libdata/pkgconfig/libvmmalloc.pc
man/man1/pmempool-check.1.gz
man/man1/pmempool-convert.1.gz
man/man1/pmempool-create.1.gz
Expand All @@ -75,6 +71,62 @@ man/man3/direct_rw.3.gz
man/man3/oid_equals.3.gz
man/man3/oid_instanceof.3.gz
man/man3/oid_is_null.3.gz
man/man3/pmem2_async.3.gz
man/man3/pmem2_badblock_clear.3.gz
man/man3/pmem2_badblock_context_delete.3.gz
man/man3/pmem2_badblock_context_new.3.gz
man/man3/pmem2_badblock_next.3.gz
man/man3/pmem2_config_delete.3.gz
man/man3/pmem2_config_new.3.gz
man/man3/pmem2_config_set_length.3.gz
man/man3/pmem2_config_set_offset.3.gz
man/man3/pmem2_config_set_protection.3.gz
man/man3/pmem2_config_set_required_store_granularity.3.gz
man/man3/pmem2_config_set_sharing.3.gz
man/man3/pmem2_config_set_vdm.3.gz
man/man3/pmem2_config_set_vm_reservation.3.gz
man/man3/pmem2_deep_flush.3.gz
man/man3/pmem2_errormsg.3.gz
man/man3/pmem2_get_drain_fn.3.gz
man/man3/pmem2_get_flush_fn.3.gz
man/man3/pmem2_get_memcpy_fn.3.gz
man/man3/pmem2_get_memmove_fn.3.gz
man/man3/pmem2_get_memset_fn.3.gz
man/man3/pmem2_get_persist_fn.3.gz
man/man3/pmem2_map_delete.3.gz
man/man3/pmem2_map_from_existing.3.gz
man/man3/pmem2_map_get_address.3.gz
man/man3/pmem2_map_get_size.3.gz
man/man3/pmem2_map_get_store_granularity.3.gz
man/man3/pmem2_map_new.3.gz
man/man3/pmem2_memcpy_async.3.gz
man/man3/pmem2_memmove_async.3.gz
man/man3/pmem2_memset_async.3.gz
man/man3/pmem2_perror.3.gz
man/man3/pmem2_source_alignment.3.gz
man/man3/pmem2_source_delete.3.gz
man/man3/pmem2_source_device_id.3.gz
man/man3/pmem2_source_device_usc.3.gz
man/man3/pmem2_source_from_anon.3.gz
man/man3/pmem2_source_from_fd.3.gz
man/man3/pmem2_source_from_handle.3.gz
man/man3/pmem2_source_get_fd.3.gz
man/man3/pmem2_source_get_handle.3.gz
man/man3/pmem2_source_numa_node.3.gz
man/man3/pmem2_source_pread_mcsafe.3.gz
man/man3/pmem2_source_pwrite_mcsafe.3.gz
man/man3/pmem2_source_size.3.gz
man/man3/pmem2_vm_reservation_delete.3.gz
man/man3/pmem2_vm_reservation_extend.3.gz
man/man3/pmem2_vm_reservation_get_address.3.gz
man/man3/pmem2_vm_reservation_get_size.3.gz
man/man3/pmem2_vm_reservation_map_find.3.gz
man/man3/pmem2_vm_reservation_map_find_first.3.gz
man/man3/pmem2_vm_reservation_map_find_last.3.gz
man/man3/pmem2_vm_reservation_map_find_next.3.gz
man/man3/pmem2_vm_reservation_map_find_prev.3.gz
man/man3/pmem2_vm_reservation_new.3.gz
man/man3/pmem2_vm_reservation_shrink.3.gz
man/man3/pmem_check_version.3.gz
man/man3/pmem_deep_drain.3.gz
man/man3/pmem_deep_flush.3.gz
Expand Down Expand Up @@ -147,6 +199,7 @@ man/man3/pmemobj_ctl_exec.3.gz
man/man3/pmemobj_ctl_get.3.gz
man/man3/pmemobj_ctl_set.3.gz
man/man3/pmemobj_defer_free.3.gz
man/man3/pmemobj_defrag.3.gz
man/man3/pmemobj_direct.3.gz
man/man3/pmemobj_drain.3.gz
man/man3/pmemobj_errormsg.3.gz
Expand All @@ -160,6 +213,7 @@ man/man3/pmemobj_f_relaxed.3.gz
man/man3/pmemobj_first.3.gz
man/man3/pmemobj_flush.3.gz
man/man3/pmemobj_free.3.gz
man/man3/pmemobj_get_user_data.3.gz
man/man3/pmemobj_list_insert.3.gz
man/man3/pmemobj_list_insert_new.3.gz
man/man3/pmemobj_list_move.3.gz
Expand Down Expand Up @@ -195,6 +249,7 @@ man/man3/pmemobj_rwlock_unlock.3.gz
man/man3/pmemobj_rwlock_wrlock.3.gz
man/man3/pmemobj_rwlock_zero.3.gz
man/man3/pmemobj_set_funcs.3.gz
man/man3/pmemobj_set_user_data.3.gz
man/man3/pmemobj_set_value.3.gz
man/man3/pmemobj_strdup.3.gz
man/man3/pmemobj_tx_abort.3.gz
Expand All @@ -206,16 +261,30 @@ man/man3/pmemobj_tx_commit.3.gz
man/man3/pmemobj_tx_end.3.gz
man/man3/pmemobj_tx_errno.3.gz
man/man3/pmemobj_tx_free.3.gz
man/man3/pmemobj_tx_get_failure_behavior.3.gz
man/man3/pmemobj_tx_get_user_data.3.gz
man/man3/pmemobj_tx_lock.3.gz
man/man3/pmemobj_tx_log_append_buffer.3.gz
man/man3/pmemobj_tx_log_auto_alloc.3.gz
man/man3/pmemobj_tx_log_intents_max_size.3.gz
man/man3/pmemobj_tx_log_snapshots_max_size.3.gz
man/man3/pmemobj_tx_process.3.gz
man/man3/pmemobj_tx_publish.3.gz
man/man3/pmemobj_tx_realloc.3.gz
man/man3/pmemobj_tx_set_failure_behavior.3.gz
man/man3/pmemobj_tx_set_user_data.3.gz
man/man3/pmemobj_tx_stage.3.gz
man/man3/pmemobj_tx_strdup.3.gz
man/man3/pmemobj_tx_wcsdup.3.gz
man/man3/pmemobj_tx_xadd_range.3.gz
man/man3/pmemobj_tx_xadd_range_direct.3.gz
man/man3/pmemobj_tx_xalloc.3.gz
man/man3/pmemobj_tx_xfree.3.gz
man/man3/pmemobj_tx_xlock.3.gz
man/man3/pmemobj_tx_xlog_append_buffer.3.gz
man/man3/pmemobj_tx_xpublish.3.gz
man/man3/pmemobj_tx_xstrdup.3.gz
man/man3/pmemobj_tx_xwcsdup.3.gz
man/man3/pmemobj_tx_zalloc.3.gz
man/man3/pmemobj_tx_zrealloc.3.gz
man/man3/pmemobj_type_num.3.gz
Expand Down Expand Up @@ -324,31 +393,18 @@ man/man3/tx_xadd_direct.3.gz
man/man3/tx_xadd_field.3.gz
man/man3/tx_xadd_field_direct.3.gz
man/man3/tx_xalloc.3.gz
man/man3/tx_xfree.3.gz
man/man3/tx_xstrdup.3.gz
man/man3/tx_xwcsdup.3.gz
man/man3/tx_zalloc.3.gz
man/man3/tx_znew.3.gz
man/man3/tx_zrealloc.3.gz
man/man3/vmem_aligned_alloc.3.gz
man/man3/vmem_calloc.3.gz
man/man3/vmem_check.3.gz
man/man3/vmem_check_version.3.gz
man/man3/vmem_create.3.gz
man/man3/vmem_create_in_region.3.gz
man/man3/vmem_delete.3.gz
man/man3/vmem_errormsg.3.gz
man/man3/vmem_free.3.gz
man/man3/vmem_malloc.3.gz
man/man3/vmem_malloc_usable_size.3.gz
man/man3/vmem_realloc.3.gz
man/man3/vmem_set_funcs.3.gz
man/man3/vmem_stats_print.3.gz
man/man3/vmem_strdup.3.gz
man/man3/vmem_wcsdup.3.gz
man/man5/pmem_ctl.5.gz
man/man5/poolset.5.gz
man/man7/libpmem.7.gz
man/man7/libpmem2.7.gz
man/man7/libpmem2_unsafe_shutdown.7.gz
man/man7/libpmemblk.7.gz
man/man7/libpmemlog.7.gz
man/man7/libpmemobj.7.gz
man/man7/libpmempool.7.gz
man/man7/libvmem.7.gz
man/man7/libvmmalloc.7.gz

0 comments on commit 581e63a

Please sign in to comment.