Date: Mon, 16 Oct 2000 14:46:46 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22032: Update port: x11-toolkits/xclasses Message-ID: <20001016214646.C6ABC37B502@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22032
>Category: ports
>Synopsis: Update port: x11-toolkits/xclasses
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 16 14:50:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CXX/CXXFLAGS/X11BASE properly
- Add USE_GMAKE
- Add USE_XPM
- Add INSTALLS_SHLIB
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-toolkits/xclasses/Makefile x11-toolkits/xclasses/Makefile
--- /usr/ports/x11-toolkits/xclasses/Makefile Wed Oct 4 13:52:56 2000
+++ x11-toolkits/xclasses/Makefile Sat Oct 14 05:40:31 2000
@@ -13,13 +13,20 @@
MAINTAINER= trevor@FreeBSD.org
+WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
+USE_XPM= yes
+USE_GMAKE= yes
PLIST_SUB= VERSION="${PORTVERSION}"
-WRKSRC= ${WRKDIR}/xclasses
+INSTALLS_SHLIB= yes
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 -urN /usr/ports/x11-toolkits/xclasses/files/patch-aa x11-toolkits/xclasses/files/patch-aa
--- /usr/ports/x11-toolkits/xclasses/files/patch-aa Wed Oct 4 13:52:53 2000
+++ x11-toolkits/xclasses/files/patch-aa Sat Oct 14 04:54:50 2000
@@ -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 -urN /usr/ports/x11-toolkits/xclasses/files/patch-ac x11-toolkits/xclasses/files/patch-ac
--- /usr/ports/x11-toolkits/xclasses/files/patch-ac Wed Oct 4 13:52:53 2000
+++ x11-toolkits/xclasses/files/patch-ac Sat Oct 14 04:27:17 2000
@@ -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"
diff -urN /usr/ports/x11-toolkits/xclasses/files/patch-zz x11-toolkits/xclasses/files/patch-zz
--- /usr/ports/x11-toolkits/xclasses/files/patch-zz Thu Jan 1 09:00:00 1970
+++ x11-toolkits/xclasses/files/patch-zz Sat Oct 14 06:10:12 2000
@@ -0,0 +1,47 @@
+--- System/ARules.FreeBSD.orig Fri Sep 11 04:12:51 1998
++++ System/ARules.FreeBSD Sat Oct 14 05:45:53 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$(INCLUDESDIR)
+
+ ## Flags for compiler AND linker
+-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=-L$(LIBSDIR)
+
+ ## linker libraries
+ SHLIBS=-lX11 -lm
+@@ -86,6 +86,6 @@
+ LIBNAME=libXclasses.so.
+ ARNAME=libXclasses.a
+
+-CC=g++
+-LD=gcc
+-LDCONFIG=ldconfig -m $(LIBSDIR)
++CC=%%CXX%%
++LD=%%CXX%%
++LDCONFIG=true
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001016214646.C6ABC37B502>