Bug 107043 - [Patch] math/gnuplot doen't respect the existence of emacs
Summary: [Patch] math/gnuplot doen't respect the existence of emacs
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Greg Lewis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-12-21 21:30 UTC by Koji Yokota
Modified: 2007-01-09 07:20 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Koji Yokota 2006-12-21 21:30:17 UTC
	- math/gnuplot/Makefile fails to find emacs or xemacs
	  ( .include <bsd.port.per.mk> is in a wrong place)
	- the path for elisps is wrong

Fix: 

-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs) || exists(/usr/local/bin/emacs)
+.include <bsd.port.pre.mk>
+
+.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
 USE_EMACS=     yes
 EMACS_PORT_NAME=       emacs21
 EMACS_NO_BUILD_DEPENDS=        yes
@@ -41,8 +43,6 @@
 CONFIGURE_ARGS+=       --without-lisp-files
 .endif

-.include <bsd.port.pre.mk>
-
 .if !defined(WITHOUT_READLINE)
 .if ${OSVERSION} < 500018
 LIB_DEPENDS+=          readline.5:${PORTSDIR}/devel/readline
@@ -106,7 +106,7 @@
 post-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
 .if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
-       ${INSTALL_DATA} ${WRKSRC}/lisp/gnuplot*.el ${EMACS_SITE_LISPDIR}
+       ${INSTALL_DATA} ${WRKSRC}/lisp/gnuplot*.el ${PREFIX}${EMACS_SITE_LISPDIR}
 .endif
 .if !defined(NOPORTDOCS)
        @${MKDIR} ${EXAMPLESDIR}--qMg83emKMXNiqvDkwFQWk34gcLyAxsXiMHdwWN1UUrWkTwJC
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- Makefile.orig       Thu Dec 21 18:47:22 2006
+++ Makefile    Thu Dec 21 19:01:28 2006
@@ -30,7 +30,9 @@
 MAN1=          gnuplot.1 lasergnu.1
 INFO=          gnuplot
How-To-Repeat: 	Everytime
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-12-21 21:30:33 UTC
Responsible Changed
From-To: freebsd-ports-bugs->glewis

Over to maintainer
Comment 2 dfilter service freebsd_committer freebsd_triage 2007-01-09 07:19:40 UTC
glewis      2007-01-09 07:19:34 UTC

  FreeBSD ports repository

  Modified files:
    math/gnuplot         Makefile 
  Log:
  . Fix the location of the bsd.port.pre.mk include.
  . Install the elisp files in the correct location.
  
  PR:             107043
  Submitted by:   Koji Yokota <yokota@res.otaru-uc.ac.jp>
  
  Revision  Changes    Path
  1.65      +3 -3      ports/math/gnuplot/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 3 Greg Lewis freebsd_committer freebsd_triage 2007-01-09 07:19:53 UTC
State Changed
From-To: open->closed

Committed. Thanks!