diff options
| author | mat <mat@FreeBSD.org> | 2015-08-17 22:20:40 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-08-17 22:20:40 +0800 |
| commit | 92a3a7b1bca5423036bca4932e5384d3e51591bd (patch) | |
| tree | 16be3a9188cf2781563095e15839c170074dd7a7 /net-im | |
| parent | ed2992b93f898f5612b3952782ac7d9206ed029a (diff) | |
| download | freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.tar.gz freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.tar.zst freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.zip | |
Remove UNIQUENAME and LATEST_LINK.
UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.
Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.
Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)
Reviewed by: antoine, bapt
Exp-run by: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D3336
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/kmess-kde4/Makefile | 2 | ||||
| -rw-r--r-- | net-im/py-xmpppy-yahoo/Makefile | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile index 3970c0e8558b..f7650c940cd6 100644 --- a/net-im/kmess-kde4/Makefile +++ b/net-im/kmess-kde4/Makefile @@ -12,8 +12,6 @@ COMMENT= MSN Messenger client for KDE LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca -LATEST_LINK= ${PORTNAME}-kde4 - USE_GNOME= libxml2 libxslt USE_KDE4= kdeprefix kdelibs libkonq automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile index a9418d8c011c..c22ad2dc1f77 100644 --- a/net-im/py-xmpppy-yahoo/Makefile +++ b/net-im/py-xmpppy-yahoo/Makefile @@ -26,10 +26,10 @@ FILES= adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \ FILES_CURPHOO= YahooMD5.py __init__.py cpformat.py md5crypt.py pysha.py yahoo_fn.py PFILES= ${FILES:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/.} \ ${FILES_CURPHOO:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/curphoo/.} -PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${UNIQUENAME:S.-._.}.conf.sample +PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${PKGBASE:S.-._.}.conf.sample SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} BINDIR=${PYTHON_SITELIBDIR}/xmpp/yahoo \ JABBER_USER=${JABBER_USER} -USE_RC_SUBR= ${UNIQUENAME:S/-/_/} +USE_RC_SUBR= ${PKGBASE:S/-/_/} DDIR= ${PYTHON_SITELIBDIR}/xmpp/yahoo .include <bsd.port.options.mk> @@ -45,7 +45,7 @@ SUB_LIST+= JABBER_REQUIRE=jabberd post-patch: @${GREP} -lr '/usr/bin/env python' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin/env python|${PYTHON_CMD}|" - @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf|" \ + @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${PKGBASE:S.-._.}.conf|" \ -e 's|pid = ""|pid = "/var/jabberd/pid/PyYIMt.pid"|g' \ -e 's|spoolFile = "user.dbm"|spoolFile = "/var/spool/jabberd/yahoouser.dbm"|g' \ ${WRKSRC}/config.py @@ -60,7 +60,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/yahoo.py ${STAGEDIR}${DDIR}/ @${MKDIR} ${STAGEDIR}${DDIR}/curphoo ${INSTALL_DATA} ${FILES_CURPHOO:S.^.${WRKSRC}/curphoo/.} ${STAGEDIR}${DDIR}/curphoo/ - ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf.sample + ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${PKGBASE:S.-._.}.conf.sample ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} @${CHMOD} -R a-w ${STAGEDIR}${DDIR} |