replace after-bsd.port.mk hack with PROPERTIES check, regen PLIST

This commit is contained in:
naddy 2016-03-15 21:12:06 +00:00
parent 2a66cfcdc9
commit bd903afdb8
3 changed files with 45 additions and 46 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2016/03/10 11:50:13 naddy Exp $
# $OpenBSD: Makefile,v 1.65 2016/03/15 21:12:06 naddy Exp $
BROKEN-arm = undefined reference to `__sync_fetch_and_add_4'
BROKEN-hppa = undefined reference to `__sync_fetch_and_add_4'
@ -7,7 +7,7 @@ BROKEN-sparc64 = infinite loop or aborts during build
COMMENT = Prolog for the real world
V = 6.6.4
REVISION = 6
REVISION = 7
DISTNAME = pl-$V
PKGNAME = swi-prolog-$V
CATEGORIES = lang
@ -72,11 +72,12 @@ post-install:
pre-test:
rm -f ${WRKBUILD}/src/Tests/core/test_resource_error.pl
.include <bsd.port.mk>
.include <bsd.port.arch.mk>
.for _m in ${MACHINE_ARCH}
. if !empty(LP64_ARCHS:M${_m})
.if ${PROPERTIES:Mlp64}
BOOT = boot64
. endif
.endfor
BOOT ?= boot32
.else
BOOT = boot32
.endif
.include <bsd.port.mk>

View File

@ -1,35 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.11 2014/04/04 17:53:49 edd Exp $
lib/swipl-${V}/lib/${FULLARCH}/cgi.so
lib/swipl-${V}/lib/${FULLARCH}/crypt.so
lib/swipl-${V}/lib/${FULLARCH}/double_metaphone.so
lib/swipl-${V}/lib/${FULLARCH}/files.so
lib/swipl-${V}/lib/${FULLARCH}/http_stream.so
lib/swipl-${V}/lib/${FULLARCH}/isub.so
lib/swipl-${V}/lib/${FULLARCH}/json.so
lib/swipl-${V}/lib/${FULLARCH}/libswipl.so
lib/swipl-${V}/lib/${FULLARCH}/memfile.so
lib/swipl-${V}/lib/${FULLARCH}/mime.so
lib/swipl-${V}/lib/${FULLARCH}/ntriples.so
lib/swipl-${V}/lib/${FULLARCH}/pdt_console.so
lib/swipl-${V}/lib/${FULLARCH}/pl2xpce.so
lib/swipl-${V}/lib/${FULLARCH}/porter_stem.so
lib/swipl-${V}/lib/${FULLARCH}/process.so
lib/swipl-${V}/lib/${FULLARCH}/protobufs.so
lib/swipl-${V}/lib/${FULLARCH}/rdf_db.so
lib/swipl-${V}/lib/${FULLARCH}/readutil.so
lib/swipl-${V}/lib/${FULLARCH}/rlimit.so
lib/swipl-${V}/lib/${FULLARCH}/sgml2pl.so
lib/swipl-${V}/lib/${FULLARCH}/sha4pl.so
lib/swipl-${V}/lib/${FULLARCH}/snowball.so
lib/swipl-${V}/lib/${FULLARCH}/socket.so
lib/swipl-${V}/lib/${FULLARCH}/ssl4pl.so
lib/swipl-${V}/lib/${FULLARCH}/streaminfo.so
lib/swipl-${V}/lib/${FULLARCH}/syslog.so
lib/swipl-${V}/lib/${FULLARCH}/table.so
lib/swipl-${V}/lib/${FULLARCH}/time.so
lib/swipl-${V}/lib/${FULLARCH}/turtle.so
lib/swipl-${V}/lib/${FULLARCH}/uid.so
lib/swipl-${V}/lib/${FULLARCH}/unicode4pl.so
lib/swipl-${V}/lib/${FULLARCH}/unix.so
lib/swipl-${V}/lib/${FULLARCH}/uri.so
lib/swipl-${V}/lib/${FULLARCH}/zlib4pl.so

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2015/05/22 11:31:16 ajacoutot Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.15 2016/03/15 21:12:07 naddy Exp $
bin/swipl
bin/swipl-ld
bin/swipl-rc
@ -54,8 +53,42 @@ lib/swipl-${V}/include/sicstus/
lib/swipl-${V}/include/sicstus/sicstus.h
lib/swipl-${V}/lib/
lib/swipl-${V}/lib/${FULLARCH}/
@lib lib/swipl-${V}/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
lib/swipl-${V}/lib/${FULLARCH}/cgi.so
lib/swipl-${V}/lib/${FULLARCH}/crypt.so
lib/swipl-${V}/lib/${FULLARCH}/double_metaphone.so
lib/swipl-${V}/lib/${FULLARCH}/files.so
lib/swipl-${V}/lib/${FULLARCH}/http_stream.so
lib/swipl-${V}/lib/${FULLARCH}/isub.so
lib/swipl-${V}/lib/${FULLARCH}/json.so
lib/swipl-${V}/lib/${FULLARCH}/libswipl.a
lib/swipl-${V}/lib/${FULLARCH}/libswipl.so
@lib lib/swipl-${V}/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
lib/swipl-${V}/lib/${FULLARCH}/memfile.so
lib/swipl-${V}/lib/${FULLARCH}/mime.so
lib/swipl-${V}/lib/${FULLARCH}/ntriples.so
lib/swipl-${V}/lib/${FULLARCH}/pdt_console.so
lib/swipl-${V}/lib/${FULLARCH}/pl2xpce.so
lib/swipl-${V}/lib/${FULLARCH}/porter_stem.so
lib/swipl-${V}/lib/${FULLARCH}/process.so
lib/swipl-${V}/lib/${FULLARCH}/protobufs.so
lib/swipl-${V}/lib/${FULLARCH}/rdf_db.so
lib/swipl-${V}/lib/${FULLARCH}/readutil.so
lib/swipl-${V}/lib/${FULLARCH}/rlimit.so
lib/swipl-${V}/lib/${FULLARCH}/sgml2pl.so
lib/swipl-${V}/lib/${FULLARCH}/sha4pl.so
lib/swipl-${V}/lib/${FULLARCH}/snowball.so
lib/swipl-${V}/lib/${FULLARCH}/socket.so
lib/swipl-${V}/lib/${FULLARCH}/ssl4pl.so
lib/swipl-${V}/lib/${FULLARCH}/streaminfo.so
lib/swipl-${V}/lib/${FULLARCH}/syslog.so
lib/swipl-${V}/lib/${FULLARCH}/table.so
lib/swipl-${V}/lib/${FULLARCH}/time.so
lib/swipl-${V}/lib/${FULLARCH}/turtle.so
lib/swipl-${V}/lib/${FULLARCH}/uid.so
lib/swipl-${V}/lib/${FULLARCH}/unicode4pl.so
lib/swipl-${V}/lib/${FULLARCH}/unix.so
lib/swipl-${V}/lib/${FULLARCH}/uri.so
lib/swipl-${V}/lib/${FULLARCH}/zlib4pl.so
lib/swipl-${V}/library/
lib/swipl-${V}/library/DTD/
lib/swipl-${V}/library/DTD/HTML4.dcl