Attachment #98600 for bug #137543

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

Lines 6-13 Link Here

(-)Makefile (+4 lines)
6	#	6	#
7		7
8	PORTNAME= libp11	8	PORTNAME= libp11
		9	<<<<<<< Makefile
		10	PORTVERSION= 0.2.6
		11	=======
9	PORTVERSION= 0.2.5	12	PORTVERSION= 0.2.5
10	PORTREVISION= 1	13	PORTREVISION= 1
		14	>>>>>>> 1.7
11	CATEGORIES= security devel	15	CATEGORIES= security devel
12	MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/	16	MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/
13		17

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (libp11-0.2.5.tar.gz) = 0fc00352bbb0896f09b41fb698abe9f5	1	MD5 (libp11-0.2.6.tar.gz) = 4ef3471cfabf787e50c7ae9456f7b09b
2	SHA256 (libp11-0.2.5.tar.gz) = 3413e714d1307c99300ff59c9d2631a6871784bf74c7e1f30f5019bf095d4c68	2	SHA256 (libp11-0.2.6.tar.gz) = acaa3d8331495915f95d9bc4195081c1cb0827a4b08e1550089c95bc9accc264
3	SIZE (libp11-0.2.5.tar.gz) = 375804	3	SIZE (libp11-0.2.6.tar.gz) = 376101

Return to bug 137543