From e6f7df8dc03d756c4ca3cef46a04ba5b43048cbc Mon Sep 17 00:00:00 2001 From: rakuco Date: Mon, 6 Jan 2014 15:23:11 +0000 Subject: [PATCH] - Fix the build when g++ is not present. - Respect CXXFLAGS. - Unconditionally set MAINTAINER. - Set LICENSE. - Support staging. --- sysutils/usrinfo/Makefile | 14 ++++++-------- sysutils/usrinfo/files/patch-Makefile | 12 ++++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 sysutils/usrinfo/files/patch-Makefile diff --git a/sysutils/usrinfo/Makefile b/sysutils/usrinfo/Makefile index a77e89eb7f80..2470e5e20cb7 100644 --- a/sysutils/usrinfo/Makefile +++ b/sysutils/usrinfo/Makefile @@ -6,19 +6,17 @@ PORTVERSION= .10 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER?= aaron@snaphat.com +MAINTAINER= aaron@snaphat.com COMMENT= Displays information about a user using either "
" or "\n" breaks +LICENSE= BSD2CLAUSE + USE_BZIP2= yes -PLIST_FILES= bin/usrinfo +PLIST_FILES= bin/usrinfo man/man1/usrinfo.1.gz -MANCOMPRESSED= no -MAN1= usrinfo.1 - -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/usrinfo ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/usrinfo.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/usrinfo ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/usrinfo.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include diff --git a/sysutils/usrinfo/files/patch-Makefile b/sysutils/usrinfo/files/patch-Makefile new file mode 100644 index 000000000000..2604948b82aa --- /dev/null +++ b/sysutils/usrinfo/files/patch-Makefile @@ -0,0 +1,12 @@ +--- Makefile.orig 2004-06-24 22:59:34.000000000 +0300 ++++ Makefile 2014-01-06 17:17:10.000000000 +0200 +@@ -1,7 +1,7 @@ + all: usrinfo.o +- g++ -o usrinfo usrinfo.o ++ $(CXX) $(CXXFLAGS) -o usrinfo usrinfo.o + usrinfo.o: source/usrinfo.cpp +- g++ -c source/usrinfo.cpp ++ $(CXX) $(CXXFLAGS) -c source/usrinfo.cpp + clean: + rm -f *.o usrinfo + install: usrinfo