On 2015/09/08 08:38, J. Scott Heppler wrote:
> Edd,
>
> The attached tarball has incorporated the following:
>
> 1. $OpenBSD$ cvs tag closed
> 2. 'VAR = val' assignments
> 3. Icon cache update
> 4. DESCR wrapped at 72 characters
> 5. Removed post-install comment
> 6. Removed SUBST_VARS = INSTDIR
snip from the Makefile ...
| GITLAB_PROJECT = tint2
| GITLAB_ACCOUNT = o9000
| GITLAB_TAG = v0.12.2
| GITLAB_COMMIT = dc300c021531f47cca336e15b50adf3b4a9bc9ae
| DISTNAME = ${GITLAB_PROJECT}-${GITLAB_TAG:S/v//}
| CATEGORIES = x11
| WRKDIST = ${WRKDIR}/${GITLAB_PROJECT}-${GITLAB_TAG}-${GITLAB_COMMIT}
| INSTDIR = ${PREFIX}/${GITLAB_PROJECT}
| #SUBST_VARS = INSTDIR
|
| HOMEPAGE = https://gitlab.com/${GITLAB_ACCOUNT}/${GITLAB_PROJECT}
|
| # GPLv2
|
| PERMIT_PACKAGE_CDROM = YES
| DISTFILES =
${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=${GITLAB_TAG}}
| MASTER_SITES =
https://gitlab.com/${GITLAB_ACCOUNT}/${GITLAB_PROJECT}/repository/
this is pretty ugly, and doesn't look much like our other ports.
We align things with tabs so they're a bit easier on the eye, and all
the indirection with variables makes it difficult to work out what's
going on, how about something like this?
V = 0.12.2
DISTNAME = tint2-$V
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
WRKDIST = ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
INSTDIR = ${PREFIX}/tint2
HOMEPAGE = https://gitlab.com/o9000/tint2/
# GPLv2
PERMIT_PACKAGE_CDROM = YES
MASTER_SITES = https://gitlab.com/o9000/tint2/repository/
> A question about the patch.
>
> I can see upstream wanting to update the icon cache for those who
> install directly from source and the projects need to insure the icon
> cache gets updated when install a package. The patch is a consequence
> of a SYSTRACE in make fake that showed the cache was updated 2x. The
> redundant icon cache update is benign - is it worth patching?
yes. "make fake" should not touch anything outside of the work directory.
> Lastly @pkgpath x11/tint was added but on local testing produced the
> following:
> >===> Installing tint2-0.12.2 from /usr/ports/packages/amd64/all/
> >Collision in tint2-0.12.2: the following files already exist
> > /usr/local/bin/tint2 (tint-0.11p6 and tint2-0.12.2)
> > /usr/local/bin/tint2conf (tint-0.11p6 and tint2-0.12.2)
> > /usr/local/man/man1/tint2.1 (tint-0.11p6 and tint2-0.12.2)
> > /usr/local/share/applications/tint2conf.desktop (tint-0.11p6 and
> > tint2-0.12.2)
> > /usr/local/share/doc/tint2/AUTHORS (tint-0.11p6 and tint2-0.12.2)
> > /usr/local/share/doc/tint2/ChangeLog (tint-0.11p6 and tint2-0.12.2)
> > /usr/local/share/tint2/default_icon.png (tint-0.11p6 and tint2-0.12.2)
> >*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1973
> >'/var/db/pkg/tint2-0.12.2/+CONTENTS': @if /usr/sbin/pkg_info -e
> >tint2-0.12.2...)
> >*** Error 1 in /usr/ports/x11/tint2
> >(/usr/ports/infrastructure/mk/bsd.port.mk:2488 'install')
>
> If x11/tint is removed via pkg_delete and x11/tint2 subsequently
> installed there are no problems.
The only supported update mechanism is to build new packages and point
pkg_add -u at them, "make install" and "make update" will not work
when changes like this are made. For changes like this where the stem
of the package name changes, you'll also need an entry in the quirks
package produced by ports/devel/quirks.
