ports/184880: x11/temperature.app: Fix build with clang

[KATO Tsuguru]

>Number:         184880
>Category:       ports
>Synopsis:       x11/temperature.app: Fix build with clang
>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:   Mon Dec 16 18:10:22 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Support PLIST_FILES

New file:
files/patch-Temperature.cc
files/patch-Temperature.h
files/patch-Xpm.cc

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/temperature.app/Makefile x11/temperature.app/Makefile
--- /usr/ports/x11/temperature.app/Makefile	2013-11-06 21:55:48.000000000 +0900
+++ x11/temperature.app/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -11,21 +11,23 @@
 MAINTAINER=	ports at 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>
diff -urN /usr/ports/x11/temperature.app/files/patch-Makefile x11/temperature.app/files/patch-Makefile
--- /usr/ports/x11/temperature.app/files/patch-Makefile	2013-11-06 21:55:48.000000000 +0900
+++ x11/temperature.app/files/patch-Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -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
  
diff -urN /usr/ports/x11/temperature.app/files/patch-Temperature.cc x11/temperature.app/files/patch-Temperature.cc
--- /usr/ports/x11/temperature.app/files/patch-Temperature.cc	1970-01-01 09:00:00.000000000 +0900
+++ x11/temperature.app/files/patch-Temperature.cc	2013-12-17 00:00:00.000000000 +0900
@@ -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) 
diff -urN /usr/ports/x11/temperature.app/files/patch-Temperature.h x11/temperature.app/files/patch-Temperature.h
--- /usr/ports/x11/temperature.app/files/patch-Temperature.h	1970-01-01 09:00:00.000000000 +0900
+++ x11/temperature.app/files/patch-Temperature.h	2013-12-17 00:00:00.000000000 +0900
@@ -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"
diff -urN /usr/ports/x11/temperature.app/files/patch-Xpm.cc x11/temperature.app/files/patch-Xpm.cc
--- /usr/ports/x11/temperature.app/files/patch-Xpm.cc	1970-01-01 09:00:00.000000000 +0900
+++ x11/temperature.app/files/patch-Xpm.cc	2013-12-17 00:00:00.000000000 +0900
@@ -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;
diff -urN /usr/ports/x11/temperature.app/pkg-plist x11/temperature.app/pkg-plist
--- /usr/ports/x11/temperature.app/pkg-plist	2013-11-06 21:55:48.000000000 +0900
+++ x11/temperature.app/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,3 +0,0 @@
-bin/Temperature.app
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: