pkgsrc-WIP-changes archive

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

mit-krb5-32: Install package to ${PREFIX}/emul/netbsd32



Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Thu Jul 18 22:49:24 2019 +0200
Changeset:	2be953b6d170c444a5f5dd4c2a64657a6c4f9c0a

Modified Files:
	mit-krb5-32/Makefile
	mit-krb5-32/buildlink3.mk

Log Message:
mit-krb5-32: Install package to ${PREFIX}/emul/netbsd32

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

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

diffstat:
 mit-krb5-32/Makefile      | 27 ++++++++-------------------
 mit-krb5-32/buildlink3.mk |  2 +-
 2 files changed, 9 insertions(+), 20 deletions(-)

diffs:
diff --git a/mit-krb5-32/Makefile b/mit-krb5-32/Makefile
index aa4cf4ca94..48e67f4a2f 100644
--- a/mit-krb5-32/Makefile
+++ b/mit-krb5-32/Makefile
@@ -12,10 +12,7 @@ HOMEPAGE=	http://web.mit.edu/kerberos/
 COMMENT=	MIT Kerberos 5 authentication system
 
 MAKE_JOBS_SAFE=		no
-LIBABISUFFIX?=		/32
-CONFIGURE_ARGS+=        --libdir=${PREFIX}/lib${LIBABISUFFIX}
-#CONFIGURE_ARGS+=        --bindir=${PREFIX}/lib${LIBABISUFFIX}
-#CONFIGURE_ARGS+=        --includedir=${PREFIX}/lib${LIBABISUFFIX}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
 CFLAGS+=                -m32
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
@@ -64,7 +61,7 @@ INFO_FILES=		YES
 
 OWN_DIRS_PERMS=		${MIT_KRB5_STATEDIR}/krb5kdc			\
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
-#RCD_SCRIPTS=		kadmind kdc
+RCD_SCRIPTS=		kadmind kdc
 
 INSTALLATION_DIRS=	bin include/gssapi include/gssrpc ${PKGINFODIR}	\
 			${PKGMANDIR}/man1 ${PKGMANDIR}/man5		\
@@ -78,20 +75,12 @@ INSTALLATION_DIRS=	bin include/gssapi include/gssrpc ${PKGINFODIR}	\
 pre-configure:
 	cd ${WRKSRC} && autoconf -I ${WRKSRC} -f
 
-# pre-install:
-# 	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} \
-# 	-prune -o -type f -exec ${RM} {} +
-
-remove-non-libs:
-	echo "Removing non-compat lib package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -or -type f -exec ${RM} {} +
-
-post-install: remove-non-libs
-	# cd ${WRKDIR}/${DISTNAME}/doc;					\
-	# for f in *.info *.info-[0-9]*; do				\
-	# 	${TEST} ! -f "$$f" ||					\
-	# 	${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};	\
-	# done
+post-install:
+	cd ${WRKDIR}/${DISTNAME}/doc;					\
+	for f in *.info *.info-[0-9]*; do				\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};	\
+	done
 
 BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.1
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mit-krb5-32/buildlink3.mk b/mit-krb5-32/buildlink3.mk
index 82ac877f98..dca369c268 100644
--- a/mit-krb5-32/buildlink3.mk
+++ b/mit-krb5-32/buildlink3.mk
@@ -7,7 +7,7 @@ MIT_KRB5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.compat32_mit-krb5+=	compat32_mit-krb5>=1.4
 BUILDLINK_PKGSRCDIR.compat32_mit-krb5?=		../../wip/mit-krb5-32
-BUILDLINK_LIBDIRS.compat32_mit-krb5=		lib/32
+BUILDLINK_LIBDIRS.compat32_mit-krb5=		${PREFIX}/emul/netbsd32/lib
 .endif # MIT_KRB5_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-compat32_mit-krb5


Home | Main Index | Thread Index | Old Index