Bug 184837

Summary: www/cssed: Support CC/CXX properly
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: Pawel Pekala <pawel>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description tkato432 2013-12-16 18:10:09 UTC 
- Support CC/CXX proeprly
- Support dos2unix
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-19 21:10:43 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-19 21:33:17 UTC 
Author: pawel
Date: Thu Dec 19 21:33:08 2013
New Revision: 336963
URL: http://svnweb.freebsd.org/changeset/ports/336963

Log:
  - Support CC/CXX properly
  - Remove leading article from COMMENT
  - Add desktop entry file
  - Allow staging
  
  PR:		ports/184837
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/www/cssed/Makefile   (contents, props changed)
  head/www/cssed/pkg-plist   (contents, props changed)

Modified: head/www/cssed/Makefile
==============================================================================
--- head/www/cssed/Makefile	Thu Dec 19 21:32:15 2013	(r336962)
+++ head/www/cssed/Makefile	Thu Dec 19 21:33:08 2013	(r336963)
@@ -3,31 +3,31 @@
 
 PORTNAME=	cssed
 PORTVERSION=	0.4.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An application to help CSS style sheets creation and maintenance
+COMMENT=	Application to help CSS style sheets creation and maintenance
 
-USES=		pathfix pkgconfig
+USES=		dos2unix pathfix pkgconfig
+DOS2UNIX_FILES=	scintilla/gtk/ScintillaGTK.cxx
 USE_GNOME=	gtk20 libxml2
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgmodule-2.0
 CONFIGURE_ARGS=	--with-plugin-headers
 
-MAN1=		cssed.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+DESKTOP_ENTRIES="CSSED" "CSS Editor" "${DATADIR}/pixmaps/cssed-icon.png" \
+		"${PORTNAME}" "GTK;Development;WebDevelopment;TextEditor;" ""
 
-NO_STAGE=	yes
 post-patch:
-.for file in scintilla/gtk/ScintillaGTK.cxx
-	@cd ${WRKSRC} && ${MV} ${file} ${file}.pre_tr \
-		&& ${TR} -d '\r' < ${file}.pre_tr > ${file}
-.endfor
-.for file in scintilla/gtk/Makefile.in src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|gthread-2.0|gmodule-2.0|' ${WRKSRC}/configure
+.for i in scintilla/gtk/Makefile.in src/Makefile.in
 	@${REINPLACE_CMD} -e 's|gcc|@CC@|g ; \
-		 s|g++|@CXX@|g' ${WRKSRC}/src/Makefile.in
+		 s|g++|@CXX@|g' ${WRKSRC}/${i}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/www/cssed/pkg-plist
==============================================================================
--- head/www/cssed/pkg-plist	Thu Dec 19 21:32:15 2013	(r336962)
+++ head/www/cssed/pkg-plist	Thu Dec 19 21:33:08 2013	(r336963)
@@ -1,5 +1,6 @@
 bin/cssed
 libdata/pkgconfig/cssed.pc
+man/man1/cssed.1.gz
 %%DATADIR%%/data/cssed-cfg.xml
 %%DATADIR%%/data/cssed-def.dtd
 %%DATADIR%%/data/cssed-def.xml
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-19 21:33:22 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-20 08:10:08 UTC 
Author: bapt
Date: Fri Dec 20 08:10:00 2013
New Revision: 336989
URL: http://svnweb.freebsd.org/changeset/ports/336989

Log:
  MFH: r336963
  
  - Support CC/CXX properly
  - Remove leading article from COMMENT
  - Add desktop entry file
  - Allow staging
  
  PR:		ports/184837
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  branches/2014Q1/www/cssed/Makefile   (contents, props changed)
  branches/2014Q1/www/cssed/pkg-plist   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/www/cssed/Makefile
==============================================================================
--- branches/2014Q1/www/cssed/Makefile	Fri Dec 20 08:08:19 2013	(r336988)
+++ branches/2014Q1/www/cssed/Makefile	Fri Dec 20 08:10:00 2013	(r336989)
@@ -3,31 +3,31 @@
 
 PORTNAME=	cssed
 PORTVERSION=	0.4.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An application to help CSS style sheets creation and maintenance
+COMMENT=	Application to help CSS style sheets creation and maintenance
 
-USES=		pathfix pkgconfig
+USES=		dos2unix pathfix pkgconfig
+DOS2UNIX_FILES=	scintilla/gtk/ScintillaGTK.cxx
 USE_GNOME=	gtk20 libxml2
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgmodule-2.0
 CONFIGURE_ARGS=	--with-plugin-headers
 
-MAN1=		cssed.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+DESKTOP_ENTRIES="CSSED" "CSS Editor" "${DATADIR}/pixmaps/cssed-icon.png" \
+		"${PORTNAME}" "GTK;Development;WebDevelopment;TextEditor;" ""
 
-NO_STAGE=	yes
 post-patch:
-.for file in scintilla/gtk/ScintillaGTK.cxx
-	@cd ${WRKSRC} && ${MV} ${file} ${file}.pre_tr \
-		&& ${TR} -d '\r' < ${file}.pre_tr > ${file}
-.endfor
-.for file in scintilla/gtk/Makefile.in src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|gthread-2.0|gmodule-2.0|' ${WRKSRC}/configure
+.for i in scintilla/gtk/Makefile.in src/Makefile.in
 	@${REINPLACE_CMD} -e 's|gcc|@CC@|g ; \
-		 s|g++|@CXX@|g' ${WRKSRC}/src/Makefile.in
+		 s|g++|@CXX@|g' ${WRKSRC}/${i}
 .endfor
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/www/cssed/pkg-plist
==============================================================================
--- branches/2014Q1/www/cssed/pkg-plist	Fri Dec 20 08:08:19 2013	(r336988)
+++ branches/2014Q1/www/cssed/pkg-plist	Fri Dec 20 08:10:00 2013	(r336989)
@@ -1,5 +1,6 @@
 bin/cssed
 libdata/pkgconfig/cssed.pc
+man/man1/cssed.1.gz
 %%DATADIR%%/data/cssed-cfg.xml
 %%DATADIR%%/data/cssed-def.dtd
 %%DATADIR%%/data/cssed-def.xml
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"