4 files changed, 55 insertions, 24 deletions

diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index a39f42b5574a..f0197ab0476a 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdrawchem
-PORTVERSION=	0.95
+PORTVERSION=	0.99.7
 CATEGORIES=	biology
 MASTER_SITES=	http://www.prism.gatech.edu/~gte067k/xdrawchem/
 EXTRACT_SUFX=	.tgz
@@ -26,13 +26,26 @@ pre-build:
 
 pre-install:
 	${ECHO} bin/xdrawchem > ${PLIST}
-	cd ${WRKSRC}/ring && find -s . -type f | \
-		${SED} -e 's:^.:share/xdrawchem:' >> ${PLIST}
+	${LS} ${WRKSRC}/ring | \
+		${SED} -e 's:^:share/xdrawchem/:' >> ${PLIST}
 	${ECHO} @dirrm share/xdrawchem >> ${PLIST}
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${LS} *txt | \
+		${SED} -e 's:^:share/doc/xdrawchem/:' >> ${PLIST}
+	${ECHO} @dirrm share/doc/xdrawchem >> ${PLIST}
+	${LS} ${WRKSRC}/save | \
+		${SED} -e 's:^:share/examples/xdrawchem/:' >> ${PLIST}
+	${ECHO} @dirrm share/examples/xdrawchem >> ${PLIST}
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdrawchem ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/xdrawchem
-	${INSTALL_DATA} ${WRKSRC}/ring/* ${PREFIX}/share/xdrawchem
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/ring/* ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/save/* ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/*txt ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/biology/xdrawchem/distinfo b/biology/xdrawchem/distinfo
index 4f6a891c031b..3011d37c8ad7 100644
--- a/biology/xdrawchem/distinfo
+++ b/biology/xdrawchem/distinfo
@@ -1 +1 @@
-MD5 (xdrawchem-0.95.tgz) = 901ff4f6295480f707930f856fc14173
+MD5 (xdrawchem-0.99.7.tgz) = b6ce1837704771e329055f283d814f35
diff --git a/biology/xdrawchem/files/patch-aa b/biology/xdrawchem/files/patch-aa
index 7cca08b2e32b..6f5e520962c5 100644
--- a/biology/xdrawchem/files/patch-aa
+++ b/biology/xdrawchem/files/patch-aa
@@ -1,8 +1,19 @@
---- Makefile.orig	Mon Jul 23 15:15:37 2001
-+++ Makefile	Sun Aug 12 03:17:31 2001
-@@ -8,24 +8,22 @@
+--- Makefile.orig	Sat Dec  1 10:36:43 2001
++++ Makefile	Sat Jan 19 16:07:48 2002
+@@ -1,26 +1,25 @@
+ # XDrawChem configuration stuff
+ # INSTDIR: The directory where the binary will go.  Should be in your path.
+-#          The default is /usr/local/bin
++#          The default is ${PREFIX}/bin
+ # INSTRING: The directory where you will store ring templates (without quotes).
+ # RINGDIR: The directory where you will store ring templates (with quotes).
+ # INSTRING and RINGDIR should be the same :)
+-# Default should be /usr/local/lib/xdrawchem
++# Default should be ${PREFIX}/lib/xdrawchem
  # if you change RINGDIR, remember to put "\" before the directory,
  # and \"" after it, so the preprocessor will insert quotes correctly
+ # SERVER: database server.  OK to set to "herger.ibb.gatech.edu";
+ #         as of version 0.98, there are no other servers  :)
  
 -INSTDIR = /usr/local/bin
 -INSTRING = /usr/local/lib/xdrawchem
@@ -10,27 +21,31 @@
 +INSTDIR = ${PREFIX}/bin
 +INSTRING = ${PREFIX}/share/xdrawchem
 +RINGDIR = "\"${PREFIX}/share/xdrawchem/\""
+ SERVER = "\"herger.ibb.gatech.edu\""
  
- ## Compiler stuff
- ## Uncomment the appropriate compiler line
- 
- ## For Linux, SGI IRIX 6.5 (as tested)
+ ## Platform-specific flags -- uncomment appropriate section
+ ## For Linux, SGI IRIX 6.5 using gcc/g++
 -CXX	=	g++
- ## for Sun
- ##CXX	=	CC
--CXXFLAGS = -g -DRINGHOME=$(RINGDIR)
--CC	=	gcc
--CFLAGS	=	-g -DRINGHOME=$(RINGDIR)
 -INCPATH =	-I/usr/include -I$(QTDIR)/include
--LFLAGS	=	-g -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
 -LIBS	=	-lqt -lXext -lX11 -lm
--MOC	=	moc
-+CXXFLAGS += -DRINGHOME=$(RINGDIR)
-+CFLAGS	+=	-DRINGHOME=$(RINGDIR)
+-MOC	=	$(QTDIR)/bin/moc
 +INCPATH =	-I$(QTDIR)/include/qt2
-+LFLAGS	=	-L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
 +LIBS	=	-lqt2 -lXext -lX11 -lm
 +MOC	=	$(QTDIR)/bin/moc2
  
- ####### Target
+ ## for Sun
+ #CXX	=	CC
+@@ -37,10 +36,9 @@
+ ## end of platform-specific flags
  
+ ## other compiler flags
+-CXXFLAGS = -g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
+-CC	=	gcc
+-CFLAGS	=	-g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
+-LFLAGS	=	-g -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
++CXXFLAGS += -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
++CFLAGS	+=	-DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
++LFLAGS	+=	-L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
+ 
+ 
+ ####### Target
diff --git a/biology/xdrawchem/pkg-message b/biology/xdrawchem/pkg-message
new file mode 100644
index 000000000000..f2d916105e46
--- /dev/null
+++ b/biology/xdrawchem/pkg-message
@@ -0,0 +1,3 @@
+*** WARNING ***
+The sources for the xdrawchem package have not been
+thoroughly reviewed by the FreeBSD maintainer.