Date: Sat, 27 Sep 2003 23:55:21 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/57288: Update port: x11-toolkits/XawPlus Message-ID: <20030927235521.21fa172b.tkato@prontomail.com> Resent-Message-ID: <200309271500.h8RF0Wos080179@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57288 >Category: ports >Synopsis: Update port: x11-toolkits/XawPlus >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 27 08:00:31 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE-p10 i386 >Organization: >Environment: >Description: - Support CC/CFLAGS properly Remove file: files/patch-Makefile >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-toolkits/XawPlus/Makefile x11-toolkits/XawPlus/Makefile --- /usr/ports/x11-toolkits/XawPlus/Makefile Thu Sep 4 23:51:05 2003 +++ x11-toolkits/XawPlus/Makefile Sat Sep 27 00:22:23 2003 @@ -7,6 +7,7 @@ PORTNAME= XawPlus PORTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://people.freenet.de/kra/XawPlus/ DISTNAME= ${PORTNAME:L}-${PORTVERSION} @@ -15,27 +16,33 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A replacement for Xaw with a nicer 3-D look and some extensions +WRKSRC= ${WRKDIR}/${PORTNAME} + USE_X_PREFIX= yes USE_REINPLACE= yes +MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -fPIC -DHAS_WCHAR_H" \ + INC_PATH="-I. -I${X11BASE}/include" LIB_PATH="-L${X11BASE}/lib" +ALL_TARGET= lib INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%X11BASE%%/lib - -WRKSRC= ${WRKDIR}/${PORTNAME} post-patch: - @cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete - -do-configure: - ${REINPLACE_CMD} -e 's:%%X11BASE%%:${X11BASE}:' ${WRKSRC}/test/Makefile - -@${RM} -f ${WRKSRC}/test/Makefile.bak + @${REINPLACE_CMD} -e 's:so\.3\..:so.3:' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's:%%X11BASE%%:${X11BASE}:' ${WRKSRC}/test/Makefile -post-install: +do-install: + @${MKDIR} ${PREFIX}/include/X11/XawPlus + ${INSTALL_DATA} ${WRKSRC}/X11/XawPlus/*.h ${PREFIX}/include/X11/XawPlus + ${INSTALL_DATA} ${WRKSRC}/libXawPlus.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libXawPlus.so.3 ${PREFIX}/lib + ${LN} -sf libXawPlus.so.3 ${PREFIX}/lib/libXawPlus.so .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} + @${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/test/Makefile ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/test/*.c ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/test/*.xpm ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff -urN /usr/ports/x11-toolkits/XawPlus/files/patch-Makefile x11-toolkits/XawPlus/files/patch-Makefile --- /usr/ports/x11-toolkits/XawPlus/files/patch-Makefile Thu Sep 4 23:51:06 2003 +++ x11-toolkits/XawPlus/files/patch-Makefile Thu Jan 1 09:00:00 1970 @@ -1,60 +0,0 @@ -$FreeBSD: ports/x11-toolkits/XawPlus/files/patch-Makefile,v 1.1 2003/09/04 14:51:06 glewis Exp $ - ---- Makefile.orig Sat Sep 7 12:59:26 2002 -+++ Makefile Wed Jan 29 17:09:14 2003 -@@ -22,9 +22,9 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - # - --LIB_PATH = -L/usr/X11/lib # Libraries for X --INC_PATH = -I. -I/usr/X11/include # Header files for X --INST_LIBS= /usr/X11/lib -+LIB_PATH = -L${X11BASE}/lib # Libraries for X -+INC_PATH = -I. -I${X11BASE}/include # Header files for X -+INST_LIBS= ${PREFIX}/lib - - XAW= ./X11/XawPlus - -@@ -39,10 +39,12 @@ - MenuButton.o Toggle.o Panner.o Command.o Repeater.o \ - Grip.o Scrollbar.o List.o \ - Tree.o DrawingArea.o StripChart.o Dialog.o -+all: lib - --all: lib install - lib: libXawPlus.a libXawPlus.so.3.1 libXaw.so.6.6 libXaw.so.7.0 - -+.PHONY: clean -+ - clean: - rm -f *.o *.a *.so* - -@@ -53,7 +55,7 @@ - - libXawPlus.so.3.1: $(OBJS) - $(CC) -shared -Wl,-soname,libXawPlus.so.3 \ -- -o libXawPlus.so.3.1 $(OBJS) -+ -o libXawPlus.so.3 $(OBJS) - - libXaw.so.6.6: $(OBJS) - $(CC) -shared -Wl,-soname,libXaw.so.6 \ -@@ -66,14 +68,14 @@ - # --- This only works as superuser root - - install: -- rm -rf /usr/X11/include/X11/XawPlus -- mkdir -p /usr/X11/include/X11/XawPlus -- cp ./X11/XawPlus/*.h /usr/X11/include/X11/XawPlus -+ rm -rf ${PREFIX}/include/X11/XawPlus -+ mkdir -p ${PREFIX}/include/X11/XawPlus -+ ${BSD_INSTALL_DATA} ./X11/XawPlus/*.h ${PREFIX}/include/X11/XawPlus - cp libXawPlus.a $(INST_LIBS) - rm -f $(INST_LIBS)/libXawPlus.so.3 $(INST_LIBS)/libXawPlus.so -- cp libXawPlus.so.3.1 $(INST_LIBS) -+ ${BSD_INSTALL_DATA} libXawPlus.so.3 $(INST_LIBS) - ldconfig -- ln -s $(INST_LIBS)/libXawPlus.so.3.1 $(INST_LIBS)/libXawPlus.so -+ ln -s $(INST_LIBS)/libXawPlus.so.3 $(INST_LIBS)/libXawPlus.so - - installxaw: - rm -f $(INST_LIBS)/libXaw.so.6 \ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030927235521.21fa172b.tkato>