diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-06-20 16:23:28 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-06-20 16:23:28 +0000 |
| commit | 7ae7b018ccf7760013f368fcb83aad9ecd8982a8 (patch) | |
| tree | e83ee6693050a76e305a95a376451aa583df151e /graphics/picpuz | |
| parent | a35ba13770957a577275c3575d979457605f2aff (diff) | |
| download | freebsd-ports-7ae7b018ccf7760013f368fcb83aad9ecd8982a8.zip | |
With the power of USES=dos2unix, get rid of most patches and files
with CRLF.
While there, run make makepatch, rename patches to use the new scheme,
and various fixes.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'graphics/picpuz')
| -rw-r--r-- | graphics/picpuz/Makefile | 3 | ||||
| -rw-r--r-- | graphics/picpuz/files/patch-Makefile | 10 | ||||
| -rw-r--r-- | graphics/picpuz/files/patch-zfuncs.cpp | 10 | ||||
| -rw-r--r-- | graphics/picpuz/files/patch-zfuncs.h | 18 |
4 files changed, 21 insertions, 20 deletions
diff --git a/graphics/picpuz/Makefile b/graphics/picpuz/Makefile index 3d9277fd8bf2..ec862e9b9107 100644 --- a/graphics/picpuz/Makefile +++ b/graphics/picpuz/Makefile @@ -11,7 +11,8 @@ MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ \ MAINTAINER= devel@stasyan.com COMMENT= Jigsaw puzzle program -USES= execinfo gmake pkgconfig +USES= dos2unix execinfo gmake pkgconfig +DOS2UNIX_GLOB= *.h USE_GNOME= gtk20 ALL_TARGET= # diff --git a/graphics/picpuz/files/patch-Makefile b/graphics/picpuz/files/patch-Makefile index c75beed6f02b..bdb765ed5381 100644 --- a/graphics/picpuz/files/patch-Makefile +++ b/graphics/picpuz/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2009-10-29 09:38:40.000000000 +0100 -+++ Makefile 2014-02-18 19:19:51.140331100 +0100 -@@ -6,7 +6,7 @@ +--- Makefile.orig 2009-10-29 08:38:40 UTC ++++ Makefile +@@ -6,7 +6,7 @@ SOURCE = $(PROGRAM)-$(VERSION).cpp # replace CFLAGS and LFLAGS -O (oh) with -g for GDB debugging CFLAGS = -O -Wall -c `pkg-config --cflags gtk+-2.0` @@ -9,7 +9,7 @@ # use $PREFIX if defined, else assume /usr/local ifeq "$(PREFIX)" "" -@@ -19,14 +19,14 @@ +@@ -19,14 +19,14 @@ DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop $(PROGRAM): $(PROGRAM).o zfuncs.o @@ -27,7 +27,7 @@ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" install: $(PROGRAM) -@@ -39,15 +39,15 @@ +@@ -39,15 +39,15 @@ install: $(PROGRAM) cp $(PROGRAM) $(DESTDIR)$(BINDIR) cp -R locales/* $(DESTDIR)$(DATADIR)/locales # install .desktop file (menu entry) diff --git a/graphics/picpuz/files/patch-zfuncs.cpp b/graphics/picpuz/files/patch-zfuncs.cpp index f5e5d7f228f2..16f9033b5509 100644 --- a/graphics/picpuz/files/patch-zfuncs.cpp +++ b/graphics/picpuz/files/patch-zfuncs.cpp @@ -1,5 +1,5 @@ ---- zfuncs.cpp.orig 2009-10-29 08:38:40.000000000 +0000 -+++ zfuncs.cpp 2013-03-30 09:06:21.000000000 +0000 +--- zfuncs.cpp.orig 2009-10-29 08:38:40 UTC ++++ zfuncs.cpp @@ -23,6 +23,11 @@ // zfuncs.cpp version v.2.28 @@ -12,7 +12,7 @@ /************************************************************************** system-level utility functions -@@ -236,7 +241,7 @@ +@@ -236,7 +241,7 @@ void synch_threads(int NT) // safely access parameters from multiple threads // limitation: one lock for any number of parameters @@ -21,7 +21,7 @@ int zget_locked(int ¶m) // lock and return parameter { -@@ -2916,7 +2921,7 @@ +@@ -2916,7 +2921,7 @@ int initz_appfiles(const char *appname, strcpy(zicondir,zdatadir); strcat(zicondir,"/icons"); @@ -30,7 +30,7 @@ if (strEqu(pp,"root")) snprintf(zuserdir,199,"/root/.%s",zappname); // get /root/.appname else snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname); // or /home/user/.appname -@@ -3415,7 +3420,7 @@ +@@ -3415,7 +3420,7 @@ pthread_t tid_main = 0; pthread_t tids[tmax]; int tlocks[tmax]; int zinit = 0; diff --git a/graphics/picpuz/files/patch-zfuncs.h b/graphics/picpuz/files/patch-zfuncs.h index 64aab991edc2..35cc9f2c69f5 100644 --- a/graphics/picpuz/files/patch-zfuncs.h +++ b/graphics/picpuz/files/patch-zfuncs.h @@ -1,5 +1,5 @@ ---- zfuncs.h.orig 2009-10-29 08:38:40.000000000 +0000 -+++ zfuncs.h 2013-03-30 09:03:57.000000000 +0000 +--- zfuncs.h.orig 2016-06-20 15:52:16 UTC ++++ zfuncs.h @@ -36,7 +36,201 @@ #include <signal.h> #include <execinfo.h> @@ -212,12 +212,12 @@ #define mutex_init pthread_mutex_init #define mutex_lock pthread_mutex_lock #define mutex_trylock pthread_mutex_trylock -@@ -495,7 +689,7 @@ +@@ -495,7 +689,7 @@ class Queue { - char wmi[8];
- Vxstring * vd; // vector of xstrings
-- mutex qmutex; // for multi-thread access
-+ mutex_tp qmutex; // for multi-thread access
+ char wmi[8]; + Vxstring * vd; // vector of xstrings +- mutex qmutex; // for multi-thread access ++ mutex_tp qmutex; // for multi-thread access int qcap; // queue capacity - int qcount; // curr. queue count
- int ent1; // first entry pointer
+ int qcount; // curr. queue count + int ent1; // first entry pointer |