svn commit: r313207 - in head/science/gdis: . files

[Martin Wilke]

Author: miwi
Date: Sat Mar  2 06:29:42 2013
New Revision: 313207
URL: http://svnweb.freebsd.org/changeset/ports/313207

Log:
  - Update to 0.90
  
  PR:		176549
  Submitted by:	Ports Fury

Added:
  head/science/gdis/files/patch-grid.c   (contents, props changed)
Deleted:
  head/science/gdis/files/patch-crystal_graph.c
  head/science/gdis/files/patch-file_bgf.c
  head/science/gdis/files/patch-file_cgf.c
  head/science/gdis/files/patch-gui_monty.c
  head/science/gdis/files/patch-gui_siesta.c
  head/science/gdis/files/patch-main.c
  head/science/gdis/files/patch-module.c
  head/science/gdis/files/patch-molsurf.c
Modified:
  head/science/gdis/Makefile   (contents, props changed)
  head/science/gdis/distinfo   (contents, props changed)

Modified: head/science/gdis/Makefile
==============================================================================
--- head/science/gdis/Makefile	Sat Mar  2 06:27:43 2013	(r313206)
+++ head/science/gdis/Makefile	Sat Mar  2 06:29:42 2013	(r313207)
@@ -1,47 +1,88 @@
-# ex:ts=8
-# Ports collection Makefile for:	gdis
-# Date created:			Mar 3, 2002
-# Whom:				ijliao
-#
+# Created y: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	gdis
-PORTVERSION=	0.89
-PORTREVISION=	6
+PORTVERSION=	0.90
 CATEGORIES=	science
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	-source.tgz
+MASTER_SITES=	SF
+EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Display and manipulation of isolated molecules and periodic systems
 
-LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+LICENSE=	GPLv2 # (or later)
 
-USE_GL=		yes
+LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
+
+OPTIONS_DEFINE=	DOCS
+
+USE_GL=		glu
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-MAKEFILE=	makefile
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
-ALL_TARGET=	${PORTNAME}
-
-CFLAGS+=	-DINSTALL=\"\\\"${DATADIR}\\\"\"
+MAKEFILE=	GNUmakefile
 
 PORTDOCS=	CHANGELOG README TODO
 PLIST_FILES=	bin/gdis %%DATADIR%%/gdis.elements %%DATADIR%%/gdis.library \
-		%%DATADIR%%/gdis.manual
+		%%DATADIR%%/gdis.manual share/pixmaps/gdis.xpm
 PLIST_DIRS=	%%DATADIR%%
 
+DESKTOP_ENTRIES="GDIS" "Molecular modelling GUI" \
+		"${PREFIX}/share/pixmaps/gdis.xpm" "${PORTNAME}" "" true
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|"\(gdis.elements\)|"../share/gdis/\1| ; \
+		 s|"\(gdis.library\)|"../share/gdis/\1|' ${WRKSRC}/gdis.h
+	@${REINPLACE_CMD} -e \
+		's|"\(gdis.manual\)|"../share/gdis/\1|' ${WRKSRC}/gui_help.c
+
+do-configure:
+	@${ECHO_CMD} -n \
+		> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'USE_GUI=YES' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'USE_GRISU=NO' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'include makefile.src' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'CFLAGS:=$$(CFLAGS) -DWITH_GUI' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'INCS=`pkg-config --cflags gtkglext-1.0`' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'LIBS=`pkg-config --libs gtkglext-1.0`' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'OBJ=$$(SRC:.c=.o)' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'all: gdis' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} 'gdis: $$(OBJ)' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} '	$$(CC) $$(OBJ) $$(LDFLAGS) -o gdis $$(LIBS)' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} '.c.o:' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@${ECHO_CMD} '	$$(CC) $$(CFLAGS) -c $$< $$(INCS)' \
+		>> ${WRKSRC}/${MAKEFILE}
+	@(cd ${WRKSRC} && ${SED} -e 's|logo_right_81|gdis|' \
+		< logo_right.xpm > gdis.xpm)
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gdis ${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} gdis ${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_DATA} gdis.xpm ${PREFIX}/share/pixmaps)
 	@${MKDIR} ${DATADIR}
-.for file in gdis.elements gdis.library gdis.manual
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
+.for i in gdis.elements gdis.library gdis.manual
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DATADIR})
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in CHANGELOG README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
 .endfor
 .endif
 

Modified: head/science/gdis/distinfo
==============================================================================
--- head/science/gdis/distinfo	Sat Mar  2 06:27:43 2013	(r313206)
+++ head/science/gdis/distinfo	Sat Mar  2 06:29:42 2013	(r313207)
@@ -1,2 +1,2 @@
-SHA256 (gdis-0.89-source.tgz) = 594e9c199d1911e2b3d4da0a704e8cf14e7813c099e1bfdde294abb4895dfcec
-SIZE (gdis-0.89-source.tgz) = 829113
+SHA256 (gdis-0.90-src.tgz) = bbf9de62dc978199d8e13e10d009b03753cee1172dcb7f9ee54c8f96b652d890
+SIZE (gdis-0.90-src.tgz) = 1895353

Added: head/science/gdis/files/patch-grid.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/gdis/files/patch-grid.c	Sat Mar  2 06:29:42 2013	(r313207)
@@ -0,0 +1,20 @@
+--- grid.c.orig
++++ grid.c
+@@ -58,7 +58,7 @@
+ if (grid_table)
+   g_hash_table_replace(grid_table, g_strdup(name), g_strdup(value));
+ #else
+-return(NULL);
++return;
+ #endif
+ }
+ 
+@@ -80,7 +80,7 @@
+ if (grid_table)
+   g_hash_table_remove(grid_table, name);
+ #else
+-return(NULL);
++return;
+ #endif
+ }
+