From 9aee951f754c319b092662b6d80ba4ad31b9c653 Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Sun, 2 Dec 2001 13:09:47 +0000 Subject: * Replace pkg-message about setting BABEL_DIR with a wrapper script that does. * Remove misleading full path name from usage message. * Improve fgets() usage. * Add converters category. * Improve pkg-comment and pkg-descr. --- biology/babel/Makefile | 12 ++++++++---- biology/babel/files/babel.sh | 6 ++++++ biology/babel/files/patch-ab | 23 ++++++++++++----------- biology/babel/files/patch-convert.c | 22 ++++++++++++++++++++++ biology/babel/pkg-comment | 2 +- biology/babel/pkg-descr | 8 ++++---- biology/babel/pkg-message | 6 ------ biology/babel/pkg-plist | 2 ++ 8 files changed, 55 insertions(+), 26 deletions(-) create mode 100644 biology/babel/files/babel.sh create mode 100644 biology/babel/files/patch-convert.c delete mode 100644 biology/babel/pkg-message (limited to 'biology/babel') diff --git a/biology/babel/Makefile b/biology/babel/Makefile index 14721030a0b2..2a3aff791659 100644 --- a/biology/babel/Makefile +++ b/biology/babel/Makefile @@ -7,8 +7,8 @@ PORTNAME= babel PORTVERSION= 1.6 -PORTREVISION= 1 -CATEGORIES= biology +PORTREVISION= 2 +CATEGORIES= biology converters MASTER_SITES= http://smog.com/chem/babel/files/ \ http://www.ccl.net/cca/software/UNIX/babel/ \ ftp://ccl.osc.edu/pub/chemistry/software/UNIX/babel/ @@ -18,14 +18,18 @@ MAINTAINER= ports@FreeBSD.org MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" +post-build: + ${SED} -e 's%@PREFIX@%${PREFIX}%g' \ + ${FILESDIR}/babel.sh >${WRKSRC}/babel.sh + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/babel ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/babel ${PREFIX}/libexec + ${INSTALL_SCRIPT} ${WRKSRC}/babel.sh ${PREFIX}/bin/babel @${MKDIR} ${PREFIX}/share/babel ${INSTALL_DATA} ${WRKSRC}/*.lis ${PREFIX}/share/babel .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/babel ${INSTALL_DATA} ${WRKSRC}/README.1ST ${PREFIX}/share/doc/babel .endif - @${SED} -e 's:/usr/local:${PREFIX}:' ${PKGMESSAGE} .include diff --git a/biology/babel/files/babel.sh b/biology/babel/files/babel.sh new file mode 100644 index 000000000000..6a97d7de27a9 --- /dev/null +++ b/biology/babel/files/babel.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# $FreeBSD$ + +export BABEL_DIR=${BABEL_DIR-@PREFIX@/share/babel} + +exec @PREFIX@/libexec/babel "$@" diff --git a/biology/babel/files/patch-ab b/biology/babel/files/patch-ab index a8017dc3e65b..5859fc00e8d3 100644 --- a/biology/babel/files/patch-ab +++ b/biology/babel/files/patch-ab @@ -1,14 +1,17 @@ ---- menus.c.orig Tue Jan 21 23:52:36 1997 -+++ menus.c Mon Dec 22 14:29:37 1997 + +$FreeBSD$ + +--- menus.c.orig Tue Jan 21 16:52:36 1997 ++++ menus.c Sun Nov 18 16:43:32 2001 @@ -63,9 +63,9 @@ } } printf("Input file name : "); - gets(InfileName); -+ fgets(InfileName, BUFF_SIZE - 1, stdin); ++ fgets(InfileName, BUFF_SIZE, stdin); printf("Keywords : "); - gets(InputKeywords); -+ fgets(InputKeywords, BUFF_SIZE - 1, stdin); ++ fgets(InputKeywords, BUFF_SIZE, stdin); if (strlen(InputKeywords) < 1) strcpy(InputKeywords,"KEYWORDS GO HERE"); @@ -17,23 +20,21 @@ } printf("Output file name : "); - gets(OutfileName); -+ fgets(OutfileName, BUFF_SIZE - 1, stdin); ++ fgets(OutfileName, BUFF_SIZE, stdin); if (has_keywords) { printf("Keywords : "); - gets(OutputKeywords); -+ fgets(OutputKeywords, BUFF_SIZE - 1, stdin); ++ fgets(OutputKeywords, BUFF_SIZE, stdin); if (strlen(OutputKeywords) < 1) strcpy(OutputKeywords,"KEYWORDS GO HERE"); } -@@ -167,8 +167,8 @@ +@@ -167,7 +167,7 @@ while (done == FALSE) { printf("Choice : "); - gets(choice_string); -- for (i = 0; i < (int) strlen(choice_string); i++) -+ fgets(choice_string, 99, stdin); -+ for (i = 0; i < ((int) strlen(choice_string) - 1) ; i++) ++ fgets(choice_string, sizeof(choice_string), stdin); + for (i = 0; i < (int) strlen(choice_string); i++) { if (!isdigit(choice_string[i])) - choice = 0; diff --git a/biology/babel/files/patch-convert.c b/biology/babel/files/patch-convert.c new file mode 100644 index 000000000000..229da421096a --- /dev/null +++ b/biology/babel/files/patch-convert.c @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- convert.c.orig Sun Nov 18 16:44:25 2001 ++++ convert.c Sun Nov 18 16:44:54 2001 +@@ -28,6 +28,7 @@ + static warning wstr; + + static char *program_name; ++extern char *__progname; + int use_title = FALSE; + + #ifdef MSDOS +@@ -47,7 +48,7 @@ + #endif + + babel_init(); +- program_name = argv[0]; ++ program_name = __progname; + if (argc == 1) + { + usage(); diff --git a/biology/babel/pkg-comment b/biology/babel/pkg-comment index dd38a9e37d53..d7ba1d08497a 100644 --- a/biology/babel/pkg-comment +++ b/biology/babel/pkg-comment @@ -1 +1 @@ -Conversion program among various molecular file formats +Converts among various molecular file formats diff --git a/biology/babel/pkg-descr b/biology/babel/pkg-descr index 6b386d087d03..ced96ca3a9b1 100644 --- a/biology/babel/pkg-descr +++ b/biology/babel/pkg-descr @@ -1,6 +1,6 @@ -Babel is a conversion program which is able to convert among dozens of -molecular file formats. -Babel is developed by Dolata Group, Department of Chemistry, -Arizona University and Ohio State University. +Babel is a program designed to interconvert a number of file formats +currently used in molecular modeling. Babel is capable of assigning +hybridization, bond order, and connectivity when these elements are +not present in the input file. WWW: http://smog.com/chem/babel/ diff --git a/biology/babel/pkg-message b/biology/babel/pkg-message deleted file mode 100644 index 0c167a8eecb5..000000000000 --- a/biology/babel/pkg-message +++ /dev/null @@ -1,6 +0,0 @@ -********************************************************* -* Please set the env variable BABEL_DIR to * -* /usr/local/share/babel before running babel. * -* For example, put the next line in your .cshrc file: * -* setenv BABEL_DIR /usr/local/share/babel * -********************************************************* diff --git a/biology/babel/pkg-plist b/biology/babel/pkg-plist index e5c0db25421d..e781099ee265 100644 --- a/biology/babel/pkg-plist +++ b/biology/babel/pkg-plist @@ -1,4 +1,6 @@ +@comment $FreeBSD$ bin/babel +libexec/babel share/babel/element.lis share/babel/new.lis share/babel/quanta.lis -- cgit v1.2.3