kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- update to 0.8.8

Browse source 
- changes:
  * integrate all our patches
  * more pkg-config compatibilities
This commit is contained in:
Baptiste Daroussin 2012-09-07 20:51:43 +00:00
parent 0b61befb1c
commit f31e05c516
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303825
4 changed files with 3 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/pkgconf/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= pkgconf
PORTVERSION= 0.8.7
PORTREVISION= 2
PORTVERSION= 0.8.8
CATEGORIES= devel
MASTER_SITES= http://tortois.es/~nenolod/distfiles/ \
http://files.etoilebsd.net/pkgconf/

4
devel/pkgconf/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (pkgconf-0.8.7.tar.bz2) = ee075e9d601e5d8582085fc662a619b34643550383c75f6aef37016ab99371f9
SIZE (pkgconf-0.8.7.tar.bz2) = 79823
SHA256 (pkgconf-0.8.8.tar.bz2) = 2fb87a0680b517daf8201573115873b923588883e71788935d24b34a1e9dc31e
SIZE (pkgconf-0.8.8.tar.bz2) = 80067

26
devel/pkgconf/files/patch-fix-crash-with-no-path-separators
View file

@ -1,26 +0,0 @@
--- pkg.c
+++ pkg.c
@@ -131,8 +131,8 @@
char *pathbuf;
strlcpy(buf, pkg->filename, sizeof buf);
- pathbuf = strrchr(buf, PKG_DIR_SEP_S);
- pathbuf[0] = '\0';
+ if ((pathbuf = strrchr(buf, PKG_DIR_SEP_S)) != NULL)
+ pathbuf[0] = '\0';
return buf;
}
@@ -154,8 +154,10 @@
pkg->vars = pkg_tuple_add(pkg->vars, "pcfiledir", pkg_get_parent_dir(pkg));
/* make module id */
- idptr = strrchr(pkg->filename, PKG_DIR_SEP_S);
- idptr++;
+ if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL)
+ idptr++;
+ else
+ idptr = pkg->filename;
pkg->id = strdup(idptr);
idptr = strrchr(pkg->id, '.');

125
devel/pkgconf/files/patch-fix-empy-libs-and-cflags
View file

@ -1,125 +0,0 @@
diff --git main.c main.c
index dcde276..d807bf3 100644
--- main.c
+++ main.c
@@ -306,15 +306,19 @@ static bool
apply_cflags(pkg_t *world, void *list_head, int maxdepth, unsigned int flags)
{
pkg_fragment_t **head = list_head;
- pkg_fragment_t *list;
+ int eflag;
- list = pkg_cflags(world, head, maxdepth, flags | PKGF_SEARCH_PRIVATE);
- if (list == NULL)
+ eflag = pkg_cflags(world, head, maxdepth, flags | PKGF_SEARCH_PRIVATE);
+ if (eflag != PKG_ERRF_OK)
return false;
- print_cflags(list);
+ if (*head == NULL)
+ return true;
+
+ print_cflags(*head);
+
+ pkg_fragment_free(*head);
- pkg_fragment_free(list);
return true;
}
@@ -322,14 +326,18 @@ static bool
apply_libs(pkg_t *world, void *list_head, int maxdepth, unsigned int flags)
{
pkg_fragment_t **head = list_head;
- pkg_fragment_t *list;
+ int eflag;
- list = pkg_libs(world, head, maxdepth, flags);
- if (list == NULL)
+ eflag = pkg_libs(world, head, maxdepth, flags);
+ if (eflag != PKG_ERRF_OK)
return false;
- print_libs(list);
- pkg_fragment_free(list);
+ if (*head == NULL)
+ return true;
+
+ print_libs(*head);
+
+ pkg_fragment_free(*head);
return true;
}
diff --git pkg.c pkg.c
index 8f0688d..c1667c3 100644
--- pkg.c
+++ pkg.c
@@ -853,7 +853,7 @@ pkg_cflags_collect(pkg_t *pkg, void *data, unsigned int flags)
*list = pkg_fragment_copy(*list, frag);
}
-pkg_fragment_t *
+int
pkg_cflags(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags)
{
int eflag;
@@ -863,10 +863,10 @@ pkg_cflags(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags)
if (eflag != PKG_ERRF_OK)
{
pkg_fragment_free(*list);
- return NULL;
+ *list = NULL;
}
- return *list;
+ return eflag;
}
static void
@@ -891,7 +891,7 @@ pkg_libs_private_collect(pkg_t *pkg, void *data, unsigned int flags)
*list = pkg_fragment_copy(*list, frag);
}
-pkg_fragment_t *
+int
pkg_libs(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags)
{
int eflag;
@@ -901,7 +901,8 @@ pkg_libs(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags)
if (eflag != PKG_ERRF_OK)
{
pkg_fragment_free(*list);
- return NULL;
+ *list = NULL;
+ return eflag;
}
if (flags & PKGF_MERGE_PRIVATE_FRAGMENTS)
@@ -910,9 +911,9 @@ pkg_libs(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags)
if (eflag != PKG_ERRF_OK)
{
pkg_fragment_free(*list);
- return NULL;
+ *list = NULL;
}
}
- return *list;
+ return eflag;
}
diff --git pkg.h pkg.h
index 3ddb2d1..1a3bf37 100644
--- pkg.h
+++ pkg.h
@@ -134,8 +134,8 @@ unsigned int pkg_verify_graph(pkg_t *root, int depth, unsigned int flags);
int pkg_compare_version(const char *a, const char *b);
pkg_t *pkg_verify_dependency(pkg_dependency_t *pkgdep, unsigned int flags, unsigned int *eflags);
const char *pkg_get_comparator(pkg_dependency_t *pkgdep);
-pkg_fragment_t *pkg_cflags(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags);
-pkg_fragment_t *pkg_libs(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags);
+int pkg_cflags(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags);
+int pkg_libs(pkg_t *root, pkg_fragment_t **list, int maxdepth, unsigned int flags);
/* parse.c */
pkg_t *pkg_new_from_file(const char *path, FILE *f);