Date: Thu, 28 Aug 2003 18:37:12 +0200 (CEST) From: Simon Barner <barner@in.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56089: Unbreak port textproc/latte Message-ID: <20030828163712.54222381BB@zi025.glhnet.mhn.de> Resent-Message-ID: <200308281640.h7SGeLFa068763@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56089
>Category: ports
>Synopsis: Unbreak port textproc/latte
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 28 09:40:21 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Simon Barner
>Release: FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 4.8-STABLE FreeBSD 4.8-STABLE #0: Thu Aug 7 04:04:01 CEST 2003 toor@zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386
>Description:
The port is marked broken since it installs an emacs mode file into '/'.
This patch fixes this misbehaviour (the file is only installed if emacs
is installed in the system - the pkg-plist respects these two cases,
too)
>How-To-Repeat:
>Fix:
Apply the following patch to the port, and add the patch file
files/patch-Makefile.in:
--- Makefile.orig Thu Aug 28 18:32:42 2003
+++ Makefile Thu Aug 28 18:35:07 2003
@@ -2,7 +2,7 @@
# Date created: 15 August 1999
# Whom: Dominik Rothert <dr@domix.de>
#
-# $FreeBSD: /repoman/r/pcvs/ports/textproc/latte/Makefile,v 1.10 2003/08/08 04:40:45 kris Exp $
+# $FreeBSD: ports/textproc/latte/Makefile,v 1.10 2003/08/08 04:40:45 kris Exp $
#
PORTNAME= latte
@@ -14,15 +14,21 @@
MAINTAINER= nc-rotherdo@netcologne.de
COMMENT= Simple language for marking up text in a very expressive way
-BROKEN= "Installs latte.el in /"
-
USE_LIBTOOL= yes
MAKE_FLAGS= CONF_ARGS="--prefix=${PREFIX}"
CONFIGURE_ARGS+= --enable-shared
+.include <bsd.port.pre.mk>
+
+.if exists (${LOCALBASE}/bin/emacs)
+PLIST_SUB+= EMACS=""
+.else
+PLIST_SUB+= EMACS="@comment "
+.endif
+
post-install:
strip ${PREFIX}/bin/latte-html
${LN} -sf ${PREFIX}/bin/latte-html ${PREFIX}/bin/latte
${CP} -Rp ${WRKSRC}/tests ${PREFIX}/share/latte/
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- pkg-plist.orig Thu Aug 28 17:53:25 2003
+++ pkg-plist Thu Aug 28 17:57:33 2003
@@ -107,6 +107,7 @@
share/latte/tests/varref.latte
share/latte/tests/while.exp
share/latte/tests/while.latte
+%%EMACS%%share/emacs/site-lisp/latte.el
@dirrm include/latte
@dirrm share/latte/tests
@dirrm share/latte
New patch files/patch-Makefile.in
--- Makefile.in.orig Wed Nov 11 07:58:13 1998
+++ Makefile.in Thu Aug 28 17:12:59 2003
@@ -345,7 +345,8 @@
install-lispLISP: $(lisp_LISP) $(ELCFILES)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(lispdir)
+ if test $(EMACS) != no; then \
+ $(mkinstalldirs) $(DESTDIR)$(lispdir); \
@list='$(lisp_LISP)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
@@ -354,7 +355,7 @@
echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
$(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
else : ; fi; \
- done
+ done; fi;
uninstall-lispLISP:
@$(NORMAL_UNINSTALL)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030828163712.54222381BB>