Date: Fri, 20 Dec 2013 19:18:18 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337080 - in head/x11/temperature.app: . files Message-ID: <201312201918.rBKJIIVr097474@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Dec 20 19:18:18 2013 New Revision: 337080 URL: http://svnweb.freebsd.org/changeset/ports/337080 Log: - Fix build with clang - Switch to PLIST_FILES - Support staging PR: ports/184880 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Added: head/x11/temperature.app/files/patch-Temperature.cc (contents, props changed) head/x11/temperature.app/files/patch-Temperature.h (contents, props changed) head/x11/temperature.app/files/patch-Xpm.cc (contents, props changed) Deleted: head/x11/temperature.app/pkg-plist Modified: head/x11/temperature.app/Makefile (contents, props changed) head/x11/temperature.app/files/patch-Makefile (contents, props changed) Modified: head/x11/temperature.app/Makefile ============================================================================== --- head/x11/temperature.app/Makefile Fri Dec 20 19:12:56 2013 (r337079) +++ head/x11/temperature.app/Makefile Fri Dec 20 19:18:18 2013 (r337080) @@ -11,21 +11,23 @@ DISTNAME= Temperature.app-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Dockable WindowMaker applet which displays the local temperature -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2 # (or later) RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget +OPTIONS_DEFINE= DOCS + USE_XORG= x11 xpm -NO_STAGE= yes +PORTDOCS= README +PLIST_FILES= bin/Temperature.app + .include <bsd.port.options.mk> do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/Temperature.app ${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} Temperature.app \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/x11/temperature.app/files/patch-Makefile ============================================================================== --- head/x11/temperature.app/files/patch-Makefile Fri Dec 20 19:12:56 2013 (r337079) +++ head/x11/temperature.app/files/patch-Makefile Fri Dec 20 19:18:18 2013 (r337080) @@ -9,9 +9,10 @@ +GNUSTEP_BINDIR = $(LOCALBASE)/GNUstep/Apps/Temperature.app +X11_BINDIR = $(LOCALBASE)/bin - CXX=c++ +-CXX=c++ -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 ++CXX ?= c++ +CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(LOCALBASE)/include +LDFLAGS += -L$(LOCALBASE)/lib -lXpm -lXext -lX11 Added: head/x11/temperature.app/files/patch-Temperature.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/temperature.app/files/patch-Temperature.cc Fri Dec 20 19:18:18 2013 (r337080) @@ -0,0 +1,41 @@ +--- Temperature.cc.bak 2002-04-06 08:44:09.000000000 +0900 ++++ Temperature.cc 2013-12-07 17:25:30.000000000 +0900 +@@ -20,24 +20,29 @@ + // + + #include <X11/Xlib.h> +-#include <iostream.h> +-#include <fstream.h> +-#include <stdlib.h> +-#include <stdio.h> +-#include <string.h> ++#include <iostream> ++#include <fstream> ++#include <cstdlib> ++#include <cstdio> ++#include <cstring> + #include <unistd.h> +-#include <signal.h> +-#include <errno.h> ++#include <csignal> ++#include <cerrno> + #include <sys/types.h> + #include <sys/wait.h> +-#include <math.h> +-#include <time.h> ++#include <cmath> ++#include <ctime> + #include "Xpm.h" + #include "Temperature.h" + + #include "pixmaps/main.xpm" + #include "pixmaps/redlight.xpm" + ++using std::cerr; ++using std::cout; ++using std::endl; ++using std::fstream; ++ + volatile static ChildStatus childStatus; + + static void catchBrokenPipe(int sig) Added: head/x11/temperature.app/files/patch-Temperature.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/temperature.app/files/patch-Temperature.h Fri Dec 20 19:18:18 2013 (r337080) @@ -0,0 +1,15 @@ +--- Temperature.h.bak 2002-04-06 08:44:17.000000000 +0900 ++++ Temperature.h 2013-12-07 17:24:28.000000000 +0900 +@@ -22,9 +22,11 @@ + #ifndef _TEMPERATURE_H_ + #define _TEMPERATURE_H_ + +-#include <fstream.h> ++#include <fstream> + #include <X11/Xlib.h> + ++using std::ifstream; ++ + #define APPNAME "Temperature.app" + #define VERSION "1.4" + #define INSTANCENAME "temperature_app" Added: head/x11/temperature.app/files/patch-Xpm.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/temperature.app/files/patch-Xpm.cc Fri Dec 20 19:18:18 2013 (r337080) @@ -0,0 +1,22 @@ +--- Xpm.cc.bak 2002-04-06 08:44:36.000000000 +0900 ++++ Xpm.cc 2013-12-07 17:25:00.000000000 +0900 +@@ -22,12 +22,16 @@ + #include <X11/Xlib.h> + #include <X11/xpm.h> + #include <X11/extensions/shape.h> +-#include <iostream.h> +-#include <stdlib.h> +-#include <string.h> ++#include <iostream> ++#include <cstdlib> ++#include <cstring> + #include "Temperature.h" + #include "Xpm.h" + ++using std::cerr; ++using std::cout; ++using std::endl; ++ + Xpm::Xpm(Display* display, Window root, char** data) + { + int error;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312201918.rBKJIIVr097474>