diff options
author | Trevor Johnson <trevor@FreeBSD.org> | 2000-10-16 23:16:08 +0000 |
---|---|---|
committer | Trevor Johnson <trevor@FreeBSD.org> | 2000-10-16 23:16:08 +0000 |
commit | ae626a5bf5fa9e6ebf47ded0e9f258fbb864d897 (patch) | |
tree | 59d1c7e1836ef48a0cafdbd32184d40ffb5b60ce | |
parent | Use snapshot from author's site. Update to today's version. (diff) |
Respect CXX and CXXFLAGS
Add INSTALLS_SHLIB, USE_GMAKE, and USE_XPM.
PR: 22032
Submitted by: Kato Tsuguru
Notes
Notes:
svn path=/head/; revision=33915
-rw-r--r-- | x11-toolkits/xclasses/Makefile | 13 | ||||
-rw-r--r-- | x11-toolkits/xclasses/files/patch-aa | 38 | ||||
-rw-r--r-- | x11-toolkits/xclasses/files/patch-ac | 10 |
3 files changed, 47 insertions, 14 deletions
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile index 61d9c6e33d87..665fe2be7080 100644 --- a/x11-toolkits/xclasses/Makefile +++ b/x11-toolkits/xclasses/Makefile @@ -13,13 +13,20 @@ DISTNAME= Xclasses-public-${PORTVERSION}.src MAINTAINER= trevor@FreeBSD.org -USE_X_PREFIX= yes +INSTALLS_SHLIB= yes PLIST_SUB= VERSION="${PORTVERSION}" +USE_GMAKE= yes +USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/xclasses post-patch: - @${PERL} -pi -e "s=X11BASE=${X11BASE}=g" ${WRKSRC}/build \ - ${WRKSRC}/System/ARules.FreeBSD +.for file in build System/ARules.FreeBSD + @${PERL} -pi \ + -e "s|%%CXX%%|${CXX}|g;" \ + -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g;" \ + -e "s|%%X11BASE%%|${X11BASE}|g;" ${WRKSRC}/${file} +.endfor do-build: @cd ${WRKSRC} && ${SH} build all diff --git a/x11-toolkits/xclasses/files/patch-aa b/x11-toolkits/xclasses/files/patch-aa index 6ef990b40f09..378a17269ea2 100644 --- a/x11-toolkits/xclasses/files/patch-aa +++ b/x11-toolkits/xclasses/files/patch-aa @@ -1,20 +1,46 @@ ---- System/ARules.FreeBSD.orig Thu Sep 10 19:12:51 1998 -+++ System/ARules.FreeBSD Sun Oct 1 02:15:35 2000 -@@ -34,7 +34,7 @@ +--- System/ARules.FreeBSD.orig Fri Sep 11 04:12:51 1998 ++++ System/ARules.FreeBSD Sat Oct 14 04:54:12 2000 +@@ -25,19 +25,19 @@ + CPUm=$(shell uname -m) + + ## CPU options (currently only intel x86) +-CPUi386=-O3 +-CPUi486=-m486 -O3 -DBSTRING +-CPUi586=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -O3 -DBSTRING +-CPUi686=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -O3 -DBSTRING ++CPUi386= ++CPUi486=-m486 -DBSTRING ++CPUi586=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DBSTRING ++CPUi686=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DBSTRING + + ## set CPU options and optimize CPU=$(CPU$(CPUm)) ## additional include paths -INCLUDES=-I$(TOPDIR)/include -I/usr/openwin/include -I/usr/local/include -I$(INCLUDESDIR) -+INCLUDES=-I$(TOPDIR)/include -I/usr/openwin/include -IX11BASE/include -I$(INCLUDESDIR) ++INCLUDES=-I$(TOPDIR)/include -I$(INCLUDESDIR) ## Flags for compiler AND linker - BOTH= +-BOTH= ++BOTH=%%CXXFLAGS%% + + ## warnings + WARNS=-Winline -Wuninitialized -Wunused -Wreturn-type -Wreorder @@ -48,7 +48,7 @@ CC_OPTIONS=$(CPU) $(WARNS) $(INCLUDES) $(DEFINES) ## linker flags -LD_OPTIONS=-L/usr/X11/lib -L/usr/lib -L$(LIBSDIR) -+LD_OPTIONS=-LX11BASE/lib -L/usr/lib -L$(LIBSDIR) ++LD_OPTIONS=-L$(LIBSDIR) ## linker libraries SHLIBS=-lX11 -lm +@@ -86,6 +86,6 @@ + LIBNAME=libXclasses.so. + ARNAME=libXclasses.a + +-CC=g++ +-LD=gcc ++CC=%%CXX%% ++LD=%%CXX%% + LDCONFIG=ldconfig -m $(LIBSDIR) diff --git a/x11-toolkits/xclasses/files/patch-ac b/x11-toolkits/xclasses/files/patch-ac index 0858a3beac03..e1f41f34ce5f 100644 --- a/x11-toolkits/xclasses/files/patch-ac +++ b/x11-toolkits/xclasses/files/patch-ac @@ -7,9 +7,9 @@ - INCLUDESDIR=${XCLASSESINCLUDE:-"/usr/local/include"} - LIBSDIR=${XCLASSESLIB:-"/usr/local/lib"} - CONFIGSDIR=${XCLASSESCONFIG:-"/usr/lib/X11/Xclasses"} -+ INCLUDESDIR=X11BASE/include/ -+ LIBSDIR=X11BASE/lib/ -+ CONFIGSDIR=X11BASE/share/Xclasses/ ++ INCLUDESDIR=%%X11BASE%%/include/ ++ LIBSDIR=%%X11BASE%%/lib/ ++ CONFIGSDIR=%%X11BASE%%/share/Xclasses/ ROOTID=0 if [ "$2" != "quit" ]; then @@ -38,7 +38,7 @@ # look for installed XPM lib MAKEXPM="y" - for N in /usr/include/X11 /usr/local/include/X11 -+ for N in X11BASE/include/X11/ ++ for N in %%X11BASE%%/include/X11/ do if [ -f "$N/xpm.h" ]; then MAKEXPM="n" @@ -47,7 +47,7 @@ # look for shapes - if [ -f "/usr/include/X11/extensions/shape.h" ]; then -+ if [ -f "X11BASE/include/X11/extensions/shape.h" ]; then ++ if [ -f "%%X11BASE%%/include/X11/extensions/shape.h" ]; then USESHAPE="y" else USESHAPE="n" |