Page MenuHomeFreeBSD

Make net-im/telepathy-qt5 a slaveport of net-im/telepathy-qt4
ClosedPublic

Authored by tcberner on Sep 15 2016, 11:57 AM.
Tags
None
Referenced Files
F83438575: D7898.id21060.diff
Fri, May 10, 2:22 PM
F83438573: D7898.id20366.diff
Fri, May 10, 2:22 PM
Unknown Object (File)
Fri, Apr 26, 6:46 AM
Unknown Object (File)
Mar 6 2024, 10:42 PM
Unknown Object (File)
Feb 26 2024, 7:24 AM
Unknown Object (File)
Feb 1 2024, 8:08 PM
Unknown Object (File)
Feb 1 2024, 8:08 PM
Unknown Object (File)
Jan 14 2024, 12:11 AM
Subscribers

Details

Summary

net-im/telepathy-qt4 and net-im/telepathy-qt5 had very similar Makefiles and
use the same distfile. So it makes sense to combine them into slaveports.

Test Plan

Tested in poudriere on 12-current (64), 10.3 (64) and 9.3 (32).

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

tcberner retitled this revision from to Make net-im/telepathy-qt5 a slaveport of net-im/telepathy-qt4.
tcberner updated this object.
tcberner edited the test plan for this revision. (Show Details)
tcberner added reviewers: rakuco, mat.
tcberner added a subscriber: adridg.
mat edited edge metadata.
This revision is now accepted and ready to land.Sep 15 2016, 3:17 PM
This revision was automatically updated to reflect the committed changes.
jbeich added inline comments.
head/net-im/telepathy-qt4/Makefile
32

This could have been expressed in a more declarative style e.g.,

# master
OPTIONS_SLAVE?=	QT4

QT4_USE=	QT4=corelib,dbus,...
QT4_PLIST_SUB=	SHLIB_SUFFIX=2

QT5_USE=	QT5=core,dbus,...
QT5_PLIST_SUB=	SHLIB_SUFFIX=0

# slave
OPTIONS_SLAVE=	QT5
59

Breaking statu quo requires PORTREVISION bump: /doc suffix is gone while /usr added.

$ svn up -r423331
$ make -V DOCSDIR
/usr/local/share/doc/telepathy-qt4

$ svn up -r423332
$ make -V DOCSDIR
/usr/local/usr/share/telepathy-qt4
head/net-im/telepathy-qt5/Makefile
2–4

Why keep this line? Master port already defines PORTNAME.

head/net-im/telepathy-qt4/Makefile
59

Yikes. You're completely right. That is wrong.

I'll provide a correct update as soon as I can.

This revision is now accepted and ready to land.Oct 5 2016, 11:39 AM
tcberner edited edge metadata.
tcberner edited the test plan for this revision. (Show Details)
  • Correct the value of DOCSDIR, and
  • remove redundant PORTNAME from telepathy-qt5/Makefile.
This revision now requires review to proceed.Oct 5 2016, 11:39 AM
jbeich edited edge metadata.
This revision is now accepted and ready to land.Oct 5 2016, 12:22 PM
rakuco edited edge metadata.
This revision was automatically updated to reflect the committed changes.