Date: Sun, 17 Mar 2013 11:49:01 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/177050: [PATCH] graphics/s10sh: OptionsNG, fix install executable Message-ID: <20130317104909.A01828C3@hub.freebsd.org> Resent-Message-ID: <201303171050.r2HAo0eB081628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177050
>Category: ports
>Synopsis: [PATCH] graphics/s10sh: OptionsNG, fix install executable
>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: Sun Mar 17 10:50: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:
Makefile changed:
+PLIST_FILES= bin/${PORTNAME}
+PORTDOCS= README
+OPTIONS_DEFINE= USB
+.include <bsd.port.options.mk>
+do-install:
Changed and refined:
post-install:
files/Makefile.bsd
Removed file(s):
- pkg-plist
Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
portlint -A
looks fine.
port test: clean
>Fix:
--- s10sh-0.2.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/s10sh/Makefile ./Makefile
--- /usr/ports/graphics/s10sh/Makefile 2013-01-14 17:57:12.000000000 +0100
+++ ./Makefile 2013-03-17 11:43:37.000000000 +0100
@@ -1,12 +1,9 @@
-# New ports collection makefile for: s10sh
-# Date created: Tue Feb 27 00:16:34 MST 2001
-# Whom: John Reynolds <johnjen@reynoldsnet.org>
-#
+# Created by: John Reynolds <johnjen@reynoldsnet.org>
# $FreeBSD: head/graphics/s10sh/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
PORTNAME= s10sh
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.reynoldsnet.org/s10sh/ \
http://www.edwinh.org/s10sh/
@@ -19,20 +16,30 @@
MAKEFILE= ${FILESDIR}/Makefile.bsd
+PLIST_FILES= bin/${PORTNAME}
+
+PORTDOCS= README
+
+OPTIONS_DEFINE= USB
+
.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(NOUSB) || defined(WITHOUT_USB)
+.if ${OSVERSION} < 800069
+. if ${PORT_OPTIONS:MUSB}
+LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
+. else
MAKE_ENV+= WITHOUT_USB=YES
-.else
-. if ${OSVERSION} < 800069
-LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb
. endif
.endif
-.if !defined(NOPORTDOCS)
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+
post-install:
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/s10sh/files/Makefile.bsd ./files/Makefile.bsd
--- /usr/ports/graphics/s10sh/files/Makefile.bsd 2013-01-14 17:57:12.000000000 +0100
+++ ./files/Makefile.bsd 2013-03-17 11:24:57.000000000 +0100
@@ -1,5 +1,5 @@
PROG = s10sh
-NOMAN = oh...
+NO_MAN = oh...
SRCS = main.c crc.c serial.c common.c bar.c
diff -ruN --exclude=CVS /usr/ports/graphics/s10sh/pkg-plist ./pkg-plist
--- /usr/ports/graphics/s10sh/pkg-plist 2013-01-14 17:57:12.000000000 +0100
+++ ./pkg-plist 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-bin/s10sh
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- s10sh-0.2.2_1.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?20130317104909.A01828C3>