ports/189789: [patch] sysutils/socklog STAGEify, fix build on 10+, other minor updates
Tony Morlan
tony at scroner.com
Wed May 14 01:30:00 UTC 2014
>Number: 189789
>Category: ports
>Synopsis: [patch] sysutils/socklog STAGEify, fix build on 10+, other minor updates
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed May 14 01:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tony Morlan
>Release: FreeBSD 10.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD jasper.scroner.com 10.0-RELEASE-p2 FreeBSD 10.0-RELEASE-p2 #0: Tue Apr 29 17:06:01 UTC 2014 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
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.
>How-To-Repeat:
>Fix:
Package building tested on
11.0-CURRENT #0 r264794,
10.0-RELEASE-p2, and
9.2-RELEASE-p5.
--- socklog-stage-docopt.patch begins here ---
Index: sysutils/socklog/Makefile
===================================================================
--- sysutils/socklog/Makefile (revision 354005)
+++ sysutils/socklog/Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= socklog
PORTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= http://smarden.org/socklog/
@@ -9,18 +10,21 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= Small and secure replacement for syslogd
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/package/COPYING
+
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}
-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
@@ -29,13 +33,14 @@
test:
cd ${WRKSRC} && package/check
+OPTIONS_DEFINE= DOCS
+
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}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MANPREFIX}/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>
Index: sysutils/socklog/pkg-plist
===================================================================
--- sysutils/socklog/pkg-plist (revision 354005)
+++ sysutils/socklog/pkg-plist (working copy)
@@ -3,22 +3,8 @@
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
--- socklog-stage-docopt.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list