Date: Thu, 20 Dec 2001 14:16:07 -0500 From: The Anarcat <anarcat@anarcat.dyndns.org> To: Libh <freebsd-libh@freebsd.org> Cc: nra@freebsd.org Subject: update of the libh port Message-ID: <20011220191607.GI2956@shall.anarcat.dyndns.org>
next in thread | raw e-mail | index | archive | help
--r7U+bLA8boMOj+mD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi all..
I just worked a bit on the libh port (as in misc/libh) to put it a bit
more up to date.
The changes:
- removed a few distorted variables (DISTNAME, DIRNAME)
- bumped the CVS_DATE to just after the base Makefile commit. This will
make the port build only a single UITYPE (text+graphics) instead of
going through all fours just to install one (!!!)
- implemented a target to re-create files/distfiles
- changed the install target to fit the new compile/ scheme
I think this is necessary. The port was getting rather old, and a few
good things came to libh since then (the diskeditor updates, for
example).
Oh, and this bumps the libh port version to 0.2.1, but I think we should
have a more formal method of putting out libh version numbers. At first,
I bumped it to 0.3, but the change isn't that big...=20
Here is the diff.
--- Makefile.orig Thu Dec 20 13:37:30 2001
+++ Makefile Thu Dec 20 14:05:42 2001
@@ -6,11 +6,10 @@
#
=20
PORTNAME=3D libh
-PORTVERSION=3D 0.2
+PORTVERSION=3D 0.2.1
CATEGORIES=3D misc
# ${MASTER_SITES} is unavailable for CVS only projects.
# MASTER_SITES=3D ${MASTER_SITE_LOCAL}
-DISTNAME=3D libh
=20
MAINTAINER=3D nra@FreeBSD.org
=20
@@ -24,17 +23,21 @@
=20
.include <bsd.port.pre.mk>
=20
+# we could also use the makedistfiles method here
DISTFILES!=3D ${CAT} ${FILESDIR}/distfiles
=20
CVS_CMD?=3D cvs -z3
# arbitrary date for now.
-CVS_DATE=3D Wed June 19 14:00:00 GMT 2001
+CVS_DATE=3D Thu December 20 18:00:00 GMT 2001
CVS_DATE_!=3D ${ECHO} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g'
CVS_SITES?=3D :pserver:anonymous@usw4.freebsd.org:/home/libh/cvs
-DIRNAME=3D ${PORTNAME}-${PORTVERSION}
-STAMPFILE=3D ${DISTDIR}/${DIRNAME}/.stamp
+STAMPFILE=3D ${DISTDIR}/${DISTNAME}/.stamp
=20
-WRKSRC=3D ${WRKDIR}/libh-0.2
+WRKSRC=3D ${WRKDIR}/${PORTNAME}
+
+# until we find a way of including ${WRKSRC}/${PORTNAME}/Makefile.uitype
+# only after "extract"
+UITYPE=3D text+graphics
=20
.if defined(BATCH)
do-fetch: fetchsrctarball
@@ -43,9 +46,9 @@
@if [ ! -f ${STAMPFILE} ] || \
[ "X${CVS_DATE}" !=3D "X$$(${CAT} ${STAMPFILE})" ]; then \
${ECHO_MSG} "No stamp file (or out of date)"; \
- if [ -f ${DISTDIR}/${DIRNAME}.${CVS_DATE_}.tar.gz ]; then \
+ if [ -f ${DISTDIR}/${DISTNAME}.${CVS_DATE_}.tar.gz ]; then \
cd ${DISTDIR}; \
- ${TAR} xfz ${DIRNAME}.${CVS_DATE_}.tar.gz \
+ ${TAR} xfz ${DISTNAME}.${CVS_DATE_}.tar.gz \
${DISTFILES}; \
${ECHO} -n "${CVS_DATE}" > ${STAMPFILE}; \
exit; \
@@ -73,7 +76,7 @@
${ECHO_MSG} ">> *** Please hit enter here for the password."; \
${CVS_CMD} -d $${CVS_SITE} login < /dev/null; \
fi ; \
- if ${CVS_CMD} -d $${CVS_SITE} co -D '${CVS_DATE}' ${DISTNAME}; then \
+ if ${CVS_CMD} -d $${CVS_SITE} co -D '${CVS_DATE}' ${PORTNAME}; then \
if [ "X$${CVS_LOGIN}" =3D "Xyes" ]; then \
${CVS_CMD} -d $${CVS_SITE} logout < /dev/null; \
fi; \
@@ -85,7 +88,7 @@
${CVS_CMD} -d $${CVS_SITE} logout < /dev/null; \
fi; \
done; \
- ${ECHO_MSG} ">> Couldn't CVS checkout ${DISTNAME}." ;\
+ ${ECHO_MSG} ">> Couldn't CVS checkout ${PORTNAME}." ;\
exit 1; \
fi
.endif
@@ -93,12 +96,12 @@
makesrctarball: fetch
@cd ${DISTDIR}; \
${ECHO_MSG} ">> Creating source tarball in ${DISTDIR}"; \
- ${ECHO_MSG} ">> \"${DIRNAME}.${CVS_DATE_}.tar.gz\"."; \
- ${TAR} cfz ${DIRNAME}.${CVS_DATE_}.tar.gz ${DIRNAME}
+ ${ECHO_MSG} ">> \"${DISTNAME}.${CVS_DATE_}.tar.gz\"."; \
+ ${TAR} cfz ${DISTNAME}.${CVS_DATE_}.tar.gz ${DISTNAME}
=20
fetchsrctarball:
@cd ${DISTDIR}; \
- file=3D${DIRNAME}.${CVS_DATE_}.tar.gz; \
+ file=3D${DISTNAME}.${CVS_DATE_}.tar.gz; \
if [ -e $$file ]; then \
exit; \
fi; \
@@ -115,9 +118,13 @@
${ECHO_MSG} ">> ${_DISTDIR} and try again."; \
exit 1
=20
+makedistfiles: fetch
+ cd ${DISTDIR} && find ${DISTNAME} \! -type d | \
+ egrep -v CVS\|.stamp > ${FILESDIR}/distfiles
+
do-extract:
@${MKDIR} ${WRKDIR}
- @(cd ${DISTDIR}/${DIRNAME}/${DISTNAME} && \
+ @(cd ${DISTDIR}/${DISTNAME}/${PORTNAME} && \
find . ! -name CVS -print | \
cpio -pdmu ${WRKSRC} > /dev/null 2>&1)
=20
@@ -125,26 +132,26 @@
@cd ${WRKSRC}; ${MAKE} ${ALL_TARGET}
=20
do-install:
- ${INSTALL_DATA} ${WRKSRC}/lib/common/libh.a ${PREFIX}/lib/libh.a
- ${INSTALL_DATA} ${WRKSRC}/lib/common/libh.so.0 ${PREFIX}/lib/libh.so.0
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libh.a ${PREFIX}/lib/libh.a
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libh.so.0 ${PREFIX}/lib/libh.=
so.0
${LN} -sf ${PREFIX}/lib/libh.so.0 ${PREFIX}/lib/libh.so
- ${INSTALL_DATA} ${WRKSRC}/lib/hui/libhui.a ${PREFIX}/lib/libhui.a
- ${INSTALL_DATA} ${WRKSRC}/lib/hui/libhui.so.0 ${PREFIX}/lib/libhui.so.0
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libhui.a ${PREFIX}/lib/libhui=
.a
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libhui.so.0 ${PREFIX}/lib/lib=
hui.so.0
${LN} -sf ${PREFIX}/lib/libhui.so.0 ${PREFIX}/lib/libhui.so
.for H_NAME in disk file database sysinstall
- ${INSTALL_DATA} ${WRKSRC}/lib/${H_NAME}/libh${H_NAME}.a ${PREFIX}/lib/lib=
h${H_NAME}.a
- ${INSTALL_DATA} ${WRKSRC}/lib/${H_NAME}/libh${H_NAME}.so.0 ${PREFIX}/lib/=
libh${H_NAME}.so.0
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libh${H_NAME}.a ${PREFIX}/lib=
/libh${H_NAME}.a
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libh${H_NAME}.so.0 ${PREFIX}/=
lib/libh${H_NAME}.so.0
${LN} -sf ${PREFIX}/lib/libh${H_NAME}.so.0 ${PREFIX}/lib/libh${H_NAME}.so
.endfor
.for T_NAME in tclhui tcl tclfile tcldisk tclsysinstall
- ${INSTALL_DATA} ${WRKSRC}/lib/tcl/libh${T_NAME}.a ${PREFIX}/lib/libh${T_N=
AME}.a
- ${INSTALL_DATA} ${WRKSRC}/lib/tcl/libh${T_NAME}.so.0 ${PREFIX}/lib/libh${=
T_NAME}.so.0
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libh${T_NAME}.a ${PREFIX}/lib=
/libh${T_NAME}.a
+ ${INSTALL_DATA} ${WRKSRC}/compile/${UITYPE}/libh${T_NAME}.so.0 ${PREFIX}/=
lib/libh${T_NAME}.so.0
${LN} -sf ${PREFIX}/lib/libh${T_NAME}.so.0 ${PREFIX}/lib/libh${T_NAME}.so
.endfor
${MKDIR} ${PREFIX}/share/libh
.for TCL_FILES in bin/setup doc/examples lib/disk lib/sysinstall
${INSTALL_DATA} ${WRKSRC}/${TCL_FILES}/*.tcl ${PREFIX}/share/libh
.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/tclh/tclh.static ${PREFIX}/bin/tclh
+ ${INSTALL_PROGRAM} ${WRKSRC}/compile/${UITYPE}/tclh.static ${PREFIX}/bin/=
tclh
=20
.include <bsd.port.post.mk>
--r7U+bLA8boMOj+mD
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iEYEARECAAYFAjwiOPYACgkQttcWHAnWiGePSQCcDTzvMKWzp4at7jqSEltoUsqH
HSAAoI9T2KIMxnA/VWaZvwJeUFZ9PPDJ
=ygRE
-----END PGP SIGNATURE-----
--r7U+bLA8boMOj+mD--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-libh" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011220191607.GI2956>