Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 02:50:14 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/184842: net/netscript: Fix build on -current
Message-ID:  <20131217025014.a3516b7c1d050e38e96ecc1f@yahoo.com>
Resent-Message-ID: <201312161810.rBGIABwF016117@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         184842
>Category:       ports
>Synopsis:       net/netscript: Fix build on -current
>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:   Mon Dec 16 18:10:10 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Support PLIST_FILES

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net/netscript/Makefile net/netscript/Makefile
--- /usr/ports/net/netscript/Makefile	2013-11-06 21:53:02.000000000 +0900
+++ net/netscript/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -3,41 +3,47 @@
 
 PORTNAME=	netscript
 PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF \
 		http://fakehalo.deadpig.org/%SUBDIR%/
-
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable/multi-platform lightweight TCP socket scripting
 
-WANT_GNOME=	yes
+OPTIONS_DEFINE=	GTK1
+
+USES=		ncurses
+
+CFLAGS+=	-DNCURSES -DARPA -DBSD_T -Wl,--export-dynamic
+LDFLAGS+=	-lcurses
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/netscript
 
-.if ${HAVE_GNOME:Mgtk12}!=""
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGTK1}
 USE_GNOME+=	gtk12
-PKGNAMESUFFIX=	-gtk
-ALL_TARGET=	gbsd
-.else
-ALL_TARGET=	bsd
+CFLAGS+=	-DGTK
+CPPFLAGS+=	$$(${GTK_CONFIG:T} --cflags gthread)
+LDFLAGS+=	$$(${GTK_CONFIG:T} --libs gthread)
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
+do-build:
+	(cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} netscript.c \
+		-o netscript ${LDFLAGS})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/netscript ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	@${CHMOD} -R og+r ${EXAMPLESDIR}
-	@${CHMOD} og+x ${EXAMPLESDIR}/gui ${EXAMPLESDIR}/ncurses
-.endif
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} netscript \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README \
+		${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/net/netscript/pkg-plist net/netscript/pkg-plist
--- /usr/ports/net/netscript/pkg-plist	2013-11-06 21:53:02.000000000 +0900
+++ net/netscript/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,28 +0,0 @@
-bin/netscript
-%%PORTDOCS%%share/doc/netscript/README
-%%PORTDOCS%%share/examples/netscript/README
-%%PORTDOCS%%share/examples/netscript/dict.ruleset
-%%PORTDOCS%%share/examples/netscript/extern.ruleset
-%%PORTDOCS%%share/examples/netscript/fingerd.ruleset
-%%PORTDOCS%%share/examples/netscript/ftp.ruleset
-%%PORTDOCS%%share/examples/netscript/gui/README
-%%PORTDOCS%%share/examples/netscript/gui/gdict.ruleset
-%%PORTDOCS%%share/examples/netscript/gui/gidentd.ruleset
-%%PORTDOCS%%share/examples/netscript/http.ruleset
-%%PORTDOCS%%share/examples/netscript/httpd.ruleset
-%%PORTDOCS%%share/examples/netscript/identd.ruleset
-%%PORTDOCS%%share/examples/netscript/irc.ruleset
-%%PORTDOCS%%share/examples/netscript/irc2.ruleset
-%%PORTDOCS%%share/examples/netscript/ncurses/README
-%%PORTDOCS%%share/examples/netscript/ncurses/nfingerd.ruleset
-%%PORTDOCS%%share/examples/netscript/ncurses/nidentd.ruleset
-%%PORTDOCS%%share/examples/netscript/ncurses/nirc.ruleset
-%%PORTDOCS%%share/examples/netscript/pop3.ruleset
-%%PORTDOCS%%share/examples/netscript/quake.ruleset
-%%PORTDOCS%%share/examples/netscript/smtp.ruleset
-%%PORTDOCS%%share/examples/netscript/telnet.ruleset
-%%PORTDOCS%%share/examples/netscript/telnetd.ruleset
-%%PORTDOCS%%@dirrm share/doc/netscript
-%%PORTDOCS%%@dirrm share/examples/netscript/gui
-%%PORTDOCS%%@dirrm share/examples/netscript/ncurses
-%%PORTDOCS%%@dirrm share/examples/netscript
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217025014.a3516b7c1d050e38e96ecc1f>