diff --git a/sc-im/Makefile b/sc-im/Makefile index 5dc44cfedd..68f136e89e 100644 --- a/sc-im/Makefile +++ b/sc-im/Makefile @@ -26,11 +26,9 @@ MAKE_FLAGS+= name=sc-im MAKE_FLAGS+= prefix=${PREFIX} MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 -# replace hardcoded -ldl with whatever dlopen.buildlink3.mk gives us -BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} - .include "options.mk" .include "../../devel/ncursesw/buildlink3.mk" +DL_AUTO_VARS= yes .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sc-im/distinfo b/sc-im/distinfo index 78e05cfa93..3238c5d18c 100644 --- a/sc-im/distinfo +++ b/sc-im/distinfo @@ -4,4 +4,4 @@ SHA1 (sc-im-0.7.0.tar.gz) = 1e8e2ad2f9042c304f57fefb320bb18e76edd398 RMD160 (sc-im-0.7.0.tar.gz) = 6b13e1dfd46b57dd84d4458fb8bdb509b07d1f1e SHA512 (sc-im-0.7.0.tar.gz) = 47bc02d4b698c30a3144733216cfdf57daafb4115e5d49774104c4fedbd22f1ab7e491e1fc16683273c8c5e8820f6caf2389223c4789b9e3f777d57528b76f1b Size (sc-im-0.7.0.tar.gz) = 1109887 bytes -SHA1 (patch-src_Makefile) = 07219cb8116066dbe3f4cb219640c1c5302831b1 +SHA1 (patch-src_Makefile) = fcc669cfee8e275c758c94056b97f0fde7814133 diff --git a/sc-im/patches/patch-src_Makefile b/sc-im/patches/patch-src_Makefile index 19e2d5dbea..93139f3b22 100644 --- a/sc-im/patches/patch-src_Makefile +++ b/sc-im/patches/patch-src_Makefile @@ -1,9 +1,24 @@ -Upstream PR: -https://github.com/andmarti1424/sc-im/pull/305 +$NetBSD$ ---- src/Makefile.orig +- Avoid forcing to pass `-ldl', this is handled via DL_AUTO_VARS +- Adjust file permissions + Upstream PR: https://github.com/andmarti1424/sc-im/pull/305 + +--- src/Makefile.orig 2017-12-13 17:48:59.000000000 +0000 +++ src/Makefile -@@ -141,8 +141,8 @@ install : +@@ -87,11 +87,6 @@ ifneq (, $(shell which gnuplot)) + CFLAGS += -DGNUPLOT + endif + +-# dynamic linking (should not be used in FreeBSD +-ifneq ($(shell uname -s),FreeBSD) +- LDLIBS += -ldl +-endif +- + ifneq (, $(shell which pkg-config)) + # Any system with pkg-config + +@@ -141,8 +136,8 @@ install : install -d $(DESTDIR)$(prefix)/bin install $(name) $(DESTDIR)$(prefix)/bin/$(name) install -d $(DESTDIR)$(HELPDIR)