Bug 188390 - benchmarks/sysbench: Fails to stage if DOCS option is OFF
Summary: benchmarks/sysbench: Fails to stage if DOCS option is OFF
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: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-04-09 08:50 UTC by Alexey Markov
Modified: 2014-05-03 16:30 UTC (History)
0 users

See Also:

Attachments
file.diff (330 bytes, patch)
2014-04-09 08:50 UTC, Alexey Markov 		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 Alexey Markov 2014-04-09 08:50:00 UTC 
Building a benchmarks/sysbench port fails if a DOCS option is OFF because of not considering a stage subdirectory while trying to delete a manual.html file.

Fix: Apply attached patch.

Patch attached with submission follows:
How-To-Repeat: Just try to build a benchmarks/sysbench port while a DOCS option is OFF.
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2014-05-03 16:04:07 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-05-03 16:24:05 UTC 
Author: pawel
Date: Sat May  3 15:24:02 2014
New Revision: 352920
URL: http://svnweb.freebsd.org/changeset/ports/352920
QAT: https://qat.redports.org/buildarchive/r352920/

Log:
  - Fix staging when DOCS=off [1]
  - Switch to PLIST_FILES
  - Use options helpers
  
  PR:		ports/188390 [1] (patch not used)
  Submitted by:	Alexey Markov <redrat@mail.ru>

Deleted:
  head/benchmarks/sysbench/pkg-plist
Modified:
  head/benchmarks/sysbench/Makefile

Modified: head/benchmarks/sysbench/Makefile
==============================================================================
--- head/benchmarks/sysbench/Makefile	Sat May  3 15:11:29 2014	(r352919)
+++ head/benchmarks/sysbench/Makefile	Sat May  3 15:24:02 2014	(r352920)
@@ -15,40 +15,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_AUTOTOOLS=	libtool
 
+PLIST_FILES=	bin/sysbench
+PORTDOCS=	manual.html
+
 OPTIONS_DEFINE=	LARGEFILE MYSQL PGSQL DOCS
 OPTIONS_DEFAULT=	LARGEFILE MYSQL
-LARGEFILE_DESC=	Enable Largefile support
 
-.include <bsd.port.options.mk>
+LARGEFILE_DESC=			Largefile support
+LARGEFILE_CONFIGURE_ENABLE=	largefile
 
-.if ${PORT_OPTIONS:MLARGEFILE}
-CONFIGURE_ARGS+=	--enable-largefile
-.else
-CONFIGURE_ARGS+=	--disable-largefile
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-mysql
-.else
-CONFIGURE_ARGS+=	--with-mysql=no
-.endif
-
-.if ${PORT_OPTIONS:MPOSTGRESQL}
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=	--with-pgsql
-.else
-CONFIGURE_ARGS+=	--with-pgsql=no
-.endif
+MYSQL_CONFIGURE_ON=	--with-mysql
+MYSQL_CONFIGURE_OFF=	--with-mysql=no
+MYSQL_USE=		MYSQL=yes
+
+PGSQL_CONFIGURE_ON=	--with-pgsql
+PGSQL_CONFIGURE_OFF=	--with-pgsql=no
+PGSQL_USE=		PGSQL=yes
 
 post-configure:
 	@${REINPLACE_CMD} -e 's/^program_transform_name/#/' \
 		${WRKSRC}/Makefile ${WRKSRC}/sysbench/Makefile
 
-.if empty(PORT_OPTIONS:MDOCS)
-post-install:
-	${RM} ${DOCSDIR}/manual.html
-	${RMDIR} ${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
_______________________________________________
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 Pawel Pekala freebsd_committer freebsd_triage 2014-05-03 16:24:17 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!