diff options
author | wiz <wiz@pkgsrc.org> | 2012-08-24 15:20:18 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2012-08-24 15:20:18 +0000 |
commit | 9c90607eec01406198275c7d7a6f6a4db94afb3c (patch) | |
tree | df4f3de776e2f8b1e5315f6e4e8deb569c8a1ea3 /x11 | |
parent | 0aa01755415595a99f9bdc9ab17109edc4f960ff (diff) | |
download | pkgsrc-9c90607eec01406198275c7d7a6f6a4db94afb3c.tar.gz |
Switch to modular xorg version of xcursorgen.
1.0.5:
This minor maintenance release fixes compiler warnings and improves
build configuration.
Alan Coopersmith (5):
Strip trailing whitespace
Remove old XFree86 CVS id
Add const attributes to fix gcc -Wwrite-strings warnings
Fix -image argument parsing to not shadow "i" variable
xcursorgen 1.0.5
Gaetan Nadon (2):
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
config: move man pages into their own directory
1.0.4:
This minor maintenance release allows building with libpng 1.4 & later,
and includes the usual round of recent build improvements & janitorial
cleanups.
Alan Coopersmith (2):
config: Remove unnecessary calls from configure.ac
xcursorgen 1.0.4
Cody Maloney (1):
Upgraded to work with libpng14
Gaetan Nadon (6):
Makefile.am: do not include autogen.sh in distribution #24183
.gitignore: use common defaults with custom section # 24239
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
config: update AC_PREREQ statement to 2.60
Yaakov Selkowitz (2):
Remove INSTALL from git
Use AC_PROG_SED and MAN_SUBSTS in macros-1.8
1.0.3:
Minor janitorial release of the application to prepare X cursor sets for
use with libXcursor.
Alan Coopersmith (3):
Add README with pointers to mailing lists, bugzilla, & git
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
xcursorgen 1.0.3
Paulo Cesar Pereira de Andrade (1):
Ansification and compile warning fixes.
1.0.2:
Alan Coopersmith:
Coverity #621: RESOURCE_LEAK: Returned without freeing storage "curr"
renamed: .cvsignore -> .gitignore
Coverity #624: RESOURCE_LEAK: Returned without freeing storage "fp"
Change xcursorgen_CFLAGS to AM_CFLAGS to make automake-1.10 happier
Replace static ChangeLog with dist-hook to generate from git log
Use PACKAGE_VERSION for --version output
Remove unused AC_TYPE_SIGNAL from configure.ac
Add options/flags to man page & other man page cleanups
Correct help flag in usage message (-?, not -h)
Use strdup instead of malloc/strlen/strcpy
Set version string in man page
Version bump: 1.0.2
1.0.1:
Bug #3270: Fix rounding errors.
Technically, this is a downgrade of the version number, but I don't really
care and I hope noone else does either.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xcursorgen/DESCR | 7 | ||||
-rw-r--r-- | x11/xcursorgen/Makefile | 30 | ||||
-rw-r--r-- | x11/xcursorgen/PLIST | 157 | ||||
-rw-r--r-- | x11/xcursorgen/distinfo | 12 | ||||
-rw-r--r-- | x11/xcursorgen/patches/patch-aa | 13 | ||||
-rw-r--r-- | x11/xcursorgen/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/xcursorgen/patches/patch-ac | 13 | ||||
-rw-r--r-- | x11/xcursorgen/patches/patch-xcursorgen.c | 15 |
8 files changed, 18 insertions, 242 deletions
diff --git a/x11/xcursorgen/DESCR b/x11/xcursorgen/DESCR index ef435e2ccb9..1f20640cfb7 100644 --- a/x11/xcursorgen/DESCR +++ b/x11/xcursorgen/DESCR @@ -1,6 +1,3 @@ -xcursorgen - create an X cursor file from a collection of PNG images +xcursorgen prepares X11 cursor sets for use with libXcursor. -Xcursorgen reads the config-file to find the list of cursor images -along with their hotspot and nominal size information. Xcursorgen -converts all of the images to Xcursor format and writes them to the -output-file. +This is from the modular X.org project. diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile index 56aa550a4d8..d38bbfe8bdd 100644 --- a/x11/xcursorgen/Makefile +++ b/x11/xcursorgen/Makefile @@ -1,30 +1,20 @@ -# $NetBSD: Makefile,v 1.22 2011/01/13 13:40:07 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2012/08/24 15:20:18 wiz Exp $ -DISTNAME= xcursorgen-4.3.0 -PKGREVISION= 6 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_LOCAL} +DISTNAME= xcursorgen-1.0.5 +CATEGORIES= x11 graphics +MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 -MAINTAINER= xsrc-manager@NetBSD.org -HOMEPAGE= http://www.xfree86.org/ -COMMENT= Create an X cursor file from a collection of PNG images +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://cgit.freedesktop.org/xorg/app/xcursorgen/ +COMMENT= Prepare X11 cursor sets for use with libXcursor PKG_DESTDIR_SUPPORT= user-destdir -MAKE_JOBS_SAFE= no - -WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*//} -USE_IMAKE= YES - -LIBPNG= -L${BUILDLINK_PREFIX.png}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.png}/lib \ - -lpng - -MAKE_FLAGS+= LIBPNGLIB=${LIBPNG:Q} +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xcursorgen/PLIST b/x11/xcursorgen/PLIST index 7ad2fe5ad4c..ef97b6d954f 100644 --- a/x11/xcursorgen/PLIST +++ b/x11/xcursorgen/PLIST @@ -1,156 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:10 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/08/24 15:20:18 wiz Exp $ bin/xcursorgen -lib/X11/icons/default/index.theme -lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd -lib/X11/icons/handhelds/cursors/X_cursor -lib/X11/icons/handhelds/cursors/arrow -lib/X11/icons/handhelds/cursors/based_arrow_down -lib/X11/icons/handhelds/cursors/based_arrow_up -lib/X11/icons/handhelds/cursors/bottom_left_corner -lib/X11/icons/handhelds/cursors/bottom_right_corner -lib/X11/icons/handhelds/cursors/bottom_side -lib/X11/icons/handhelds/cursors/bottom_tee -lib/X11/icons/handhelds/cursors/center_ptr -lib/X11/icons/handhelds/cursors/circle -lib/X11/icons/handhelds/cursors/cross -lib/X11/icons/handhelds/cursors/cross_reverse -lib/X11/icons/handhelds/cursors/crosshair -lib/X11/icons/handhelds/cursors/dot -lib/X11/icons/handhelds/cursors/dotbox -lib/X11/icons/handhelds/cursors/double_arrow -lib/X11/icons/handhelds/cursors/draft_large -lib/X11/icons/handhelds/cursors/draft_small -lib/X11/icons/handhelds/cursors/draped_box -lib/X11/icons/handhelds/cursors/fleur -lib/X11/icons/handhelds/cursors/gumby -lib/X11/icons/handhelds/cursors/hand2 -lib/X11/icons/handhelds/cursors/left_ptr -lib/X11/icons/handhelds/cursors/left_ptr_watch -lib/X11/icons/handhelds/cursors/left_side -lib/X11/icons/handhelds/cursors/left_tee -lib/X11/icons/handhelds/cursors/ll_angle -lib/X11/icons/handhelds/cursors/pencil -lib/X11/icons/handhelds/cursors/plus -lib/X11/icons/handhelds/cursors/right_ptr -lib/X11/icons/handhelds/cursors/right_side -lib/X11/icons/handhelds/cursors/right_tee -lib/X11/icons/handhelds/cursors/sb_h_double_arrow -lib/X11/icons/handhelds/cursors/sb_right_arrow -lib/X11/icons/handhelds/cursors/sb_up_arrow -lib/X11/icons/handhelds/cursors/sb_v_double_arrow -lib/X11/icons/handhelds/cursors/shuttle -lib/X11/icons/handhelds/cursors/tcross -lib/X11/icons/handhelds/cursors/top_left_arrow -lib/X11/icons/handhelds/cursors/top_left_corner -lib/X11/icons/handhelds/cursors/top_right_corner -lib/X11/icons/handhelds/cursors/top_side -lib/X11/icons/handhelds/cursors/top_tee -lib/X11/icons/handhelds/cursors/watch -lib/X11/icons/handhelds/cursors/xterm -lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd -lib/X11/icons/redglass/cursors/X_cursor -lib/X11/icons/redglass/cursors/arrow -lib/X11/icons/redglass/cursors/based_arrow_down -lib/X11/icons/redglass/cursors/based_arrow_up -lib/X11/icons/redglass/cursors/bottom_left_corner -lib/X11/icons/redglass/cursors/bottom_right_corner -lib/X11/icons/redglass/cursors/bottom_side -lib/X11/icons/redglass/cursors/bottom_tee -lib/X11/icons/redglass/cursors/center_ptr -lib/X11/icons/redglass/cursors/circle -lib/X11/icons/redglass/cursors/cross -lib/X11/icons/redglass/cursors/cross_reverse -lib/X11/icons/redglass/cursors/crosshair -lib/X11/icons/redglass/cursors/dot -lib/X11/icons/redglass/cursors/dotbox -lib/X11/icons/redglass/cursors/double_arrow -lib/X11/icons/redglass/cursors/draft_large -lib/X11/icons/redglass/cursors/draft_small -lib/X11/icons/redglass/cursors/draped_box -lib/X11/icons/redglass/cursors/fleur -lib/X11/icons/redglass/cursors/gumby -lib/X11/icons/redglass/cursors/hand2 -lib/X11/icons/redglass/cursors/left_ptr -lib/X11/icons/redglass/cursors/left_ptr_watch -lib/X11/icons/redglass/cursors/left_side -lib/X11/icons/redglass/cursors/left_tee -lib/X11/icons/redglass/cursors/ll_angle -lib/X11/icons/redglass/cursors/pencil -lib/X11/icons/redglass/cursors/plus -lib/X11/icons/redglass/cursors/right_ptr -lib/X11/icons/redglass/cursors/right_side -lib/X11/icons/redglass/cursors/right_tee -lib/X11/icons/redglass/cursors/sb_h_double_arrow -lib/X11/icons/redglass/cursors/sb_right_arrow -lib/X11/icons/redglass/cursors/sb_up_arrow -lib/X11/icons/redglass/cursors/sb_v_double_arrow -lib/X11/icons/redglass/cursors/shuttle -lib/X11/icons/redglass/cursors/tcross -lib/X11/icons/redglass/cursors/top_left_arrow -lib/X11/icons/redglass/cursors/top_left_corner -lib/X11/icons/redglass/cursors/top_right_corner -lib/X11/icons/redglass/cursors/top_side -lib/X11/icons/redglass/cursors/top_tee -lib/X11/icons/redglass/cursors/watch -lib/X11/icons/redglass/cursors/xterm -lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd -lib/X11/icons/whiteglass/cursors/X_cursor -lib/X11/icons/whiteglass/cursors/arrow -lib/X11/icons/whiteglass/cursors/base_arrow_down -lib/X11/icons/whiteglass/cursors/base_arrow_up -lib/X11/icons/whiteglass/cursors/boat -lib/X11/icons/whiteglass/cursors/bottom_left_corner -lib/X11/icons/whiteglass/cursors/bottom_right_corner -lib/X11/icons/whiteglass/cursors/bottom_side -lib/X11/icons/whiteglass/cursors/bottom_tee -lib/X11/icons/whiteglass/cursors/center_ptr -lib/X11/icons/whiteglass/cursors/circle -lib/X11/icons/whiteglass/cursors/cross -lib/X11/icons/whiteglass/cursors/cross_reverse -lib/X11/icons/whiteglass/cursors/crosshair -lib/X11/icons/whiteglass/cursors/dot -lib/X11/icons/whiteglass/cursors/dot_box_mask -lib/X11/icons/whiteglass/cursors/double_arrow -lib/X11/icons/whiteglass/cursors/draft_large -lib/X11/icons/whiteglass/cursors/draft_small -lib/X11/icons/whiteglass/cursors/draped_box -lib/X11/icons/whiteglass/cursors/exchange -lib/X11/icons/whiteglass/cursors/fleur -lib/X11/icons/whiteglass/cursors/gumby -lib/X11/icons/whiteglass/cursors/hand1 -lib/X11/icons/whiteglass/cursors/hand2 -lib/X11/icons/whiteglass/cursors/left_ptr -lib/X11/icons/whiteglass/cursors/left_ptr_watch -lib/X11/icons/whiteglass/cursors/left_side -lib/X11/icons/whiteglass/cursors/left_tee -lib/X11/icons/whiteglass/cursors/ll_angle -lib/X11/icons/whiteglass/cursors/lr_angle -lib/X11/icons/whiteglass/cursors/pencil -lib/X11/icons/whiteglass/cursors/pirate -lib/X11/icons/whiteglass/cursors/plus -lib/X11/icons/whiteglass/cursors/question_arrow -lib/X11/icons/whiteglass/cursors/right_ptr -lib/X11/icons/whiteglass/cursors/right_side -lib/X11/icons/whiteglass/cursors/right_tee -lib/X11/icons/whiteglass/cursors/sailboat -lib/X11/icons/whiteglass/cursors/sb_down_arrow -lib/X11/icons/whiteglass/cursors/sb_h_double_arrow -lib/X11/icons/whiteglass/cursors/sb_left_arrow -lib/X11/icons/whiteglass/cursors/sb_right_arrow -lib/X11/icons/whiteglass/cursors/sb_up_arrow -lib/X11/icons/whiteglass/cursors/sb_v_double_arrow -lib/X11/icons/whiteglass/cursors/shuttle -lib/X11/icons/whiteglass/cursors/sizing -lib/X11/icons/whiteglass/cursors/target -lib/X11/icons/whiteglass/cursors/tcross -lib/X11/icons/whiteglass/cursors/top_left_arrow -lib/X11/icons/whiteglass/cursors/top_left_corner -lib/X11/icons/whiteglass/cursors/top_right_corner -lib/X11/icons/whiteglass/cursors/top_side -lib/X11/icons/whiteglass/cursors/top_tee -lib/X11/icons/whiteglass/cursors/trek -lib/X11/icons/whiteglass/cursors/ul_angle -lib/X11/icons/whiteglass/cursors/ur_angle -lib/X11/icons/whiteglass/cursors/watch -lib/X11/icons/whiteglass/cursors/xterm -${IMAKE_MAN_DIR}/xcursorgen.${IMAKE_MANNEWSUFFIX} +man/man1/xcursorgen.1 diff --git a/x11/xcursorgen/distinfo b/x11/xcursorgen/distinfo index e6907676d02..9570ef92696 100644 --- a/x11/xcursorgen/distinfo +++ b/x11/xcursorgen/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.3 2011/04/05 11:06:59 wiz Exp $ +$NetBSD: distinfo,v 1.4 2012/08/24 15:20:18 wiz Exp $ -SHA1 (xcursorgen-4.3.0.tar.bz2) = ade20086c9122d47da82deaeb2707b720e72b735 -RMD160 (xcursorgen-4.3.0.tar.bz2) = 2daa61f0781db6d775b01d6b6fd627e8c0931919 -Size (xcursorgen-4.3.0.tar.bz2) = 2195176 bytes -SHA1 (patch-aa) = 8eb4d1783b747f3212daeee7d3907b1862d8320c -SHA1 (patch-ab) = 56c7d3e860c14cc7a18c90865847ecf271df438c -SHA1 (patch-ac) = 31151a77830170cccbd1f33be83d1157bfd4344a -SHA1 (patch-xcursorgen.c) = 11d3b0d12872db2d0beadb1622c12e1b61a2626f +SHA1 (xcursorgen-1.0.5.tar.bz2) = 1d0ca82422d328522b06b218f86b5901a7d5521b +RMD160 (xcursorgen-1.0.5.tar.bz2) = a118d0f4191ad3073b5e0e401a9ca547907460a5 +Size (xcursorgen-1.0.5.tar.bz2) = 116340 bytes diff --git a/x11/xcursorgen/patches/patch-aa b/x11/xcursorgen/patches/patch-aa deleted file mode 100644 index fdb4765ad74..00000000000 --- a/x11/xcursorgen/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/03/08 08:25:31 tron Exp $ - ---- handhelds/Imakefile.orig 2003-02-28 14:19:21.000000000 +0100 -+++ handhelds/Imakefile 2003-03-08 08:49:40.000000000 +0100 -@@ -11,7 +11,7 @@ - all:: name @@\ - @@\ - name: name.cfg CursorSources(name) @@\ -- $(XCURSORGEN) -p $(PNGDIR) name.cfg name @@\ -+ ../xcursorgen -p $(PNGDIR) name.cfg name @@\ - @@\ - clean:: @@\ - $(RM) name @@\ diff --git a/x11/xcursorgen/patches/patch-ab b/x11/xcursorgen/patches/patch-ab deleted file mode 100644 index 7b96af96d25..00000000000 --- a/x11/xcursorgen/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/03/08 08:25:31 tron Exp $ - ---- redglass/Imakefile.orig 2003-02-28 14:19:21.000000000 +0100 -+++ redglass/Imakefile 2003-03-08 08:50:58.000000000 +0100 -@@ -26,7 +26,7 @@ - all:: name @@\ - @@\ - name: name.cfg source @@\ -- $(XCURSORGEN) name.cfg name @@\ -+ ../xcursorgen name.cfg name @@\ - @@\ - clean:: @@\ - $(RM) name @@\ diff --git a/x11/xcursorgen/patches/patch-ac b/x11/xcursorgen/patches/patch-ac deleted file mode 100644 index c3bb301a092..00000000000 --- a/x11/xcursorgen/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/03/08 08:25:31 tron Exp $ - ---- whiteglass/Imakefile.orig 2003-02-28 14:19:25.000000000 +0100 -+++ whiteglass/Imakefile 2003-03-08 08:51:26.000000000 +0100 -@@ -10,7 +10,7 @@ - all:: name @@\ - @@\ - name: name.cfg CursorSources(name) @@\ -- $(XCURSORGEN) name.cfg name @@\ -+ ../xcursorgen name.cfg name @@\ - @@\ - clean:: @@\ - $(RM) name @@\ diff --git a/x11/xcursorgen/patches/patch-xcursorgen.c b/x11/xcursorgen/patches/patch-xcursorgen.c deleted file mode 100644 index 93e90781174..00000000000 --- a/x11/xcursorgen/patches/patch-xcursorgen.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xcursorgen.c,v 1.1 2011/04/05 11:06:59 wiz Exp $ - -Fix build with png-1.5. - ---- xcursorgen.c.orig 2003-02-28 13:19:21.000000000 +0000 -+++ xcursorgen.c -@@ -182,7 +182,7 @@ load_image (struct flist *list, char *pr - return NULL; - } - -- if (setjmp (png->jmpbuf)) -+ if (setjmp (png_jmpbuf(png))) - { - png_destroy_read_struct (&png, &info, NULL); - return NULL; |