Index: head/ports-mgmt/portfind/Makefile =================================================================== --- head/ports-mgmt/portfind/Makefile +++ head/ports-mgmt/portfind/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= portfind -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.6.3 CATEGORIES= ports-mgmt perl5 -MASTER_SITES= http://dynsoft.com/files/ +MASTER_SITES= http://gug-it.de/files/ -MAINTAINER= thorsten@dynsoft.com +MAINTAINER= thorsten@gug-it.de COMMENT= Search the ports tree LICENSE= BSD3CLAUSE @@ -17,6 +16,8 @@ USES= perl5 USE_PERL5= build +PLIST_FILES= bin/portfind man/man1/portfind.1.gz + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/portfind ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/portfind.1 ${STAGEDIR}${MANPREFIX}/man/man1 Index: head/ports-mgmt/portfind/distinfo =================================================================== --- head/ports-mgmt/portfind/distinfo +++ head/ports-mgmt/portfind/distinfo @@ -1,2 +1,3 @@ -SHA256 (portfind-1.6.1.tar.gz) = 18b80f94b62e6979d495ea428972f41549a0eaf634655388b8d7d2bb0772ecbe -SIZE (portfind-1.6.1.tar.gz) = 5334 +TIMESTAMP = 1465665383 +SHA256 (portfind-1.6.3.tar.gz) = 7587e024ab748e4d8e53ce29c364e5e9db08d83fef8f2ca62b23acc05bafde84 +SIZE (portfind-1.6.3.tar.gz) = 5504 Index: head/ports-mgmt/portfind/files/patch-portfind.c =================================================================== --- head/ports-mgmt/portfind/files/patch-portfind.c +++ head/ports-mgmt/portfind/files/patch-portfind.c @@ -1,80 +0,0 @@ ---- portfind.c.orig 2014-08-24 15:54:28 UTC -+++ portfind.c -@@ -103,20 +103,25 @@ int main(int argc, char **argv) { - return 0; - } - -+ char *filename; - char *release = get_release(); -+ - if(!release) { - fprintf(stderr, "Could not determine release\n"); - return 1; - } - -- char *filename = calloc(strlen(release) + strlen(INDEX_FILE) + 1, sizeof(char)); -- sprintf(filename, "%s%s", INDEX_FILE, release); -+ asprintf(&filename, INDEX_FILE "%s", release); -+ if (filename == NULL) { -+ fprintf(stderr, "Could not allocate memory for `filename`\n"); -+ return 1; -+ } - free(release); - - FILE *file = fopen(filename, "r"); - free(filename); - if(!file) { -- fprintf(stderr, "Could not open %s\n", INDEX_FILE); -+ fprintf(stderr, "Could not open %s\n", filename); - return 1; - } - -@@ -435,25 +440,32 @@ char *get_installed_version(const char * - return version; - } - --char *get_release() { -- size_t length = 0; -- sysctlbyname("kern.osrelease", NULL, &length, NULL, 0); -- if(length == 0) -- return NULL; -- -- char *release = calloc(length, sizeof(char)); -- char *version = calloc(length, sizeof(char)); -- char *tmp = version; -- sysctlbyname("kern.osrelease", release, &length, NULL, 0); -- char c = *release; -- while(c != '.' && c != '\0') { -- *tmp++ = c; -- c = *(++release); -- } -+char *get_release(void) { -+ char *first_dot, *release; -+ size_t length; - -+ release = NULL; -+ -+ if (sysctlbyname("kern.osrelease", NULL, &length, NULL, 0) == -1) -+ goto fail; -+ -+ if ((release = malloc(sizeof(char) * length)) == NULL) -+ goto fail; -+ -+ if (sysctlbyname("kern.osrelease", release, &length, NULL, 0) == -1) -+ goto fail; -+ -+ if ((first_dot = strchr(release, '.')) == NULL) -+ goto fail; -+ -+ *first_dot = '\0'; -+ -+ return release; -+ -+fail: - free(release); - -- return version; -+ return NULL; - } - - void help(const char *program) { Index: head/ports-mgmt/portfind/pkg-descr =================================================================== --- head/ports-mgmt/portfind/pkg-descr +++ head/ports-mgmt/portfind/pkg-descr @@ -1,3 +1,3 @@ Use portfind to search in the ports tree. -WWW: http://www.dynsoft.com +WWW: http://www.gug-it.de Index: head/ports-mgmt/portfind/pkg-plist =================================================================== --- head/ports-mgmt/portfind/pkg-plist +++ head/ports-mgmt/portfind/pkg-plist @@ -1,2 +0,0 @@ -bin/portfind -man/man1/portfind.1.gz