Bug 177050 - [PATCH] graphics/s10sh: OptionsNG, fix install executable
Summary: [PATCH] graphics/s10sh: OptionsNG, fix install executable
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Beech Rintoul
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-17 10:50 UTC by nemysis
Modified: 2013-03-17 21:10 UTC (History)
0 users

See Also:

Attachments
s10sh-0.2.2_1.patch (2.03 KB, patch)
2013-03-17 10:50 UTC, nemysis 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-03-17 10:50:00 UTC 
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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-17 10:50:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->beech

beech@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-03-17 21:03:32 UTC 
Author: beech
Date: Sun Mar 17 21:03:17 2013
New Revision: 314496
URL: http://svnweb.freebsd.org/changeset/ports/314496

Log:
  - Fix install
  - Convert to OptionsNG
  - Bump portrevision
  
  PR:		ports/177050
  Submitted by:	nemysis <nemysis@gmx.ch>

Deleted:
  head/graphics/s10sh/pkg-plist
Modified:
  head/graphics/s10sh/Makefile   (contents, props changed)
  head/graphics/s10sh/files/Makefile.bsd   (contents, props changed)

Modified: head/graphics/s10sh/Makefile
==============================================================================
--- head/graphics/s10sh/Makefile	Sun Mar 17 21:00:25 2013	(r314495)
+++ head/graphics/s10sh/Makefile	Sun Mar 17 21:03:17 2013	(r314496)
@@ -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$
-#
 
 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 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exc
 
 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>

Modified: head/graphics/s10sh/files/Makefile.bsd
==============================================================================
--- head/graphics/s10sh/files/Makefile.bsd	Sun Mar 17 21:00:25 2013	(r314495)
+++ head/graphics/s10sh/files/Makefile.bsd	Sun Mar 17 21:03:17 2013	(r314496)
@@ -1,5 +1,5 @@
 PROG	=	s10sh
-NOMAN	=	oh...
+NO_MAN	=	oh...
 
 SRCS	=	main.c crc.c serial.c common.c bar.c
 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Beech Rintoul freebsd_committer freebsd_triage 2013-03-17 21:03:46 UTC 
State Changed
From-To: open->closed

Committed, Thanks!