Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 May 2014 09:39:01 +0300
From:      "Sergey V. Dyatko" <sergey.dyatko@gmail.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/190054: [PATCH] graphics/lua-gd stagify, new LIB_DEPENDS syntax
Message-ID:  <537c4a05.1f08.491888a3@laptop.minsk.domain>
Resent-Message-ID: <201405210750.s4L7o2r2023761@freefall.freebsd.org>

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

>Number:         190054
>Category:       ports
>Synopsis:       [PATCH] graphics/lua-gd stagify, new LIB_DEPENDS syntax
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 21 07:50:02 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Sergey V. Dyatko
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD laptop.minsk.domain 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r265903M: Mon May 12 13:33:54 FET 2014 root@laptop.minsk.domain:/usr/obj/usr/src/sys/b450 amd64
>Description:
* Use new LIB_DEPENDS syntax
* Stagify
>How-To-Repeat:
	
>Fix:

[tiger@laptop]:/<2>graphics/lua-gd>svn diff pkg-plist 
Index: pkg-plist
===================================================================
--- pkg-plist   (revision 354701)
+++ pkg-plist   (working copy)
@@ -1,4 +1,4 @@
-lib/lua/%%LUA_VER%%/gd.so
+%%LUA_MODLIBDIR%%/gd.so
 %%PORTDOCS%%%%DOCSDIR%%/cat.png
 %%PORTDOCS%%%%DOCSDIR%%/catdiff.png
 %%PORTDOCS%%%%DOCSDIR%%/catmsg.png

[tiger@laptop]:/<2>graphics/lua-gd>svn diff Makefile 
Index: Makefile
===================================================================
--- Makefile    (revision 354701)
+++ Makefile    (working copy)
@@ -12,7 +12,7 @@
 
 LICENSE=       MIT
 
-LIB_DEPENDS=   gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=   libgd.so:${PORTSDIR}/graphics/gd
 
 OPTIONS_DEFINE=        DOCS EXAMPLES
 
@@ -22,12 +22,9 @@
 LDFLAGS+=      -shared -L${LOCALBASE}/lib -lgd -L${LUA_LIBDIR} -llua -lm
 GDFEATURES=    `gdlib-config --features |sed -e "s/GD_/-DGD_/g"`
 
-NO_STAGE=      yes
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "amd64"
-CFLAGS+=       -fPIC
-.endif
+CFLAGS_amd64+= -fPIC
 
 do-build:
        ${CC} -o ${WRKSRC}/gd.so ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${GDFEATURES} ${WRKSRC}/luagd.c
@@ -35,19 +32,19 @@
 LUA_MODLIBDIR= ${PREFIX}/lib/lua/${LUA_VER}
 
 do-install:
-       ${MKDIR} ${LUA_MODLIBDIR}
-       ${INSTALL_PROGRAM} ${WRKSRC}/gd.so ${LUA_MODLIBDIR}
+       ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
+       ${INSTALL_PROGRAM} ${WRKSRC}/gd.so ${STAGEDIR}${LUA_MODLIBDIR}
        ${LUA_CMD} ${WRKSRC}/test_features.lua
 .if ${PORT_OPTIONS:MDOCS}
-       ${MKDIR} ${DOCSDIR}
-       cd ${WRKSRC}/doc/ && ${INSTALL_DATA} * ${DOCSDIR}/
-       @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}"
+       ${MKDIR} ${STAGEDIR}${DOCSDIR}
+       cd ${WRKSRC}/doc/ && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/
+       @${ECHO_MSG} "===> Documentation installed in ${STAGEDIR}${DOCSDIR}"
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-       ${MKDIR} ${EXAMPLESDIR}
-       cd ${WRKSRC}/demos && ${INSTALL_DATA} * ${EXAMPLESDIR}
-       @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}"
+       ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+       cd ${WRKSRC}/demos && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR}
+       @${ECHO_MSG} "===> Examples installed in ${STAGEDIR}${EXAMPLESDIR}"
 .endif
 
 .include <bsd.port.mk>

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?537c4a05.1f08.491888a3>