Bug 189789 - [patch] sysutils/socklog STAGEify, fix build on 10+, other minor updates
Summary: [patch] sysutils/socklog STAGEify, fix build on 10+, other minor updates
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: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-14 02:30 UTC by Tony Morlan
Modified: 2014-05-14 14:10 UTC (History)
0 users

See Also:

Attachments
socklog-stage-docopt.patch (2.88 KB, patch)
2014-05-14 02:30 UTC, Tony Morlan 		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 Tony Morlan 2014-05-14 02:30:00 UTC 
Attached patch does:
STAGEify,
in do-configure make the build scripts not to explicitly call gcc to link,
add LICENSE section, and
add a DOC option.

Fix: Package building tested on
11.0-CURRENT #0 r264794,
10.0-RELEASE-p2, and
9.2-RELEASE-p5.
Comment 1 Dmitry Marakasov freebsd_committer freebsd_triage 2014-05-14 14:02:26 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-05-14 14:02:26 UTC 
Author: amdmi3
Date: Wed May 14 13:02:17 2014
New Revision: 354051
URL: http://svnweb.freebsd.org/changeset/ports/354051
QAT: https://qat.redports.org/buildarchive/r354051/

Log:
  - Support staging
  - Add LICENSE
  - Fix build on 10+
  - Add OPTIONS
  
  PR:		189789
  Submitted by:	Tony Morlan <tony@scroner.com>

Modified:
  head/sysutils/socklog/Makefile
  head/sysutils/socklog/pkg-plist

Modified: head/sysutils/socklog/Makefile
==============================================================================
--- head/sysutils/socklog/Makefile	Wed May 14 12:43:59 2014	(r354050)
+++ head/sysutils/socklog/Makefile	Wed May 14 13:02:17 2014	(r354051)
@@ -3,24 +3,29 @@
 
 PORTNAME=	socklog
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://smarden.org/socklog/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small and secure replacement for syslogd
 
+LICENSE=	BSD3CLAUSE
+
 RUN_DEPENDS=	${LOCALBASE}/sbin/chpst:${PORTSDIR}/sysutils/runit
 
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 ALL_TARGET=	default
 
-MAN1=		tryto.1 uncat.1
-MAN8=		socklog-check.8 socklog-conf.8 socklog.8
-DOCS=		package/CHANGES package/COPYING package/README doc/*.html
+TEXTDOCS=	CHANGES COPYING README
+HTMLDOCS=	*.html
+PORTDOCS=	${TEXTDOCS} ${HTMLDOCS}
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-configure:
 	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
+	${ECHO_CMD} "${CC} -s ${LDFLAGS}" > ${WRKSRC}/src/conf-ld
 
 do-build:
 	cd ${WRKSRC} && package/compile
@@ -30,12 +35,11 @@ test:
 	cd ${WRKSRC} && package/check
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${MANPREFIX}/man/man8
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/package/,} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${HTMLDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/socklog/pkg-plist
==============================================================================
--- head/sysutils/socklog/pkg-plist	Wed May 14 12:43:59 2014	(r354050)
+++ head/sysutils/socklog/pkg-plist	Wed May 14 13:02:17 2014	(r354051)
@@ -3,22 +3,8 @@ bin/socklog-conf
 bin/socklog
 bin/tryto
 bin/uncat
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/benefits.html
-%%PORTDOCS%%%%DOCSDIR%%/configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/network.html
-%%PORTDOCS%%%%DOCSDIR%%/notify.html
-%%PORTDOCS%%%%DOCSDIR%%/readme.solaris.html
-%%PORTDOCS%%%%DOCSDIR%%/socklog-check.8.html
-%%PORTDOCS%%%%DOCSDIR%%/socklog-conf.8.html
-%%PORTDOCS%%%%DOCSDIR%%/socklog.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tryto.1.html
-%%PORTDOCS%%%%DOCSDIR%%/uncat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
-%%PORTDOCS%%%%DOCSDIR%%/usedietlibc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+man/man1/tryto.1.gz
+man/man1/uncat.1.gz
+man/man8/socklog-check.8.gz
+man/man8/socklog-conf.8.gz
+man/man8/socklog.8.gz
_______________________________________________
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"