svn commit: r379334 - head/audio/taglookup/files

[John Marino]

Author: marino
Date: Thu Feb 19 09:04:48 2015
New Revision: 379334
URL: https://svnweb.freebsd.org/changeset/ports/379334
QAT: https://qat.redports.org/buildarchive/r379334/

Log:
  audio/taglookup: Respect CXXFLAGS (PHB 12.9)
  
  While here, fix LDFLAGS and use the BSD_INSTALL_* macros instead of
  hardcoding modes.
  
  Approved by:	blanket

Modified:
  head/audio/taglookup/files/patch-Makefile

Modified: head/audio/taglookup/files/patch-Makefile
==============================================================================
--- head/audio/taglookup/files/patch-Makefile	Thu Feb 19 07:41:58 2015	(r379333)
+++ head/audio/taglookup/files/patch-Makefile	Thu Feb 19 09:04:48 2015	(r379334)
@@ -1,22 +1,27 @@
---- ./Makefile.orig	2007-10-29 13:02:54.000000000 +0100
-+++ ./Makefile	2014-04-07 10:15:45.329720325 +0200
-@@ -4,7 +4,7 @@
+--- Makefile.orig	2007-10-29 12:02:54 UTC
++++ Makefile
+@@ -4,10 +4,10 @@ LIBCDDB_LIBRARY = `pkg-config --libs lib
  TAGLIB_INCLUDE = `taglib-config --cflags`
  TAGLIB_LIBRARY = `taglib-config --libs`
  
 -CPP = g++
 +CPP = $(CXX)
  
- CPPFLAGS = -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
- LDFLAGS = $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
-@@ -18,8 +18,8 @@
+-CPPFLAGS = -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
+-LDFLAGS = $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
++CPPFLAGS = ${CXXFLAGS} -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
++LDFLAGS+= $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
+ 
+ OBJ = cddb_query.o cddb_query_impl.o command_line.o main.o tag.o tracks.o
+ EXE = taglookup
+@@ -18,8 +18,8 @@ EXE = taglookup
  all: $(EXE)
  
  install: $(EXE)
 -	$(INSTALL) -c -o root -g wheel -m 644 taglookup.1 $(PREFIX)/man/man1/taglookup.1
 -	$(INSTALL) -c -o root -g wheel -m 755 $(EXE) $(PREFIX)/bin/taglookup
-+	$(INSTALL) -c -m 644 taglookup.1 $(DESTDIR)$(PREFIX)/man/man1/taglookup.1
-+	$(INSTALL) -c -m 755 $(EXE) $(DESTDIR)$(PREFIX)/bin/taglookup
++	$(BSD_INSTALL_MAN) taglookup.1 $(DESTDIR)$(PREFIX)/man/man1/taglookup.1
++	$(BSD_INSTALL_PROGRAM) $(EXE) $(DESTDIR)$(PREFIX)/bin/taglookup
  
  $(EXE): $(OBJ)
  	$(CPP) $(LDFLAGS) $(OBJ) -o $(EXE)