Date: Wed, 01 Jan 2014 13:04:20 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@freebsd.org Cc: wosch@FreeBSD.org Subject: ports/185380: [PATCH] sysutils/socket: fix StageDir Message-ID: <52C393C4.6070409@airport.fm> Resent-Message-ID: <201401010410.s014A0kC076227@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185380
>Category: ports
>Synopsis: [PATCH] sysutils/socket: fix StageDir
>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: Wed Jan 01 04:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Takefu
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p4 FreeBSD 8.4-RELEASE-p4 #0: Wed Sep 25 14:55:36 JST 2013
>Description:
fix StageDir
Port maintainer (wosch@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- socket-1.1_2.patch begins here ---
diff -ruN /usr/ports/sysutils/socket/Makefile ./Makefile
--- /usr/ports/sysutils/socket/Makefile 2013-09-21 08:05:58.000000000 +0900
+++ ./Makefile 2014-01-01 12:17:14.000000000 +0900
@@ -10,12 +10,19 @@
MAINTAINER= wosch@FreeBSD.org
COMMENT= Create TCP socket and connect to stdin/out
-MAKE_ENV+= SWITCHES="-DUSE_INET6 -DHAVE_SYS_PARAM_H -Wall"
-MAN1= socket.1
+LICENSE= GPLv1
+
+OPTIONS_DEFINE= DOCS
+
+MAKE_ENV+= SWITCHES="-DUSE_INET6 -DHAVE_SYS_PARAM_H -Wall"\
+ STAGEDIR=${STAGEDIR}
+
+.include <bsd.port.pre.mk>
-NO_STAGE= yes
post-install:
- @${MKDIR} ${DOCSDIR}/
- @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+.endif
.include <bsd.port.mk>
diff -ruN /usr/ports/sysutils/socket/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/sysutils/socket/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-Makefile 2014-01-01 12:22:33.000000000 +0900
@@ -0,0 +1,11 @@
+--- Makefile.orig 1992-09-10 23:59:31.000000000 +0900
++++ Makefile 2013-12-02 12:47:26.000000000 +0900
+@@ -13,7 +13,7 @@
+ INSTALLBINMODE = 755
+ INSTALLMANPATH = $(INSTALLBASE)/man
+ INSTALLMANMODE = 444
+-CC = cc
++#CC = ${CC}
+ CFLAGS = $(SWITCHES) -O
+ LDFLAGS = $(SWITCHES) -s
+
diff -ruN /usr/ports/sysutils/socket/files/patch-ab ./files/patch-ab
--- /usr/ports/sysutils/socket/files/patch-ab 2012-07-14 23:29:18.000000000 +0900
+++ ./files/patch-ab 2014-01-01 12:15:21.000000000 +0900
@@ -13,7 +13,7 @@
### socket.1 in /usr/local/man/man1/socket.1
### Make sure the target directories exist before doing a "make install".
-! INSTALLBASE = ${PREFIX}
+! INSTALLBASE = ${STAGEDIR}${PREFIX}
INSTALLBINPATH = $(INSTALLBASE)/bin
INSTALLBINMODE = 755
INSTALLMANPATH = $(INSTALLBASE)/man
diff -ruN /usr/ports/sysutils/socket/pkg-plist ./pkg-plist
--- /usr/ports/sysutils/socket/pkg-plist 2012-07-14 23:29:18.000000000 +0900
+++ ./pkg-plist 2014-01-01 12:36:26.000000000 +0900
@@ -1,3 +1,4 @@
bin/socket
-share/doc/socket/README
-@dirrm share/doc/socket
+man/man1/socket.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- socket-1.1_2.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?52C393C4.6070409>