diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2000-11-13 15:00:54 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2000-11-13 15:00:54 +0000 |
| commit | 2d6732060db4867baef22a9107d0a147037f91c8 (patch) | |
| tree | 781ec27edb06f921f76cf464630cc833a594bd8b /x11-toolkits/xg | |
| parent | Update to version 1.3 (diff) | |
Support CFLAGS/MAKE properly
PR: 22816
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=35086
Diffstat (limited to 'x11-toolkits/xg')
| -rw-r--r-- | x11-toolkits/xg/Makefile | 26 | ||||
| -rw-r--r-- | x11-toolkits/xg/files/patch-aa | 15 |
2 files changed, 24 insertions, 17 deletions
diff --git a/x11-toolkits/xg/Makefile b/x11-toolkits/xg/Makefile index 7b0f27f92345..73e336000a37 100644 --- a/x11-toolkits/xg/Makefile +++ b/x11-toolkits/xg/Makefile @@ -14,25 +14,23 @@ 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> diff --git a/x11-toolkits/xg/files/patch-aa b/x11-toolkits/xg/files/patch-aa index 268de4321a0c..0f1e8f1841a4 100644 --- a/x11-toolkits/xg/files/patch-aa +++ b/x11-toolkits/xg/files/patch-aa @@ -1,5 +1,5 @@ ---- 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 @@ -7,7 +7,16 @@ -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; \ |