Date: Tue, 2 Sep 2003 00:10:19 -0700 (PDT) From: Foxfair Hu <foxfair@drago.fomokka.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/55711: [patch] unbreak www/gn and make it respect CC Message-ID: <200309020710.h827AJei078168@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/55711; it has been noted by GNATS.
From: Foxfair Hu <foxfair@drago.fomokka.net>
To: FreeBSD-gnats-submit@FreeBSD.org, Simon Barner <barner@in.tum.de>
Cc:
Subject: Re: ports/55711: [patch] unbreak www/gn and make it respect CC
Date: Tue, 2 Sep 2003 15:09:31 +0800
--BwCQnh7xodEAoBMC
Content-Type: multipart/mixed; boundary="LQksG6bCIzRHxTLp"
Content-Disposition: inline
--LQksG6bCIzRHxTLp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hello,
www/gn still has some problem though. It should consider PORTDOCS before
install docs/, and all binaries weren't installed in my box. I am not sure
if this is only a local problem here. Anyway here is a in-progressing
patch for reviewing (plus your patches in this PR).
foxfair
--LQksG6bCIzRHxTLp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch.gn2"
Content-Transfer-Encoding: quoted-printable
--- /usr/ports/www/gn/Makefile Mon Aug 25 17:34:26 2003
+++ ./Makefile Tue Sep 2 14:58:06 2003
@@ -7,6 +7,7 @@
=20
PORTNAME=3D gn
PORTVERSION=3D 2.24
+PORTREVISION=3D 1
CATEGORIES=3D www
MASTER_SITES=3D ${MASTER_SITE_LOCAL} #ftp://ftp.acns.nwu.edu/pub/gn/
MASTER_SITE_SUBDIR=3D trevor
@@ -14,17 +15,19 @@
MAINTAINER=3D ports@FreeBSD.org
COMMENT=3D Gopher and http server
=20
-BROKEN=3D "Does not compile"
-
BUILD_DEPENDS=3D ${WAISDIR}/bin/waisindex:${PORTSDIR}/net/wais
=20
IS_INTERACTIVE=3D yes
NO_PACKAGE=3D "Compiled-in hostnames"
-WAISDIR=3D ${PORTSDIR}/net/wais/work/freeWAIS-0.5
+WAISDIR=3D ${WRKDIRPREFIX}${PORTSDIR}/net/wais/work/freeWAIS-0.5
+GNROOT=3D ${PREFIX}/gnroot
+PLIST_SUB+=3D GNROOT=3D${GNROOT}
=20
INETD_CONF=3D /etc/inetd.conf
CONF=3D ' stream tcp nowait nobody ${PREFIX}/libexec/gn gn'
=20
+.include <bsd.port.pre.mk>
+
pre-build:
@${LN} -fs ${WAISDIR}/include ${WRKSRC}/waisgn/ir
@${LN} -fs ${WAISDIR}/bin ${WRKSRC}/waisgn
@@ -34,6 +37,14 @@
@cd ${WRKSRC}/gnroot; \
tar -cf - -C ${WRKSRC} docs | tar xpf - && \
${MV} docs/sample.root.menu menu
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/gn/gn ${PREFIX}/libexec
+ ${INSTALL_PROGRAM} ${WRKSRC}/gn/sgn ${PREFIX}/libexec
+ ${INSTALL_PROGRAM} ${WRKSRC}/mkcache/mkcache ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/waisgn/waisgn ${PREFIX}/libexec
+ if [ ! -f ${PREFIX}/etc/gn_mime.types ]; then \
+ ${INSTALL_DATA} ${WRKSRC}/mkcache/gn_mime.types ${PREFIX}/etc; \
+ fi
=20
post-install:
@cd ${PREFIX}; \
@@ -48,10 +59,10 @@
${MV} gnroot/menu gnroot/menu.old; \
fi; \
tar -cf - -C ${WRKSRC} gnroot libexec bin etc | tar xpf - && \
- (cd gnroot; ${WRKSRC}/bin/mkcache -r); \
+ (cd gnroot; ${WRKSRC}/mkcache/mkcache -r); \
${AWK} '$$1 ~ /#*gopher/ && $$6 =3D=3D "${PREFIX}/libexec/gn" { exit 1 =
}' \
${INETD_CONF} || { \
${ECHO_CMD} '#'gopher${CONF} >>${INETD_CONF}; \
}
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- /usr/ports/www/gn/pkg-plist Sat Sep 21 05:38:20 2002
+++ ./pkg-plist Tue Sep 2 14:46:04 2003
@@ -1,9 +1,46 @@
-@cwd /usr/local
etc/gn_mime.types
libexec/gn
libexec/sgn
libexec/waisgn
bin/mkcache
-gnroot
-@cwd ./gnroot
-@exec ../bin/mkcache -r
+@cwd %%GNROOT%%
+@exec mkcache -r
+.cache
+menu
+%%PORTDOCS%%docs/.cache
+%%PORTDOCS%%docs/CHANGES
+%%PORTDOCS%%docs/Gnu_License
+%%PORTDOCS%%docs/Install
+%%PORTDOCS%%docs/Install..cache
+%%PORTDOCS%%docs/Install.html
+%%PORTDOCS%%docs/click.html
+%%PORTDOCS%%docs/gn.8
+%%PORTDOCS%%docs/gn.formatted
+%%PORTDOCS%%docs/logformat
+%%PORTDOCS%%docs/menu
+%%PORTDOCS%%docs/mkcache.1
+%%PORTDOCS%%docs/mkcache.formatted
+%%PORTDOCS%%docs/security
+%%PORTDOCS%%docs/security.html
+%%PORTDOCS%%docs/structure
+%%PORTDOCS%%docs/technical.notes
+%%PORTDOCS%%docs/waisgn.guide
+%%PORTDOCS%%docs/waisgn.guide.html
+%%PORTDOCS%%docs/examples/.cache
+%%PORTDOCS%%docs/examples/HOW_TO_USE
+%%PORTDOCS%%docs/examples/doform.cgi
+%%PORTDOCS%%docs/examples/escher.map
+%%PORTDOCS%%docs/examples/form
+%%PORTDOCS%%docs/examples/form.html
+%%PORTDOCS%%docs/examples/imagemap.conf
+%%PORTDOCS%%docs/examples/ismap.html
+%%PORTDOCS%%docs/examples/menu
+%%PORTDOCS%%docs/examples/msg.txt
+%%PORTDOCS%%docs/examples/sample.script
+%%PORTDOCS%%docs/images/.cache
+%%PORTDOCS%%docs/images/escherknot.gif
+%%PORTDOCS%%docs/images/menu
+%%PORTDOCS%%@dirrm docs/examples
+%%PORTDOCS%%@dirrm docs/images
+%%PORTDOCS%%@dirrm docs
+%%PORTDOCS%%@unexec rmdir %%GNROOT%% 2> /dev/null || true
--LQksG6bCIzRHxTLp--
--BwCQnh7xodEAoBMC
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQE/VEIr1VNL1U6bylkRAodGAKDGXPmacPKRKwrGauv+lnVCgj6VUwCguBeA
wnDuSMf5VlmZqlRlqgRjkNI=
=YBMX
-----END PGP SIGNATURE-----
--BwCQnh7xodEAoBMC--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309020710.h827AJei078168>