Date: Mon, 11 Mar 2013 22:57:33 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176865: [PATCH] graphics/lcdtest: OptionsNG, added license, icon, desktop entry, take maintainership Message-ID: <20130311215743.B12407A9@hub.freebsd.org> Resent-Message-ID: <201303112200.r2BM00GT015351@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176865
>Category: ports
>Synopsis: [PATCH] graphics/lcdtest: OptionsNG, added license, icon, desktop entry, take maintainership
>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 Mar 11 22:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10
>Description:
- Take maintainership
Added file(s):
- pkg-plist <-- Have used pkg-plist, because Port Options for DOCS
Makefile changed:
Port is now safe with NOPORTDOCS=yes in /etc/make.conf
+LICENSE= GPLv3
-PLIST_FILES= bin/lcdtest
+OPTIONS_DEFINE= DOCS
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+= PORTDOCS=""
+.else
+PLIST_SUB+= PORTDOCS="@comment "
+.endif
Changed and refined:
do-install:
Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
portlint -A
looks fine.
port test: clean
>How-To-Repeat:
>Fix:
--- lcdtest-1.18_5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/lcdtest/Makefile ./Makefile
--- /usr/ports/graphics/lcdtest/Makefile 2013-01-14 17:57:07.000000000 +0100
+++ ./Makefile 2013-03-11 22:46:18.000000000 +0100
@@ -7,14 +7,15 @@
PORTNAME= lcdtest
PORTVERSION= 1.18
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= http://www.brouhaha.com/~eric/software/lcdtest/download/ \
- http://www.predatorlabs.net/dl/
+MASTER_SITES= http://www.brouhaha.com/~eric/software/lcdtest/download/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= nemysis@gmx.ch
COMMENT= LCD monitor test pattern generator
+LICENSE= GPLv3
+
RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
USE_SDL= sdl image ttf
@@ -22,13 +23,22 @@
CFLAGS+= -I${LOCALBASE}/include -DRELEASE=1.18
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lSDL -lSDL_image -lSDL_ttf
-PLIST_FILES= bin/lcdtest
PORTDOCS= README
MAN1= lcdtest.1
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+= PORTDOCS=""
+.else
+PLIST_SUB+= PORTDOCS="@comment "
+.endif
+
post-patch:
- ${REINPLACE_CMD} -e 's|/usr/share/fonts/liberation/|${LOCALBASE}/lib/X11/fonts/Liberation/|' \
+ @${REINPLACE_CMD} -e 's|/usr/share/fonts/liberation/|${LOCALBASE}/lib/X11/fonts/Liberation/|' \
${WRKSRC}/src/lcdtest.c
do-build:
@@ -36,11 +46,15 @@
(cd ${WRKSRC}/src && ${CC} ${LDFLAGS} -o lcdtest lcdtest.o)
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/lcdtest ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/man/lcdtest.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}/
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MAN1PREFIX}/man/man1/
+ ${INSTALL_DATA} ${WRKSRC}/desktop/${PORTNAME}.svg ${PREFIX}/share/pixmaps/
+ @${MKDIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/desktop/${PORTNAME}.desktop ${PREFIX}/share/applications/
+
+.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/lcdtest/pkg-descr ./pkg-descr
--- /usr/ports/graphics/lcdtest/pkg-descr 2013-01-14 17:57:07.000000000 +0100
+++ ./pkg-descr 2013-03-11 21:46:32.000000000 +0100
@@ -1,4 +1,4 @@
-lcdtest is a utility to display LCD monitor test patterns. It may be
+lcdtest is a utility to display LCD monitor test patterns. It may be
useful for adjusting the pixel clock frequency and phase on LCD
monitors when using analog inputs, and for finding pixels that are
stuck on or off.
diff -ruN --exclude=CVS /usr/ports/graphics/lcdtest/pkg-plist ./pkg-plist
--- /usr/ports/graphics/lcdtest/pkg-plist 1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-plist 2013-03-11 22:14:08.000000000 +0100
@@ -0,0 +1,6 @@
+bin/lcdtest
+share/applications/lcdtest.desktop
+%%PORTDOCS%%%%DOCSDIR%%/README
+share/pixmaps/lcdtest.svg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
--- lcdtest-1.18_5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130311215743.B12407A9>