- Update MASTER_SITES and WWW: line

- Support CC/CFLAGS properly
- Support install macros
- Add PORTDOCS to pkg-plist

PR: 26228
Submitted by: Ports Fury

4 files changed, 21 insertions, 32 deletions

diff --git a/biology/babel/Makefile b/biology/babel/Makefile
index 52bdda2782aa..14721030a0b2 100644
--- a/biology/babel/Makefile
+++ b/biology/babel/Makefile
@@ -1,19 +1,31 @@
-# New ports collection Makefile for: babel
-# Date created:         Dec 4 1997
-# Whom:                 frankch@waru.life.nthu.edu.tw
+# New ports collection Makefile for:	babel
+# Date created:		Dec 4 1997
+# Whom:			frankch@waru.life.nthu.edu.tw
 #
 # $FreeBSD$
 #
 
 PORTNAME=	babel
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	biology
-MASTER_SITES=	ftp://ccl.osc.edu/pub/chemistry/software/MAC/babel/
+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/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-post-install:
-	@ ${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/local:${PREFIX}:'
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/babel ${PREFIX}/bin
+	@${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 <bsd.port.mk>
diff --git a/biology/babel/files/patch-aa b/biology/babel/files/patch-aa
deleted file mode 100644
index 0dcf3dff5482..000000000000
--- a/biology/babel/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Tue Jan 21 07:53:05 1997
-+++ Makefile	Fri Jun 25 12:17:39 1999
-@@ -1,6 +1,6 @@
--CFLAGS        = -O 
-+DEST          = ${PREFIX}/share/babel
- 
--LIBFLAGS      = -O -DLIBRARY 
-+LIBFLAGS      = -DLIBRARY 
- 
- CC	      = cc
- 
-@@ -334,7 +334,11 @@
- index:;		ctags -wx $(HDRS) $(SRCS)
- 
- install:	$(PROGRAM)
--		install -s $(PROGRAM) $(DEST)
-+		install -s $(PROGRAM) ${PREFIX}/bin/$(PROGRAM)
-+		install -d -o bin -g bin $(DEST)
-+		install -c -o bin -g bin README.1ST $(DEST)
-+		install -c -o bin -g bin element.lis new.lis $(DEST)
-+		install -c -o bin -g bin quanta.lis types.lis $(DEST)
- 
- print:;		$(PRINT) $(HDRS) $(SRCS)
- 
diff --git a/biology/babel/pkg-descr b/biology/babel/pkg-descr
index 06ab60538b33..6b386d087d03 100644
--- a/biology/babel/pkg-descr
+++ b/biology/babel/pkg-descr
@@ -3,4 +3,4 @@ molecular file formats.
 Babel is developed by Dolata Group, Department of Chemistry,
 Arizona University and Ohio State University.
 
-WWW: http://mercury.aichem.arizona.edu/babel.html
+WWW: http://smog.com/chem/babel/
diff --git a/biology/babel/pkg-plist b/biology/babel/pkg-plist
index 9acff72a342f..e5c0db25421d 100644
--- a/biology/babel/pkg-plist
+++ b/biology/babel/pkg-plist
@@ -1,7 +1,8 @@
 bin/babel
-share/babel/README.1ST
 share/babel/element.lis
 share/babel/new.lis
 share/babel/quanta.lis
 share/babel/types.lis
+%%PORTDOCS%%share/doc/babel/README.1ST
+%%PORTDOCS%%@dirrm share/doc/babel
 @dirrm share/babel