Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Sep 2000 08:13:41 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/21609: Update port: biology/povchem
Message-ID:  <20000928151341.7A0F337B423@hub.freebsd.org>

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

>Number:         21609
>Category:       ports
>Synopsis:       Update port: biology/povchem
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 28 08:20:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Support CC/LOCALBASE/X11BASE/PREFIX properly

Remove file:
patches/patch-aa

No response from maintainer.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/biology/povchem/Makefile biology/povchem/Makefile
--- /usr/ports/biology/povchem/Makefile	Sun Apr  9 15:43:09 2000
+++ biology/povchem/Makefile	Wed Sep 20 22:52:05 2000
@@ -7,29 +7,37 @@
 
 PORTNAME=	povchem
 PORTVERSION=	1.0
-CATEGORIES=     biology graphics
-MASTER_SITES=   http://cherubino.med.jhmi.edu/~paul/PC_Dist/v1.00/
+CATEGORIES=	biology graphics
+MASTER_SITES=	http://www.chemicalgraphics.com/paul/PC_Dist/v1.00/
 DISTFILES=	povchem.c \
 		povchem.cfg \
 		periodic.tab
 
-MAINTAINER=     frankch@waru.life.nthu.edu.tw
+MAINTAINER=	frankch@waru.life.nthu.edu.tw
 
 NO_WRKSUBDIR=	yes
 DIST_SUBDIR=	povchem
 
-pre-extract:
-	@${MKDIR} ${WRKSRC}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/povchem.c ${WRKSRC}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/povchem.cfg ${WRKSRC}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/periodic.tab ${WRKSRC}
+DEFS=		-DDATADIR=\"${PREFIX}/share/povchem\" \
+		-DSYSCONFDIR=\"${PREFIX}/etc\"
 
 do-extract:
-	@${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
+	@${MKDIR} ${WRKSRC}
+.for file in ${DISTFILES}
+	@${CP} ${_DISTDIR}/${file} ${WRKSRC}
+.endfor
+
+post-patch:
+	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/povchem.cfg
+	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/povchem.cfg
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEFS} -o povchem povchem.c -lm
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/povchem ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/povchem.cfg ${PREFIX}/etc
-	@${INSTALL_DATA} ${WRKSRC}/periodic.tab ${PREFIX}/share
+	${INSTALL_PROGRAM} ${WRKSRC}/povchem ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/povchem.cfg ${PREFIX}/etc
+	@${MKDIR} ${PREFIX}/share/povchem
+	${INSTALL_DATA} ${WRKSRC}/periodic.tab ${PREFIX}/share/povchem
 
 .include <bsd.port.mk>
diff -urN /usr/ports/biology/povchem/patches/patch-aa biology/povchem/patches/patch-aa
--- /usr/ports/biology/povchem/patches/patch-aa	Mon Mar 16 15:57:12 1998
+++ biology/povchem/patches/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,9 +0,0 @@
---- Makefile.orig	Sat Mar 14 17:25:10 1998
-+++ Makefile	Sat Mar 14 17:26:22 1998
-@@ -0,0 +1,6 @@
-+PROG = povchem
-+SRCS = povchem.c
-+
-+all:
-+	cc ${CFLAGS} -o ${PROG} ${SRCS} -lm
-+
diff -urN /usr/ports/biology/povchem/patches/patch-ab biology/povchem/patches/patch-ab
--- /usr/ports/biology/povchem/patches/patch-ab	Mon Mar 16 15:57:12 1998
+++ biology/povchem/patches/patch-ab	Tue Aug  8 02:46:06 2000
@@ -5,7 +5,7 @@
    
    if (*fileName==NULL) {
 -    New_String(fileName,"povchem.cfg");
-+    New_String(fileName,"/usr/local/etc/povchem.cfg");
++    New_String(fileName,SYSCONFDIR "/povchem.cfg");
      if ((config=fopen(*fileName,"r"))==NULL) {
        puts("Can't read the configuration file \"povchem.cfg\"!");
        perror("Reason");
@@ -14,7 +14,7 @@
  no_config:
  
 -  if (!PERIODIC_TABLE_FILE) New_String(&PERIODIC_TABLE_FILE,"periodic.tab");
-+  if (!PERIODIC_TABLE_FILE) New_String(&PERIODIC_TABLE_FILE,"/usr/local/share/periodic.tab");
++  if (!PERIODIC_TABLE_FILE) New_String(&PERIODIC_TABLE_FILE,DATADIR "/periodic.tab");
    if (!FINISH) New_String(&FINISH,"Plastic");
    if (!FINISH_DECLARATION) New_String(&FINISH_DECLARATION,"\
    finish {\n\
diff -urN /usr/ports/biology/povchem/patches/patch-ac biology/povchem/patches/patch-ac
--- /usr/ports/biology/povchem/patches/patch-ac	Mon Mar 16 15:57:13 1998
+++ biology/povchem/patches/patch-ac	Tue Aug  8 03:16:30 2000
@@ -1,11 +1,20 @@
---- povchem.cfg.orig	Sun Mar 15 14:14:16 1998
-+++ povchem.cfg	Sun Mar 15 14:15:13 1998
+--- povchem.cfg.orig	Tue Aug  8 03:13:31 2000
++++ povchem.cfg	Tue Aug  8 03:16:16 2000
+@@ -294,7 +294,7 @@
+ # or leave blank the "POVRay" line, and the next five options will be ignored.
+ #
+ #POVRay =        d:\graphics\povray\povray.exe
+-POVRay =        /usr/local/bin/povray
++POVRay =        %%LOCALBASE%%/bin/povray
+ POVWidth =      640
+ POVOptions =    +V -D +Q9 +A +FT +B32
+ RunPOVRay =     No
 @@ -331,7 +331,7 @@
  # the type of image POV-Ray generates - usually TGA (also called TARGA).
  #
  #Viewer = c:\util\dvpeg.exe
 -Viewer = /usr/local/bin/xv
-+Viewer = /usr/X11R6/bin/xv
++Viewer = %%X11BASE%%/bin/xv
  
  # If ColorSplit is Proportional, 'Power' determines the power of the vdW radii
  # to which the point of color change is proportional. See the manual for
diff -urN /usr/ports/biology/povchem/pkg/PLIST biology/povchem/pkg/PLIST
--- /usr/ports/biology/povchem/pkg/PLIST	Mon Mar 16 15:57:14 1998
+++ biology/povchem/pkg/PLIST	Tue Aug  8 03:15:15 2000
@@ -1,3 +1,4 @@
 bin/povchem
 etc/povchem.cfg
-share/periodic.tab
+share/povchem/periodic.tab
+@dirrm share/povchem


>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?20000928151341.7A0F337B423>