[Midnightbsd-cvs] mports [21532] U trunk/editors/manedit/files: fix build on clang

[laffer1 at midnightbsd.org]

Revision: 21532
          http://svnweb.midnightbsd.org/mports/?rev=21532
Author:   laffer1
Date:     2016-08-05 20:34:47 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
fix build on clang

Modified Paths:
--------------
    trunk/editors/manedit/Makefile
    trunk/editors/manedit/files/patch-Makefile.FreeBSD

Property Changed:
----------------
    trunk/editors/manedit/files/mntent.h
    trunk/editors/manedit/files/mntent_compat.c
    trunk/editors/manedit/files/patch-Makefile.FreeBSD
    trunk/editors/manedit/files/patch-Makefile.install.UNIX
    trunk/editors/manedit/files/patch-fb.c
    trunk/editors/manedit/files/patch-manedit.1

Modified: trunk/editors/manedit/Makefile
===================================================================
--- trunk/editors/manedit/Makefile	2016-08-06 00:32:19 UTC (rev 21531)
+++ trunk/editors/manedit/Makefile	2016-08-06 00:34:47 UTC (rev 21532)
@@ -2,7 +2,7 @@
 
 PORTNAME=	manedit
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://wolfsinger.com/~wolfpack/packages/
 

Index: trunk/editors/manedit/files/mntent.h
===================================================================
--- trunk/editors/manedit/files/mntent.h	2016-08-06 00:32:19 UTC (rev 21531)
+++ trunk/editors/manedit/files/mntent.h	2016-08-06 00:34:47 UTC (rev 21532)

Property changes on: trunk/editors/manedit/files/mntent.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/editors/manedit/files/mntent_compat.c
===================================================================
--- trunk/editors/manedit/files/mntent_compat.c	2016-08-06 00:32:19 UTC (rev 21531)
+++ trunk/editors/manedit/files/mntent_compat.c	2016-08-06 00:34:47 UTC (rev 21532)

Property changes on: trunk/editors/manedit/files/mntent_compat.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/editors/manedit/files/patch-Makefile.FreeBSD
===================================================================
--- trunk/editors/manedit/files/patch-Makefile.FreeBSD	2016-08-06 00:32:19 UTC (rev 21531)
+++ trunk/editors/manedit/files/patch-Makefile.FreeBSD	2016-08-06 00:34:47 UTC (rev 21532)
@@ -1,29 +1,23 @@
---- Makefile.FreeBSD.orig	Wed Mar 13 00:02:34 2002
-+++ Makefile.FreeBSD	Tue Jul  2 14:48:15 2002
-@@ -52,7 +52,7 @@
- #
- GTK_CONFIG ?= gtk-config
- GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
--CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
-+CFLAGS += -I. $(GTK_CFLAGS) \
+--- Makefile.FreeBSD.orig	2013-07-19 16:44:02.000000000 +0200
++++ Makefile.FreeBSD	2013-07-19 16:44:28.000000000 +0200
+@@ -56,7 +56,10 @@ CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
            -DPREFIX=\"$(PREFIX)\" \
-           -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(LOCALBASE)\"
+           -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
  
-@@ -116,7 +116,7 @@
- # Build Rules:
- #
- $(BIN): $(OBJ_C) $(OBJ_CPP)
--	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
-+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+-CPPFLAGS = -D__cplusplus -Dc_plusplus
++CPPFLAGS = $(CXXFLAGS) $(GTK_CFLAGS) -O2 -Wall \
++          -DPREFIX=\"$(PREFIX)\" \
++          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" \
++          -D__cplusplus -Dc_plusplus
  
- all: $(BIN) $(BIN).1.out
  
-@@ -126,7 +126,7 @@
- #
- #   This rule is defined externally.
- #
--include Makefile.install.FreeBSD
-+include Makefile.install.UNIX
+ # ########################################################################
+@@ -109,7 +112,7 @@ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+ 	$(CC) -c $*.c $(INC) $(CFLAGS)
+ .cpp.o:
+-	$(CPP) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
++	$(CPP) -c $*.cpp $(INC) $(CPPFLAGS)
  
  
  # ########################################################################


Property changes on: trunk/editors/manedit/files/patch-Makefile.FreeBSD
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/editors/manedit/files/patch-Makefile.install.UNIX
===================================================================
--- trunk/editors/manedit/files/patch-Makefile.install.UNIX	2016-08-06 00:32:19 UTC (rev 21531)
+++ trunk/editors/manedit/files/patch-Makefile.install.UNIX	2016-08-06 00:34:47 UTC (rev 21532)

Property changes on: trunk/editors/manedit/files/patch-Makefile.install.UNIX
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/editors/manedit/files/patch-fb.c
===================================================================
--- trunk/editors/manedit/files/patch-fb.c	2016-08-06 00:32:19 UTC (rev 21531)
+++ trunk/editors/manedit/files/patch-fb.c	2016-08-06 00:34:47 UTC (rev 21532)

Property changes on: trunk/editors/manedit/files/patch-fb.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/editors/manedit/files/patch-manedit.1
===================================================================
--- trunk/editors/manedit/files/patch-manedit.1	2016-08-06 00:32:19 UTC (rev 21531)
+++ trunk/editors/manedit/files/patch-manedit.1	2016-08-06 00:34:47 UTC (rev 21532)

Property changes on: trunk/editors/manedit/files/patch-manedit.1
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property