Date: Sun, 03 Apr 2022 18:29:50 +0200 From: "rollniak" <rollniak@courrier.dev> To: <freebsd-ports@freebsd.org> Subject: make makepatch do nothing Message-ID: <CJ0QWZQ9T2G5.5R3ZSCRDMLHT@aramaki.int.rollniak.eu>
next in thread | raw e-mail | index | archive | help
Hello,
I'm continuing my work on porting senxmpp-rs on FreeBSD.
I need to create a patch because the path in sendxmpp-rs are hardcoded:
```
--- work/sendxmpp-rs-2.0.0/src/main.rs.ori 2022-04-03 18:10:37.848333000 +0=
200
+++ work/sendxmpp-rs-2.0.0/src/main.rs 2022-04-03 18:11:24.329068000 +0200
@@ -37,7 +37,7 @@
help: bool,
=20
#[options(
- help =3D "path to config file. default: ~/.config/sendxmpp.toml wi=
th fallback to /etc/sendxmpp/sendxmpp.toml"
+ help =3D "path to config file. default: ~/.config/sendxmpp.toml wi=
th fallback to /usr/local/etc/sendxmpp/sendxmpp.toml"
)]
config: Option<String>,
=20
@@ -91,7 +91,7 @@
.die("cannot find home directory")
.join("sendxmpp.toml"),
)
- .or_else(|_| parse_cfg("/etc/sendxmpp/sendxmpp.toml"))
+ .or_else(|_| parse_cfg("/usr/local/etc/sendxmpp/sendxmpp.toml"))
.die("valid config file not found"),
};
```
If I execute `make makefile`, nothing has been created in _files/_:
```
$ pwd
${PORTDIR}/net-im/sendxmpp-rs
$ make makepatch=20
$ ls files
Cargo.lock
```
I know I can manually create a patch but I want to understand why
**makepatch** doesn't work in a first place :).
Am I missing something ?
## Sources
- https://docs.freebsd.org/en/books/porters-handbook/slow-porting/#slow-pat=
ch
- https://forums.freebsd.org/threads/applying-a-patch-to-a-port.65399/#post=
-383659
=20
## My Makefile
```
PORTNAME=3D sendxmpp-rs
PORTVERSION=3D 2.0.0
DISTVERSIONPREFIX=3D v
CATEGORIES=3D net-im
LICENSE=3D AGPLv3
MAINTAINER=3D rollniak@courrier.dev
COMMENT=3D Send XMPP messages from the command line.
USES=3D cargo ssl
USE_GITHUB=3D yes
GH_ACCOUNT=3D moparisthebest
CONFLICTS=3D sendxmpp
#=20
CARGO_CARGOLOCK=3D ${MASTERDIR}/files/Cargo.lock
CARGO_CRATES=3D anyhow-1.0.38 \
arrayref-0.3.6 \
arrayvec-0.5.2 \
async-trait-0.1.42 \
autocfg-1.0.1 \
base64-0.13.0 \
bitflags-1.2.1 \
blake2-0.9.1 \
blake2b_simd-0.5.11 \
block-buffer-0.9.0 \
block-padding-0.2.1 \
bytes-1.0.1 \
cc-1.0.66 \
cfg-if-0.1.10 \
cfg-if-1.0.0 \
chrono-0.4.19 \
constant_time_eq-0.1.5 \
core-foundation-0.9.1 \
core-foundation-sys-0.8.2 \
cpuid-bool-0.1.2 \
crossbeam-utils-0.8.1 \
crypto-mac-0.8.0 \
crypto-mac-0.10.0 \
data-encoding-2.3.1 \
die-0.2.0 \
digest-0.9.0 \
dirs-3.0.1 \
dirs-sys-0.3.5 \
enum-as-inner-0.3.3 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
form_urlencoded-1.0.0 \
futf-0.1.4 \
futures-0.3.11 \
futures-channel-0.3.11 \
futures-core-0.3.11 \
futures-executor-0.3.11 \
futures-io-0.3.11 \
futures-macro-0.3.11 \
futures-sink-0.3.11 \
futures-task-0.3.11 \
futures-util-0.3.11 \
generic-array-0.14.4 \
getrandom-0.1.16 \
getrandom-0.2.1 \
gumdrop-0.8.0 \
gumdrop_derive-0.8.0 \
heck-0.3.2 \
hermit-abi-0.1.17 \
hmac-0.10.1 \
hostname-0.3.1 \
idna-0.2.0 \
instant-0.1.9 \
ipconfig-0.2.2 \
ipnet-2.3.0 \
itoa-0.4.7 \
jid-0.9.2 \
keccak-0.1.0 \
lazy_static-1.4.0 \
libc-0.2.82 \
linked-hash-map-0.5.4 \
lock_api-0.4.2 \
log-0.4.13 \
lru-cache-0.1.2 \
mac-0.1.1 \
markup5ever-0.10.0 \
match_cfg-0.1.0 \
matches-0.1.8 \
memchr-2.3.4 \
minidom-0.13.0 \
mio-0.7.7 \
miow-0.3.6 \
native-tls-0.2.7 \
new_debug_unreachable-1.0.4 \
ntapi-0.3.6 \
num-integer-0.1.44 \
num-traits-0.2.14 \
num_cpus-1.13.0 \
once_cell-1.5.2 \
opaque-debug-0.3.0 \
openssl-0.10.32 \
openssl-probe-0.1.2 \
openssl-sys-0.9.60 \
parking_lot-0.11.1 \
parking_lot_core-0.8.2 \
pbkdf2-0.6.0 \
percent-encoding-2.1.0 \
pest-2.1.3 \
phf-0.8.0 \
phf_codegen-0.8.0 \
phf_generator-0.8.0 \
phf_shared-0.8.0 \
pin-project-lite-0.2.4 \
pin-utils-0.1.0 \
pkg-config-0.3.19 \
ppv-lite86-0.2.10 \
precomputed-hash-0.1.1 \
proc-macro-hack-0.5.19 \
proc-macro-nested-0.1.7 \
proc-macro2-1.0.24 \
quick-error-1.2.3 \
quick-xml-0.20.0 \
quote-1.0.8 \
rand-0.7.3 \
rand-0.8.2 \
rand_chacha-0.2.2 \
rand_chacha-0.3.0 \
rand_core-0.5.1 \
rand_core-0.6.1 \
rand_hc-0.2.0 \
rand_hc-0.3.0 \
rand_pcg-0.2.1 \
redox_syscall-0.1.57 \
redox_syscall-0.2.4 \
redox_users-0.3.5 \
remove_dir_all-0.5.3 \
resolv-conf-0.7.0 \
rust-argon2-0.8.3 \
rustc_version-0.3.3 \
ryu-1.0.5 \
sasl-0.5.0 \
schannel-0.1.19 \
scopeguard-1.1.0 \
security-framework-2.0.0 \
security-framework-sys-2.0.0 \
semver-0.11.0 \
semver-parser-0.10.2 \
serde-1.0.119 \
serde_derive-1.0.119 \
serde_json-1.0.61 \
sha-1-0.9.2 \
sha2-0.9.2 \
sha3-0.9.1 \
siphasher-0.3.3 \
slab-0.4.2 \
smallvec-1.6.1 \
socket2-0.3.19 \
string_cache-0.8.1 \
string_cache_codegen-0.5.1 \
subtle-2.4.0 \
syn-1.0.58 \
tempfile-3.2.0 \
tendril-0.4.2 \
thiserror-1.0.23 \
thiserror-impl-1.0.23 \
time-0.1.43 \
tinyvec-1.1.0 \
tinyvec_macros-0.1.0 \
tokio-1.0.2 \
tokio-macros-1.0.0 \
tokio-native-tls-0.3.0 \
tokio-stream-0.1.2 \
tokio-util-0.6.1 \
tokio-xmpp-3.0.0 \
toml-0.5.8 \
trust-dns-proto-0.20.0 \
trust-dns-resolver-0.20.0 \
typenum-1.12.0 \
ucd-trie-0.1.3 \
unicode-bidi-0.3.4 \
unicode-normalization-0.1.16 \
unicode-segmentation-1.7.1 \
unicode-xid-0.2.1 \
url-2.2.0 \
utf-8-0.7.5 \
vcpkg-0.2.11 \
version_check-0.9.2 \
wasi-0.9.0+wasi-snapshot-preview1 \
wasi-0.10.1+wasi-snapshot-preview1 \
widestring-0.4.3 \
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
winreg-0.6.2 \
xml5ever-0.16.1 \
xmpp-parsers-0.18.1
PLIST_FILES=3D bin/sendxmpp
.include <bsd.port.mk>
```
Have a nice day :),
rollniak
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CJ0QWZQ9T2G5.5R3ZSCRDMLHT>