pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xsb: buildink to a symbolic link won't work, swapped the roles main directory and link under config



Module Name:	pkgsrc-wip
Committed By:	Mayuresh <mayuresh%acm.org@localhost>
Pushed By:	mayuresh
Date:		Fri Sep 19 07:05:04 2025 +0530
Changeset:	521f4f6a2ae0ab23fe0957f25c5a4d2a0c0897a1

Modified Files:
	xsb/Makefile
	xsb/PLIST
	xsb/buildlink3.mk

Log Message:
xsb: buildink to a symbolic link won't work, swapped the roles main directory and link under config

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=521f4f6a2ae0ab23fe0957f25c5a4d2a0c0897a1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xsb/Makefile      |  3 ++-
 xsb/PLIST         | 26 +++++++++++++-------------
 xsb/buildlink3.mk |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diffs:
diff --git a/xsb/Makefile b/xsb/Makefile
index 2a19b0c695..de78a6cb43 100644
--- a/xsb/Makefile
+++ b/xsb/Makefile
@@ -49,10 +49,11 @@ REMOVE_P+=		${XSB_PREFIXDIR}/lib/prolog_db_doc/prolog_db_format.P
 REMOVE_P+=		${XSB_PREFIXDIR}/syslib/debugger_data.P
 PLIST_SUBST+=	XSB_CONFIG_NAME=${XSB_CONFIG_NAME}
 
+# Buildlinks do not get created for symbolic links and need to be static names
 do-install:
 	cd ${WRKSRC} && DESTDIR=${DESTDIR} ./makexsb install && \
 	${RM} -rf ${XSB_PKGDIR} ${REMOVE_P} && \
-	cd ${XSB_PREFIXDIR}/config && ${LN} -sf ${XSB_CONFIG_NAME} local
+	cd ${XSB_PREFIXDIR}/config && ${MV} ${XSB_CONFIG_NAME} local && ${LN} -sf local ${XSB_CONFIG_NAME}
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xsb/PLIST b/xsb/PLIST
index 66283e5e04..03388dd38d 100644
--- a/xsb/PLIST
+++ b/xsb/PLIST
@@ -43,18 +43,18 @@ ${PKGNAME}.0/cmplib/tprog.xwam
 ${PKGNAME}.0/cmplib/useinfer.xwam
 ${PKGNAME}.0/cmplib/varproc.xwam
 ${PKGNAME}.0/cmplib/writeasm.xwam
-${PKGNAME}.0/config/local
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/banner.msg
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/bin/gpp
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/bin/libxsb.so
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/bin/xsb
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/lib/xsb_configuration.xwam
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/lib/xsb_re_match.so
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/lib/xsb_re_match.xwam
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/lib/xsb_wildmatch.so
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/lib/xsb_wildmatch.xwam
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/xsb_config.h
-${PKGNAME}.0/config/${XSB_CONFIG_NAME}/xsb_debug.h
+${PKGNAME}.0/config/local/banner.msg
+${PKGNAME}.0/config/local/bin/gpp
+${PKGNAME}.0/config/local/bin/libxsb.so
+${PKGNAME}.0/config/local/bin/xsb
+${PKGNAME}.0/config/local/lib/xsb_configuration.xwam
+${PKGNAME}.0/config/local/lib/xsb_re_match.so
+${PKGNAME}.0/config/local/lib/xsb_re_match.xwam
+${PKGNAME}.0/config/local/lib/xsb_wildmatch.so
+${PKGNAME}.0/config/local/lib/xsb_wildmatch.xwam
+${PKGNAME}.0/config/local/xsb_config.h
+${PKGNAME}.0/config/local/xsb_debug.h
+${PKGNAME}.0/config/${XSB_CONFIG_NAME}
 ${PKGNAME}.0/emu/auxlry.h
 ${PKGNAME}.0/emu/basicdefs.h
 ${PKGNAME}.0/emu/basictypes.h
@@ -668,4 +668,4 @@ ${PKGNAME}.0/syslib/xsb_hook.xwam
 ${PKGNAME}.0/syslib/xsb_read.xwam
 ${PKGNAME}.0/syslib/xsb_writ.xwam
 ${PKGNAME}.0/syslib/xsbbrat.xwam
-@pkgdir ${PKGNAME}.0/config/${XSB_CONFIG_NAME}/saved.o
+@pkgdir ${PKGNAME}.0/config/local/saved.o
diff --git a/xsb/buildlink3.mk b/xsb/buildlink3.mk
index dfcbd3b383..d39c748f0a 100644
--- a/xsb/buildlink3.mk
+++ b/xsb/buildlink3.mk
@@ -8,7 +8,7 @@ XSB_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.xsb+=	xsb>=5.0
 BUILDLINK_PKGSRCDIR.xsb?=	../../wip/xsb
 
-XSBDIR=			${BUILDLINK_PREFIX.xsb}/xsb-5.0.0
+XSBDIR=			xsb-5.0.0
 XSBARCHDIR=		${XSBDIR}/config/local
 XSBLIBDIR=		${XSBARCHDIR}/bin
 


Home | Main Index | Thread Index | Old Index