Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Jan 2002 21:36:22 -0800 (PST)
From:      Ted Faber <faber@lunabase.org>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        faber@lunabase.org
Subject:   ports/33675: grap port update
Message-ID:  <200201080536.g085aMr82241@praxis.lunabase.org>

next in thread | raw e-mail | index | archive | help

>Number:         33675
>Category:       ports
>Synopsis:       grap port update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 07 21:40:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Ted Faber
>Release:        FreeBSD 4.5-PRERELEASE i386
>Organization:
None
>Environment:
System: FreeBSD praxis.lunabase.org 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #10: Thu Dec 27 11:52:13 PST 2001 root@praxis.lunabase.org:/usr/obj/usr/src/sys/PRAXIS i386


>Description:
	Both a new release of grap and a restructuring of the port to improve
	PORTDOCS conformance.  The current patched Makefile will probably do
	strange things if NOPORTDOCS is given because it treats grap.defines as
	a documentation file rather than as part of the default installation.
	I missed that on the last update.  This change fixes that (I think) and
	references the latest grap version (1.22).

	N.B. files/patch-Makefile.in should be removed (the diff should
	properly reflect that, but I mention it to be sure).

	Thanks!

>How-To-Repeat:
	N/A
>Fix:
	Patch follows

diff -ruN grap.bak/Makefile grap/Makefile
--- grap.bak/Makefile	Mon Jan  7 20:57:04 2002
+++ grap/Makefile	Mon Jan  7 21:27:15 2002
@@ -6,14 +6,22 @@
 #
 
 PORTNAME=	grap
-PORTVERSION=	1.21
+PORTVERSION=	1.22
 CATEGORIES=	textproc graphics
 MASTER_SITES=	http://www.lunabase.org/~faber/Vault/software/grap/
 
 MAINTAINER=	faber@lunabase.org
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=--with-freebsd-ports
 
 MAN1=		grap.1
+
+post-install:
+.if !defined(NOPORTDOCS)
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION} && make install-docs
+.endif
+
+
 
 .include <bsd.port.mk>
diff -ruN grap.bak/distinfo grap/distinfo
--- grap.bak/distinfo	Mon Jan  7 20:57:04 2002
+++ grap/distinfo	Mon Jan  7 21:20:10 2002
@@ -1 +1 @@
-MD5 (grap-1.21.tar.gz) = 249fc47d2b4e2a6522e626cf99705c71
+MD5 (grap-1.22.tar.gz) = c23b83b471db88f9d5d3bbe2a436cc98
diff -ruN grap.bak/files/patch-Makefile.in grap/files/patch-Makefile.in
--- grap.bak/files/patch-Makefile.in	Mon Jan  7 20:57:04 2002
+++ grap/files/patch-Makefile.in	Wed Dec 31 16:00:00 1969
@@ -1,38 +0,0 @@
---- Makefile.in.orig	Tue Oct 30 03:58:17 2001
-+++ Makefile.in	Tue Oct 30 04:00:22 2001
-@@ -5,7 +5,7 @@
- exec_prefix = @exec_prefix@
- 
- BINDIR = @bindir@
--DEFINESDIR = @datadir@/grap
-+DEFINESDIR = @datadir@
- MANDIR = @mandir@/man1
- 
- PROGS=grap
-@@ -85,7 +85,7 @@
- 	groff -mdoc grap.1 > grap.ps
- 
- grap.1:	grap.doc
--	sed "s#DEFINES_FILE#${DEFINESDIR}/grap.defines#g; s#EXAMPLES#${DEFINESDIR}/examples#g;" < grap.doc > grap.1 ;
-+	sed "s#DEFINES_FILE#${DEFINESDIR}/grap.defines#g; s#EXAMPLES#${DEFINESDIR}/examples/grap#g;" < grap.doc > grap.1 ;
- 
- # The || true lines allow make to continue on systems where install -d
- # fails on existing directories.
-@@ -93,11 +93,14 @@
- 	strip grap || true
- 	${INSTALL} -d ${BINDIR} || true
- 	${INSTALL} -d ${MANDIR} || true
--	${INSTALL} -d ${DEFINESDIR}/examples || true
-+	${INSTALL} -d ${DEFINESDIR}/examples/grap || true
- 	${INSTALL_PROGRAM} grap ${BINDIR}
- 	${INSTALL_DATA} grap.1 ${MANDIR}
--	${INSTALL_DATA} grap*.defines README CHANGES COPYRIGHT grap.man ${DEFINESDIR}
--	${INSTALL_DATA} examples/*.d examples/example.ms examples/*.result examples/Makefile ${DEFINESDIR}/examples
-+.if !defined(NOPORTDOCS)
-+	${INSTALL} -d ${DEFINESDIR}/doc/grap
-+	${INSTALL_DATA} grap*.defines README CHANGES COPYRIGHT grap.man ${DEFINESDIR}/doc/grap
-+.endif
-+	${INSTALL_DATA} examples/*.d examples/example.ms examples/*.result examples/Makefile ${DEFINESDIR}/examples/grap
- 
- deinstall:
- 	${RM} ${BINDIR}/grap
diff -ruN grap.bak/pkg-plist grap/pkg-plist
--- grap.bak/pkg-plist	Mon Jan  7 20:57:04 2002
+++ grap/pkg-plist	Mon Jan  7 21:09:07 2002
@@ -2,9 +2,9 @@
 %%PORTDOCS%%share/doc/grap/README
 %%PORTDOCS%%share/doc/grap/CHANGES
 %%PORTDOCS%%share/doc/grap/COPYRIGHT
-%%PORTDOCS%%share/doc/grap/grap.defines
-%%PORTDOCS%%share/doc/grap/grap.tex.defines
 %%PORTDOCS%%share/doc/grap/grap.man
+share/grap/grap.defines
+share/grap/grap.tex.defines
 share/examples/grap/400mpairs.d
 share/examples/grap/400mtimes.d
 share/examples/grap/400wpairs.d
@@ -23,4 +23,5 @@
 share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Local.Random1500.succ.result
 share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Hybrid.Random1500.succ.result
 @dirrm share/examples/grap
+@dirrm share/grap
 %%PORTDOCS%%@dirrm share/doc/grap
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201080536.g085aMr82241>