Attachment #119871 for bug #162551

View | Details | Raw Unified | Return to bug 162551
Collapse All | Expand All

Lines 6-12 Link Here

(-)devel/rudiments/Makefile (-1 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= rudiments	8	PORTNAME= rudiments
9	PORTVERSION= 0.32	9	PORTVERSION= 0.34
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
Lines 24-29 Link Here
24	--disable-pcre	24	--disable-pcre
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26		26
		27	MAN1= rudiments-config.1
		28
27	ROOTDIRS= classes css programming programming/parts	29	ROOTDIRS= classes css programming programming/parts
28		30
29	post-patch:	31	post-patch:

Lines 1-2 Link Here

(-)devel/rudiments/distinfo (-2 / +2 lines)
1	SHA256 (rudiments-0.32.tar.gz) = aa3f3790b1b154201265c292d8e7c977fe6ca009a9ae557133a27c1e8d218fbe	1	SHA256 (rudiments-0.34.tar.gz) = a0e43bc961a7bbba08560393311076e0293627908de487302db454b273c159df
2	SIZE (rudiments-0.32.tar.gz) = 668202	2	SIZE (rudiments-0.34.tar.gz) = 770725




--- Makefile.orig	2011-04-22 05:20:05.000000000 +0200
+++ Makefile	2011-11-09 06:21:19.309527011 +0100
@@ -5,7 +5,7 @@
 PWD=$(shell pwd)
 
 .PHONY: all testprogs clean install-libs install-includes install-bin \
-	 install-doc install-man install-pc install uninstall unconfig distclean
+	 install-man install-pc install uninstall unconfig distclean
 
 all:
 	cd src; $(MAKE) all
@@ -27,23 +27,19 @@
 install-bin:
 	cd bin; $(MAKE) install
 
-install-doc:
-	cd doc; $(MAKE) install
-
 install-man:
 	cd man; $(MAKE) install
 
 install-pc:
-	$(MKINSTALLDIRS) $(libdir)/pkgconfig
-	$(INSTALL) -m 0644 rudiments.pc $(libdir)/pkgconfig/rudiments.pc
+	$(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
+	$(INSTALL) -m 0644 rudiments.pc $(prefix)/libdata/pkgconfig/rudiments.pc
 
-install: install-libs install-includes install-bin install-doc install-man install-pc
+install: install-libs install-includes install-bin install-man install-pc
 
 uninstall:
 	cd src; $(MAKE) uninstall
 	cd include; $(MAKE) uninstall
 	cd bin; $(MAKE) uninstall
-	cd doc; $(MAKE) uninstall
 	cd man; $(MAKE) uninstall
 	$(RM) $(libdir)/pkgconfig/rudiments.pc
 
 unconfig: clean




--- include/rudiments/serialportprofile.h
+++ include/rudiments/serialportprofile.h
@@ -129,9 +129,15 @@
 
 		#ifdef TABDLY
 		enum	tabdelay_t {
+			#ifdef TAB0
 			td_none=TAB0,
+			#endif
+			#ifdef TAB1
 			td_depends=TAB1,
+			#endif
+			#ifdef TAB2
 			td_100=TAB2
+			#endif
 		};
 		#endif
 

Lines 1-11 Link Here

(-)devel/rudiments/files/patch-src-Makefile (-6 / +6 lines)
1	--- src/Makefile.orig Sat Jan 21 22:29:25 2006	1	--- src/Makefile.orig 2011-07-29 12:54:42.000000000 +0200
2	+++ src/Makefile Wed May 3 18:04:50 2006	2	+++ src/Makefile 2011-11-08 20:33:40.121527699 +0100
3	@@ -330,7 +330,7 @@	3	@@ -341,7 +341,7 @@
4	rebuild: clean all	4	$(RMTREE) .libs
5		5
6	librudiments.la: $(SRCS) $(LOBJS)	6	librudiments.la: $(SRCS) $(LOBJS)
7	- $(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) $(LDFLAGS) $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(DLLIB) -rpath $(libdir) -release $(RUDIMENTS_VERSION) -version-info $(SONAME_VERSION_INFO) -no-undefined	7	- $(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) $(LDFLAGS) $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(NETAPI32LIB) $(DLLIB) -rpath $(libdir) -release $(RUDIMENTS_VERSION) -version-info $(SONAME_VERSION_INFO) -no-undefined
8	+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) $(LDFLAGS) $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(DLLIB) -rpath $(libdir) -version-info $(SONAME_VERSION_INFO) -no-undefined	8	+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) $(LDFLAGS) $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(NETAPI32LIB) $(DLLIB) -rpath $(libdir) -version-info $(SONAME_VERSION_INFO) -no-undefined
9		9
10	install:	10	install:
11	$(MKINSTALLDIRS) $(libdir)	11	$(MKINSTALLDIRS) $(libdir)

Lines 1-11 Link Here

(-)devel/rudiments/files/patch-src_intervaltimer.C (-11 lines)
1	--- src/intervaltimer.C.orig Sat Sep 24 00:31:57 2005
2	+++ src/intervaltimer.C Wed May 3 18:08:55 2006
3	@@ -134,7 +134,7 @@
4	// assignment below.
5	long sec;
6	long usec;
7	- bool retval=getTimeRemaining(&sec,&usec);
8	+ bool retval=getTimeRemaining((long*)(&sec),&usec);
9	tv->tv_sec=sec;
10	tv->tv_usec=usec;
11	return retval;

Return to bug 162551

Lines 1-35 Link Here

(-)devel/rudiments/files/patch-Makefile (-9 / +12 lines)
1	--- Makefile.orig 2009-11-03 23:04:22.000000000 -0200	1	--- Makefile.orig 2011-04-22 05:20:05.000000000 +0200
2	+++ Makefile 2009-11-03 23:06:57.000000000 -0200	2	+++ Makefile 2011-11-09 06:21:19.309527011 +0100
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4	PWD=$(shell pwd)	4	PWD=$(shell pwd)
5		5
6	.PHONY: all testprogs clean rebuild install-libs install-includes install-bin \	6	.PHONY: all testprogs clean install-libs install-includes install-bin \
7	- install-doc install-pc install uninstall unconfig distclean slackware	7	- install-doc install-man install-pc install uninstall unconfig distclean
8	+ install-pc install uninstall unconfig distclean slackware	8	+ install-man install-pc install uninstall unconfig distclean
9		9
10	all:	10	all:
11	cd src; $(MAKE) all	11	cd src; $(MAKE) all
12	@@ -30,20 +30,16 @@	12	@@ -27,23 +27,19 @@
13	install-bin:	13	install-bin:
14	cd bin; $(MAKE) install	14	cd bin; $(MAKE) install
15		15
16	-install-doc:	16	-install-doc:
17	- cd doc; $(MAKE) install	17	- cd doc; $(MAKE) install
18	-	18	-
		19	install-man:
		20	cd man; $(MAKE) install
		21
19	install-pc:	22	install-pc:
20	- $(MKINSTALLDIRS) $(libdir)/pkgconfig	23	- $(MKINSTALLDIRS) $(libdir)/pkgconfig
21	- $(INSTALL) -m 0644 rudiments.pc $(libdir)/pkgconfig/rudiments.pc	24	- $(INSTALL) -m 0644 rudiments.pc $(libdir)/pkgconfig/rudiments.pc
22	+ $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig	25	+ $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
23	+ $(INSTALL) -m 0644 rudiments.pc $(prefix)/libdata/pkgconfig/rudiments.pc	26	+ $(INSTALL) -m 0644 rudiments.pc $(prefix)/libdata/pkgconfig/rudiments.pc
24		27
25	-install: install-libs install-includes install-bin install-doc install-pc	28	-install: install-libs install-includes install-bin install-doc install-man install-pc
26	+install: install-libs install-includes install-bin install-pc	29	+install: install-libs install-includes install-bin install-man install-pc
27		30
28	uninstall:	31	uninstall:
29	cd src; $(MAKE) uninstall	32	cd src; $(MAKE) uninstall
30	cd include; $(MAKE) uninstall	33	cd include; $(MAKE) uninstall
31	cd bin; $(MAKE) uninstall	34	cd bin; $(MAKE) uninstall
32	- cd doc; $(MAKE) uninstall	35	- cd doc; $(MAKE) uninstall
		36	cd man; $(MAKE) uninstall
33	$(RM) $(libdir)/pkgconfig/rudiments.pc	37	$(RM) $(libdir)/pkgconfig/rudiments.pc
34		38
35	unconfig: clean

Lines 1-18 Link Here

(-)devel/rudiments/files/patch-include_rudiments_serialportprofile.h (-18 lines)
1	--- include/rudiments/serialportprofile.h
2	+++ include/rudiments/serialportprofile.h
3	@@ -129,9 +129,15 @@
4
5	#ifdef TABDLY
6	enum tabdelay_t {
7	+ #ifdef TAB0
8	td_none=TAB0,
9	+ #endif
10	+ #ifdef TAB1
11	td_depends=TAB1,
12	+ #endif
13	+ #ifdef TAB2
14	td_100=TAB2
15	+ #endif
16	};
17	#endif
18

Lines 68-73 Link Here

(-)devel/rudiments/pkg-plist (+5 lines)
68	include/rudiments/private/dtdincludes.h	68	include/rudiments/private/dtdincludes.h
69	include/rudiments/private/dynamiclib.h	69	include/rudiments/private/dynamiclib.h
70	include/rudiments/private/dynamiclibincludes.h	70	include/rudiments/private/dynamiclibincludes.h
		71	include/rudiments/private/environment.h
71	include/rudiments/private/environmentincludes.h	72	include/rudiments/private/environmentincludes.h
72	include/rudiments/private/file.h	73	include/rudiments/private/file.h
73	include/rudiments/private/filedescriptor.h	74	include/rudiments/private/filedescriptor.h
Lines 139-144 Link Here
139	include/rudiments/private/serversocketincludes.h	140	include/rudiments/private/serversocketincludes.h
140	include/rudiments/private/serviceentry.h	141	include/rudiments/private/serviceentry.h
141	include/rudiments/private/serviceentryincludes.h	142	include/rudiments/private/serviceentryincludes.h
		143	include/rudiments/private/shadowentryincludes.h
		144	include/rudiments/private/shadowentry.h
142	include/rudiments/private/sharedmemory.h	145	include/rudiments/private/sharedmemory.h
143	include/rudiments/private/sharedmemoryincludes.h	146	include/rudiments/private/sharedmemoryincludes.h
144	include/rudiments/private/shmfile.h	147	include/rudiments/private/shmfile.h
Lines 161-166 Link Here
161	include/rudiments/private/unixsocketutilincludes.h	164	include/rudiments/private/unixsocketutilincludes.h
162	include/rudiments/private/variablebuffer.h	165	include/rudiments/private/variablebuffer.h
163	include/rudiments/private/variablebufferincludes.h	166	include/rudiments/private/variablebufferincludes.h
		167	include/rudiments/private/winsock.h
164	include/rudiments/private/xmldom.h	168	include/rudiments/private/xmldom.h
165	include/rudiments/private/xmldomincludes.h	169	include/rudiments/private/xmldomincludes.h
166	include/rudiments/private/xmldomnode.h	170	include/rudiments/private/xmldomnode.h
Lines 180-185 Link Here
180	include/rudiments/server.h	184	include/rudiments/server.h
181	include/rudiments/serversocket.h	185	include/rudiments/serversocket.h
182	include/rudiments/serviceentry.h	186	include/rudiments/serviceentry.h
		187	include/rudiments/shadowentry.h
183	include/rudiments/sharedmemory.h	188	include/rudiments/sharedmemory.h
184	include/rudiments/shmfile.h	189	include/rudiments/shmfile.h
185	include/rudiments/signalclasses.h	190	include/rudiments/signalclasses.h