5 files changed, 42 insertions, 22 deletions

diff --git a/science/gdis/Makefile b/science/gdis/Makefile
index c9b774ea94ab..76b6abca705f 100644
--- a/science/gdis/Makefile
+++ b/science/gdis/Makefile
@@ -7,34 +7,39 @@
 #
 
 PORTNAME=	gdis
-PORTVERSION=	0.77.4
+PORTVERSION=	0.81
 CATEGORIES=	science
-MASTER_SITES=	ftp://ftp.seul.org/pub/gdis/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display and manipulation of isolated molecules and periodic systems
 
-LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
+LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
 
-USE_MESA=	yes
-USE_GNOME=	gtk12
+USE_GL=		yes
+USE_GNOME=	gtk20
 USE_REINPLACE=	yes
-USE_GMAKE=	yes
-ALL_TARGET=	main
+
+CFLAGS+=	-DINSTALL=\"\\\"${DATADIR}\\\"\"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^CC|#CC|g ; \
-		 s|^CFLAGS|#CFLAGS|g ; \
-		 s|/usr/local/bin|${DATADIR}|g ; \
-		 s|gtk-config|${GTK_CONFIG}|g ; \
-		 s|-I/usr/local/include||g ; \
-		 s|-lgtkgl|-lgtkgl ${PTHREAD_LIBS:S/"//g}|g ; \
-		 s|-DGTK_GL|-DGTK_GL ${PTHREAD_CFLAGS}|g' ${WRKSRC}/Makefile
 	@${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<sys/dir.h>|<dirent.h>|g ; \
 		 s|struct direct|struct dirent|g'
 
+do-configure:
+	@${SED} 's|SRC.*=|SRCS=|g' < ${WRKSRC}/makefile.src > ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'PROG=gdis' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'CFLAGS+=`pkg-config --cflags gtk+-2.0 gthread-2.0 gtkglext-1.0`' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'LDADD=`pkg-config --libs gtk+-2.0 gthread-2.0 gtkglext-1.0`' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'PREFIX?=/usr/local' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'DESTDIR=$${PREFIX}' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'BINDIR=/bin' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} 'NOMAN=true' >> ${WRKSRC}/Makefile
+	@${ECHO_CMD} '.include <bsd.prog.mk>' >> ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdis ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
diff --git a/science/gdis/distinfo b/science/gdis/distinfo
index 8eba5aab4c52..b57ef15e2801 100644
--- a/science/gdis/distinfo
+++ b/science/gdis/distinfo
@@ -1 +1 @@
-MD5 (gdis-0.77.4.tgz) = 3aa4538feaa236876a01a64507b485e4
+MD5 (gdis-0.81.tgz) = 454c0609f2505d334f94f2db4484d769
diff --git a/science/gdis/files/patch-main.c b/science/gdis/files/patch-main.c
new file mode 100644
index 000000000000..6270599e5ea9
--- /dev/null
+++ b/science/gdis/files/patch-main.c
@@ -0,0 +1,15 @@
+--- main.c.orig	Tue Nov  4 15:08:29 2003
++++ main.c	Wed Dec 31 02:11:54 2003
+@@ -433,6 +433,12 @@
+     }
+   }
+ 
++#ifdef INSTALL
++strcpy(sysenv.elem_file, INSTALL);
++strcat(sysenv.elem_file, DIR_SEP);
++strcat(sysenv.elem_file, ELEM_FILE);
++#endif
++
+ /* defaults */
+ sysenv.povray_exe = g_strdup("povray");
+ sysenv.convert_exe = g_strdup("convert");
diff --git a/science/gdis/pkg-descr b/science/gdis/pkg-descr
index 6c0a5a3917d9..925a531ca6d3 100644
--- a/science/gdis/pkg-descr
+++ b/science/gdis/pkg-descr
@@ -9,4 +9,4 @@ fairly functional. It has the following features:
      highlighting, etc.)
    - Animation of BIOSYM files
 
-WWW: http://gdis.seul.org/
+WWW: http://gdis.sourceforge.net/
diff --git a/science/gdis/pkg-plist b/science/gdis/pkg-plist
index be93c16676ea..90dc0c63e6a8 100644
--- a/science/gdis/pkg-plist
+++ b/science/gdis/pkg-plist
@@ -1,7 +1,7 @@
 bin/gdis
-%%PORTDOCS%%share/doc/gdis/CHANGELOG
-%%PORTDOCS%%share/doc/gdis/README
-%%PORTDOCS%%share/doc/gdis/TODO
-share/gdis/gdis.elements
-@dirrm share/gdis
-%%PORTDOCS%%@dirrm share/doc/gdis
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%DATADIR%%/gdis.elements
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%