Index: head/x11-toolkits/xg/Makefile
===================================================================
--- head/x11-toolkits/xg/Makefile	(revision 35085)
+++ head/x11-toolkits/xg/Makefile	(revision 35086)
@@ -1,38 +1,36 @@
 # New ports collection makefile for:	xg
 # Date created:				3 December 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xg
 PORTVERSION= 	1.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://messners.com/code/ \
 		http://www.messners.com/code/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_MOTIF=	yes
+WRKSRC=		${WRKDIR}/Xg-${PORTVERSION}
 USE_X_PREFIX=	yes
+USE_MOTIF=	yes
 MAKEFILE=	makefile
-WRKSRC=		${WRKDIR}/Xg-1.0
 
 do-install:
-	@ ${INSTALL_DATA} ${WRKSRC}/src/libxg.a ${PREFIX}/lib
-	@ ${MKDIR} ${PREFIX}/include/xg
-	@ ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/xg
-	@ ${MKDIR} ${PREFIX}/share/examples/xg
-	@ ${INSTALL_DATA} ${WRKSRC}/testsrc/* ${PREFIX}/share/examples/xg
-	@ ${MV} ${PREFIX}/share/examples/xg/makefile ${PREFIX}/share/examples/xg/Makefile
-	@ ${RM} ${PREFIX}/share/examples/xg/makefile.orig
-
-post-install:
+	${INSTALL_DATA} ${WRKSRC}/src/libxg.a ${PREFIX}/lib
+	@${MKDIR} ${PREFIX}/include/xg
+	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/xg
+	@${MKDIR} ${PREFIX}/share/examples/xg
+	${INSTALL_DATA} ${WRKSRC}/testsrc/*.c ${PREFIX}/share/examples/xg
+	${INSTALL_DATA} ${WRKSRC}/testsrc/*.xpm ${PREFIX}/share/examples/xg
+	${INSTALL_DATA} ${WRKSRC}/testsrc/makefile ${PREFIX}/share/examples/xg/Makefile
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/xg
-	@ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/xg
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xg
+	@${MKDIR} ${PREFIX}/share/doc/xg
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/xg
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xg
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/x11-toolkits/xg/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/x11-toolkits/xg/files/patch-aa
===================================================================
--- head/x11-toolkits/xg/files/patch-aa	(revision 35085)
+++ head/x11-toolkits/xg/files/patch-aa	(revision 35086)
@@ -1,13 +1,22 @@
---- makefile	Sat Mar 15 00:36:20 1997
-+++ /home/andy/tmp/wrk/makefile	Wed Dec  2 22:28:41 1998
+--- makefile.orig	Sat Mar 15 09:36:20 1997
++++ makefile	Sun Nov 12 22:18:51 2000
 @@ -51,8 +51,8 @@
  #      most systems don't need to do this, ie:. -I/usr/dt/include for
  #      Solaris
  #
 -MOTIF_INC =
 -CFLAGS    = "-DUSE_XM_MWMUTIL_H -DUSE_XGPM -I../include ${MOTIF_INC}"
 +MOTIF_INC = -I${X11BASE}/include -I${X11BASE}/include/X11
-+CFLAGS    = "-DUSE_XM_MWMUTIL_H -DUSE_XGPM -DV_USE_TM_ZONE -I../include ${MOTIF_INC}"
++CFLAGS    += -DUSE_XM_MWMUTIL_H -DUSE_XGPM -DV_USE_TM_ZONE -I../include ${MOTIF_INC}
  
  #
  # If your OS doesn't use ranlib set RANLIB to true
+@@ -76,7 +76,7 @@
+ 
+ library:
+ 	@(cd src; \
+-	CFLAGS=${CFLAGS} ARFLAGS=${ARFLAGS} RANLIB=${RANLIB} make all)
++	CFLAGS="${CFLAGS}" ARFLAGS="${ARFLAGS}" RANLIB="${RANLIB}" ${MAKE} all)
+ 
+ tests: library
+ 	@(cd testsrc; \

Property changes on: head/x11-toolkits/xg/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property